Fix issues about rough SST BCs formulations

Author: marcosch27

Common/include/option_structure.hpp

@@ -1105,9 +1105,9 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne
  * \brief SST rough-wall boundary conditions Options
  */
 enum class ROUGHSST_OPTIONS {
-  NONE,                 /*!< \brief No option / default. */
-  WILCOX1998,           /*!< \brief Wilcox 1998 boundary conditions for rough walls  / default. */
-  WILCOX2006,           /*!< \brief Wilcox 2006 boundary conditions for rough walls. */
+  NONE,                 /*!< \brief No option / default no surface roughness applied. */
+  WILCOX1998,           /*!< \brief Wilcox 1998 boundary conditions for rough walls. */
+  WILCOX2006,           /*!< \brief Wilcox 2006 boundary conditions for rough walls / default version if roughness is applied. */
   LIMITER_KNOPP,        /*!< \brief Knopp eddy viscosity limiter. */
   LIMITER_AUPOIX,       /*!< \brief Aupoix eddy viscosity limiter. */
 };
@@ -1135,22 +1135,21 @@ struct ROUGH_SST_ParsedOptions {
  * \param[in] ROUGHSST_Options - Selected SST rough-wall boundary conditions option from config.
  * \param[in] nROUGHSST_Options - Number of options selected.
  * \param[in] rank - MPI rank.
- * \return Struct with SA options.
+ * \return Struct with SST options.
  */
-inline ROUGH_SST_ParsedOptions ParseROUGHSSTOptions(const ROUGHSST_OPTIONS *ROUGHSST_Options, unsigned short nROUGHSST_Options, int rank) {
-  ROUGH_SST_ParsedOptions ROUGHSSTParsedOptions;
-
-  auto IsPresent = [&](ROUGHSST_OPTIONS option) {
-    const auto roughsst_options_end = ROUGHSST_Options + nROUGHSST_Options;
-    return std::find(ROUGHSST_Options, roughsst_options_end, option) != roughsst_options_end;
-  };
-
-  ROUGHSSTParsedOptions.wilcox2006 = IsPresent(ROUGHSST_OPTIONS::WILCOX2006);
-  ROUGHSSTParsedOptions.limiter_knopp = IsPresent(ROUGHSST_OPTIONS::LIMITER_KNOPP);
-  ROUGHSSTParsedOptions.limiter_aupoix = IsPresent(ROUGHSST_OPTIONS::LIMITER_AUPOIX);
+inline ROUGH_SST_ParsedOptions ParseROUGHSSTOptions(ROUGHSST_OPTIONS sstbcs_option) {
+    ROUGH_SST_ParsedOptions opts;
+    opts.version = sstbcs_option;
 
+    switch(sstbcs_option) {
+        case ROUGHSST_OPTIONS::WILCOX1998: opts.wilcox1998 = true; break;
+        case ROUGHSST_OPTIONS::WILCOX2006: opts.wilcox2006 = true; break;
+        case ROUGHSST_OPTIONS::LIMITER_KNOPP: opts.limiter_knopp = true; break;
+        case ROUGHSST_OPTIONS::LIMITER_AUPOIX: opts.limiter_aupoix = true; break;
+        default: break;
+    }
 
-  return ROUGHSSTParsedOptions;
+    return opts;
 }
 
 

Common/src/CConfig.cpp

@@ -3579,7 +3579,7 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
   /*--- Postprocess SST_OPTIONS into structure. ---*/
   if (Kind_Turb_Model == TURB_MODEL::SST) {
     sstParsedOptions = ParseSSTOptions(SST_Options, nSST_Options, rank);
-    roughsstParsedOptions = ParseROUGHSSTOptions(ROUGHSST_Options, nROUGHSST_Options, rank);
+    roughsstParsedOptions = ParseROUGHSSTOptions(ROUGHSST_Options[0]);
   } else if (Kind_Turb_Model == TURB_MODEL::SA) {
     saParsedOptions = ParseSAOptions(SA_Options, nSA_Options, rank);
   }

SU2_CFD/src/solvers/CTurbSSTSolver.cpp

@@ -444,8 +444,8 @@ void CTurbSSTSolver::BC_HeatFlux_Wall(CGeometry *geometry, CSolver **solver_cont
         su2double kPlus = FrictionVel*Roughness_Height*density/laminar_viscosity;
 
         su2double S_R= 0.0;
- 
-        su2double solution[2];
+        su2double solution[2] = {};
+
         /*--- Modify the omega and k to account for a rough wall. ---*/
 
         /*--- Reference 1 original Wilcox (1998) ---*/
@@ -461,9 +461,9 @@ void CTurbSSTSolver::BC_HeatFlux_Wall(CGeometry *geometry, CSolver **solver_cont
         else if (roughsstParsedOptions.wilcox2006) {
         /*--- Reference 2 from D.C. Wilcox Turbulence Modeling for CFD (2006) ---*/
           if (kPlus <= 5)
-            S_R = (200/(kPlus+EPS))*(200/(kPlus+EPS));
+            S_R = pow(200/(kPlus+EPS),2);
           else
-            S_R = 100/(kPlus+EPS) + ((200/(kPlus+EPS))*(200/(kPlus+EPS)) - 100/(kPlus+EPS))*exp(5-kPlus);
+            S_R = 100/(kPlus+EPS) + (pow(200/(kPlus+EPS),2) - 100/(kPlus+EPS))*exp(5-kPlus);
 
           solution[0] = 0.0;
           solution[1] = FrictionVel*FrictionVel*S_R/(laminar_viscosity/density);
@@ -481,7 +481,7 @@ void CTurbSSTSolver::BC_HeatFlux_Wall(CGeometry *geometry, CSolver **solver_cont
         /*--- Aupoix eddy viscosity limiter ---*/ 
         else if (roughsstParsedOptions.limiter_aupoix) {
 
-          su2double k0Plus = ( 1.0 /sqrt( constants[6])) * tanh(((log((kPlus +EPS ) / 30.0) / log(10.0)) + 1.0 - 1.0*tanh( (kPlus + EPS) / 125.0))*tanh((kPlus + EPS) / 125.0));
+          su2double k0Plus = ( 1.0 /sqrt( constants[6])) * tanh((log10((kPlus +EPS ) / 30.0) + 1.0 - 1.0*tanh( (kPlus + EPS) / 125.0))*tanh((kPlus + EPS) / 125.0));
           su2double kwallPlus = max(0.0, k0Plus);
           su2double kwall = kwallPlus*FrictionVel*FrictionVel;