apply to other places

Author: pcarruscag

Common/src/CConfig.cpp

@@ -5139,13 +5139,12 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
   else {monoatomic = false;}
 
   /*--- Set number of Turbulence Variables. ---*/
-  switch(Kind_Turb_Model) {
-    case TURB_MODEL::NONE:
+  switch (TurbModelFamily(Kind_Turb_Model)) {
+    case TURB_FAMILY::NONE:
       nTurbVar = 0; break;
-    case TURB_MODEL::SA: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP: case TURB_MODEL::SA_E:
-    case TURB_MODEL::SA_NEG:
+    case TURB_FAMILY::SA:
       nTurbVar = 1; break;
-    case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
+    case TURB_FAMILY::KW:
       nTurbVar = 2; break;
   }
 
@@ -5864,7 +5863,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
         break;
       case MAIN_SOLVER::MULTIPHYSICS:
         cout << "Multiphysics solver" << endl;
-        break;  
+        break;
       default:
         SU2_MPI::Error("No valid solver was chosen", CURRENT_FUNCTION);
 
@@ -8456,7 +8455,7 @@ void CConfig::SetGlobalParam(MAIN_SOLVER val_solver,
       break;
 
     default:
-      break;  
+      break;
   }
 }
 

SU2_CFD/src/solvers/CAdjTurbSolver.cpp

@@ -41,16 +41,7 @@ CAdjTurbSolver::CAdjTurbSolver(CGeometry *geometry, CConfig *config, unsigned sh
   Gamma_Minus_One = Gamma - 1.0;
 
   /*--- Dimension of the problem  ---*/
-  switch (config->GetKind_Turb_Model()) {
-    case TURB_MODEL::NONE:                 break;
-    case TURB_MODEL::SA :        nVar = 1; break;
-    case TURB_MODEL::SA_NEG :    nVar = 1; break;
-    case TURB_MODEL::SA_E :      nVar = 1; break;
-    case TURB_MODEL::SA_COMP :   nVar = 1; break;
-    case TURB_MODEL::SA_E_COMP : nVar = 1; break;
-    case TURB_MODEL::SST :       nVar = 2; break;
-    case TURB_MODEL::SST_SUST :  nVar = 2; break;
-  }
+  nVar = config->GetnTurbVar();
 
   /*--- Initialize nVarGrad for deallocation ---*/
 

SU2_CFD/src/solvers/CSolver.cpp

@@ -3615,14 +3615,14 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
     columnName << "NORMAL-X   " << setw(24) << "NORMAL-Y   " << setw(24);
     if(nDim==3)  columnName << "NORMAL-Z   " << setw(24);
 
-    switch (config->GetKind_Turb_Model()) {
-      case TURB_MODEL::NONE: break;
-      case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
+    switch (TurbModelFamily(config->GetKind_Turb_Model())) {
+      case TURB_FAMILY::NONE: break;
+      case TURB_FAMILY::SA:
         /*--- 1-equation turbulence model: SA ---*/
         columnName << "NU_TILDE   " << setw(24);
         columnValue << config->GetNuFactor_FreeStream() * config->GetViscosity_FreeStream() / config->GetDensity_FreeStream() <<"\t";
         break;
-      case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
+      case TURB_FAMILY::KW:
         /*--- 2-equation turbulence model (SST) ---*/
         columnName << "TKE        " << setw(24) << "DISSIPATION" << setw(24);
         columnValue << config->GetTke_FreeStream() << "\t" << config->GetOmega_FreeStream() <<"\t";

SU2_CFD/src/solvers/CSolverFactory.cpp

@@ -337,19 +337,19 @@ CSolver* CSolverFactory::CreateTurbSolver(TURB_MODEL kindTurbModel, CSolver **so
   CSolver *turbSolver = nullptr;
 
   if (!adjoint){
-    switch (kindTurbModel) {
-      case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
+    switch (TurbModelFamily(kindTurbModel)) {
+      case TURB_FAMILY::SA:
         turbSolver = new CTurbSASolver(geometry, config, iMGLevel, solver[FLOW_SOL]->GetFluidModel());
         solver[FLOW_SOL]->Preprocessing(geometry, solver, config, iMGLevel, NO_RK_ITER, RUNTIME_FLOW_SYS, false);
         turbSolver->Postprocessing(geometry, solver, config, iMGLevel);
         break;
-      case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
+      case TURB_FAMILY::KW:
         turbSolver = new CTurbSSTSolver(geometry, config, iMGLevel);
         solver[FLOW_SOL]->Preprocessing(geometry, solver, config, iMGLevel, NO_RK_ITER, RUNTIME_FLOW_SYS, false);
         turbSolver->Postprocessing(geometry, solver, config, iMGLevel);
         solver[FLOW_SOL]->Preprocessing(geometry, solver, config, iMGLevel, NO_RK_ITER, RUNTIME_FLOW_SYS, false);
         break;
-      case TURB_MODEL::NONE:
+      case TURB_FAMILY::NONE:
         SU2_MPI::Error("Trying to create TurbSolver container but TURB_MODEL=NONE.", CURRENT_FUNCTION);
         break;
     }