Move muscl, limiter and implicit var to scalar class data.

Author: TobiKattmann

SU2_CFD/include/solvers/CScalarSolver.hpp

@@ -57,6 +57,10 @@ class CScalarSolver : public CSolver {
 
   const bool Conservative; /*!< \brief Transported Variable is conservative. Solution has to be multiplied with rho. */
 
+  bool implicit; /*!< \brief Solver uses an implicit scheme. */
+  bool muscl;    /*!< \brief Solver uses MUSCL reconstruction. */
+  bool limiter;  /*!< \brief Solver uses limiters. */
+
   /*--- Shallow copy of grid coloring for OpenMP parallelization. ---*/
 
 #ifdef HAVE_OMP

SU2_CFD/include/solvers/CScalarSolver.inl

@@ -79,22 +79,6 @@ CScalarSolver<VariableType>::~CScalarSolver() {
 
 template <class VariableType>
 void CScalarSolver<VariableType>::CommonPreprocessing(CGeometry *geometry, const CConfig *config, const bool Output) {
-  /*--- Set booleans depending on the calling solver, alternatively one could add the bools to the func input. ---*/
-  bool implicit = false;
-  bool muscl = false;
-  bool limiter = false;
-  if (SolverName == "SA" || SolverName == "K-W SST") {
-    implicit = (config->GetKind_TimeIntScheme_Turb() == EULER_IMPLICIT);
-    muscl = config->GetMUSCL_Turb();
-    limiter = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) &&
-              (config->GetInnerIter() <= config->GetLimiterIter());
-  }
-  else if (SolverName == "SPECIES") {
-    implicit = (config->GetKind_TimeIntScheme_Species() == EULER_IMPLICIT);
-    muscl = config->GetMUSCL_Species();
-    limiter = (config->GetKind_SlopeLimit_Species() != NO_LIMITER) &&
-              (config->GetInnerIter() <= config->GetLimiterIter());
-  }
 
   /*--- Clear residual and system matrix, not needed for
    * reducer strategy as we write over the entire matrix. ---*/
@@ -129,19 +113,6 @@ template <class VariableType>
 void CScalarSolver<VariableType>::Upwind_Residual(CGeometry* geometry, CSolver** solver_container,
                                                   CNumerics** numerics_container, CConfig* config,
                                                   unsigned short iMesh) {
-  const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
-
-  bool muscl = false;
-  bool limiter = false;
-  if (SolverName == "SA" || SolverName == "K-W SST") {
-    muscl = config->GetMUSCL_Turb();
-    limiter = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER);
-  }
-  else if (SolverName == "SPECIES") {
-    muscl = config->GetMUSCL_Species();
-    limiter = (config->GetKind_SlopeLimit_Species() != NO_LIMITER);
-  }
-
   /*--- Only reconstruct flow variables if MUSCL is on for flow (requires upwind) and turbulence. ---*/
   const bool musclFlow = config->GetMUSCL_Flow() && muscl && (config->GetKind_ConvNumScheme_Flow() == SPACE_UPWIND);
   /*--- Only consider flow limiters for cell-based limiters, edge-based would need to be recomputed. ---*/
@@ -484,7 +455,6 @@ template <class VariableType>
 void CScalarSolver<VariableType>::SetResidual_DualTime(CGeometry* geometry, CSolver** solver_container, CConfig* config,
                                                        unsigned short iRKStep, unsigned short iMesh,
                                                        unsigned short RunTime_EqSystem) {
-  const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
   const bool first_order = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST);
   const bool second_order = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND);
   const bool incompressible = (config->GetKind_Regime() == ENUM_REGIME::INCOMPRESSIBLE);

SU2_CFD/src/solvers/CSpeciesSolver.cpp

@@ -58,6 +58,12 @@ CSpeciesSolver::CSpeciesSolver(CGeometry* geometry, CConfig* config, unsigned sh
 
   nDim = geometry->GetnDim();
 
+  /*--- Set whether MUSCL and limiters are used in this solver, and implicit variable ---*/
+  implicit = (config->GetKind_TimeIntScheme_Species() == EULER_IMPLICIT);
+  muscl = config->GetMUSCL_Species();
+  limiter = (config->GetKind_SlopeLimit_Species() != NO_LIMITER) &&
+            (config->GetInnerIter() <= config->GetLimiterIter());
+
   /*--- Single grid simulation ---*/
 
   if (iMesh == MESH_0 || config->GetMGCycle() == FULLMG_CYCLE) {
@@ -390,7 +396,6 @@ void CSpeciesSolver::BC_Inlet(CGeometry* geometry, CSolver** solver_container, C
       LinSysRes.AddBlock(iPoint, residual);
 
       /*--- Jacobian contribution for implicit integration ---*/
-      const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
       if (implicit) Jacobian.AddBlock2Diag(iPoint, residual.jacobian_i);
 
       // Unfinished viscous contribution removed before right after d8a0da9a00. Further testing required.
@@ -535,7 +540,6 @@ void CSpeciesSolver::BC_Outlet(CGeometry* geometry, CSolver** solver_container,
       LinSysRes.AddBlock(iPoint, residual);
 
       /*--- Jacobian contribution for implicit integration ---*/
-      const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
       if (implicit) Jacobian.AddBlock2Diag(iPoint, residual.jacobian_i);
 
       // Unfinished viscous contribution removed before right after d8a0da9a00. Further testing required.

SU2_CFD/src/solvers/CTurbSolver.cpp

@@ -37,6 +37,11 @@ CTurbSolver::CTurbSolver(CGeometry* geometry, CConfig *config, bool conservative
   : CScalarSolver<CTurbVariable>(geometry, config, conservative) {
   /*--- Store if an implicit scheme is used, for use during periodic boundary conditions. ---*/
   SetImplicitPeriodic(config->GetKind_TimeIntScheme_Turb() == EULER_IMPLICIT);
+
+  implicit = (config->GetKind_TimeIntScheme_Turb() == EULER_IMPLICIT);
+  muscl = config->GetMUSCL_Turb();
+  limiter = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) &&
+            (config->GetInnerIter() <= config->GetLimiterIter());
 }
 
 CTurbSolver::~CTurbSolver() {
@@ -336,8 +341,6 @@ void CTurbSolver::Impose_Fixed_Values(const CGeometry *geometry, const CConfig *
   /*--- Check whether turbulence quantities are fixed to far-field values on a half-plane. ---*/
   if(config->GetTurb_Fixed_Values()){
 
-    const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
-
     /*--- Form normalized far-field velocity ---*/
     const su2double* velocity_inf = config->GetVelocity_FreeStreamND();
     su2double velmag_inf = GeometryToolbox::Norm(nDim, velocity_inf);