Fix rough BCs options issues

Author: marcosch27

Common/include/CConfig.hpp

@@ -749,11 +749,10 @@ class CConfig {
   SST_OPTIONS *SST_Options;           /*!< \brief List of modifications/corrections/versions of SST turbulence model.*/
   SA_OPTIONS *SA_Options;             /*!< \brief List of modifications/corrections/versions of SA turbulence model.*/
   LM_OPTIONS *LM_Options;             /*!< \brief List of modifications/corrections/versions of SA turbulence model.*/
-  ROUGHSST_OPTIONS *ROUGHSST_Options;         /*!< \brief List of modifications/corrections/versions of rough-wall boundary conditions for SST turbulence model.*/
+  ROUGHSST_MODEL Kind_RoughSST_Model;         /*!< \brief List of modifications/corrections/versions of rough-wall boundary conditions for SST turbulence model.*/
   unsigned short nSST_Options;        /*!< \brief Number of SST options specified. */
   unsigned short nSA_Options;         /*!< \brief Number of SA options specified. */
   unsigned short nLM_Options;         /*!< \brief Number of SA options specified. */
-  unsigned short nROUGHSST_Options;       /*!< \brief Number of rough-wall boundary conditions for SST turbulence model options specified. */
   WALL_FUNCTIONS  *Kind_WallFunctions;        /*!< \brief The kind of wall function to use for the corresponding markers. */
   unsigned short  **IntInfo_WallFunctions;    /*!< \brief Additional integer information for the wall function markers. */
   su2double       **DoubleInfo_WallFunctions; /*!< \brief Additional double information for the wall function markers. */

Common/include/option_structure.hpp

@@ -1104,26 +1104,26 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne
 /*!
  * \brief SST rough-wall boundary conditions Options
  */
-enum class ROUGHSST_OPTIONS {
+enum class ROUGHSST_MODEL {
   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. */
 };
-static const MapType<std::string, ROUGHSST_OPTIONS> ROUGHSST_Options_Map = {
-  MakePair("NONE", ROUGHSST_OPTIONS::NONE)
-  MakePair("WILCOX1998", ROUGHSST_OPTIONS::WILCOX1998)
-  MakePair("WILCOX2006", ROUGHSST_OPTIONS::WILCOX2006)
-  MakePair("LIMITER_KNOPP", ROUGHSST_OPTIONS::LIMITER_KNOPP)
-  MakePair("LIMITER_AUPOIX", ROUGHSST_OPTIONS::LIMITER_AUPOIX)
+static const MapType<std::string, ROUGHSST_MODEL> RoughSST_Model_Map = {
+  MakePair("NONE", ROUGHSST_MODEL::NONE)
+  MakePair("WILCOX1998", ROUGHSST_MODEL::WILCOX1998)
+  MakePair("WILCOX2006", ROUGHSST_MODEL::WILCOX2006)
+  MakePair("LIMITER_KNOPP", ROUGHSST_MODEL::LIMITER_KNOPP)
+  MakePair("LIMITER_AUPOIX", ROUGHSST_MODEL::LIMITER_AUPOIX)
 };
 
 /*!
  * \brief Structure containing parsed SST rough-wall boundary conditions options.
  */
 struct ROUGH_SST_ParsedOptions {
-  ROUGHSST_OPTIONS version = ROUGHSST_OPTIONS::NONE;         /*!< \brief KWBC base model. */
+  ROUGHSST_MODEL version = ROUGHSST_MODEL::NONE;         /*!< \brief KWBC base model. */
   bool wilcox1998 = false;                           /*!< \brief Use Wilcox boundary conditions for rough walls (1998). */
   bool wilcox2006 = false;                          /*!< \brief Use Wilcox boundary conditions for rough walls (2006). */
   bool limiter_knopp = false;                        /*!< \brief Use Knopp eddy viscosity limiter. */
@@ -1137,15 +1137,15 @@ struct ROUGH_SST_ParsedOptions {
  * \param[in] rank - MPI rank.
  * \return Struct with SST options.
  */
-inline ROUGH_SST_ParsedOptions ParseROUGHSSTOptions(ROUGHSST_OPTIONS sstbcs_option) {
+inline ROUGH_SST_ParsedOptions ParseROUGHSSTOptions(ROUGHSST_MODEL 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;
+        case ROUGHSST_MODEL::WILCOX1998: opts.wilcox1998 = true; break;
+        case ROUGHSST_MODEL::WILCOX2006: opts.wilcox2006 = true; break;
+        case ROUGHSST_MODEL::LIMITER_KNOPP: opts.limiter_knopp = true; break;
+        case ROUGHSST_MODEL::LIMITER_AUPOIX: opts.limiter_aupoix = true; break;
         default: break;
     }
 

Common/src/CConfig.cpp

@@ -1131,7 +1131,7 @@ void CConfig::SetConfig_Options() {
   addEnumListOption("SA_OPTIONS", nSA_Options, SA_Options, SA_Options_Map);
 
   /*!\brief ROUGHSST_OPTIONS \n DESCRIPTION: Specify type of boundary condition for rough walls for SST turbulence model. \n Options: see \link ROUGHSST_Options_Map \endlink \n DEFAULT: wilcox1998 \ingroup Config*/
-  addEnumListOption("ROUGHSST_OPTIONS", nROUGHSST_Options, ROUGHSST_Options, ROUGHSST_Options_Map);
+  addEnumOption("KIND_ROUGHSST_MODEL", Kind_RoughSST_Model, RoughSST_Model_Map, ROUGHSST_MODEL::NONE);
   /*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NONE \ingroup Config*/
   addEnumOption("KIND_TRANS_MODEL", Kind_Trans_Model, Trans_Model_Map, TURB_TRANS_MODEL::NONE);
   /*!\brief SST_OPTIONS \n DESCRIPTION: Specify LM transition model options/correlations. \n Options: see \link LM_Options_Map \endlink \n DEFAULT: NONE \ingroup Config*/
@@ -3557,7 +3557,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[0]);
+    roughsstParsedOptions = ParseROUGHSSTOptions(Kind_RoughSST_Model);
   } else if (Kind_Turb_Model == TURB_MODEL::SA) {
     saParsedOptions = ParseSAOptions(SA_Options, nSA_Options, rank);
   }