Use Muscl and limiter from GlobalParams for ScalarSolver

Author: TobiKattmann

SU2_CFD/include/solvers/CScalarSolver.hpp

@@ -57,9 +57,6 @@ class CScalarSolver : public CSolver {
 
   const bool Conservative; /*!< \brief Transported Variable is conservative. Solution has to be multiplied with rho. */
 
-  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,7 +79,12 @@ CScalarSolver<VariableType>::~CScalarSolver() {
 
 template <class VariableType>
 void CScalarSolver<VariableType>::CommonPreprocessing(CGeometry *geometry, const CConfig *config, const bool Output) {
+  /*--- Define booleans that are solver specific through CConfig's GlobalParams which have to be set in CFluidIteration
+   * before calling these solver functions. ---*/
   const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
+  const bool muscl = config->GetMUSCL();
+  const bool limiter = (config->GetKind_SlopeLimit() != NO_LIMITER) &&
+                       (config->GetInnerIter() <= config->GetLimiterIter());
 
   /*--- Clear residual and system matrix, not needed for
    * reducer strategy as we write over the entire matrix. ---*/
@@ -114,7 +119,12 @@ template <class VariableType>
 void CScalarSolver<VariableType>::Upwind_Residual(CGeometry* geometry, CSolver** solver_container,
                                                   CNumerics** numerics_container, CConfig* config,
                                                   unsigned short iMesh) {
+  /*--- Define booleans that are solver specific through CConfig's GlobalParams which have to be set in CFluidIteration
+   * before calling these solver functions. ---*/
   const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
+  const bool muscl = config->GetMUSCL();
+  const bool limiter = (config->GetKind_SlopeLimit() != NO_LIMITER) &&
+                       (config->GetInnerIter() <= config->GetLimiterIter());
 
   /*--- 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);

SU2_CFD/src/solvers/CSpeciesSolver.cpp

@@ -58,11 +58,6 @@ CSpeciesSolver::CSpeciesSolver(CGeometry* geometry, CConfig* config, unsigned sh
 
   nDim = geometry->GetnDim();
 
-  /*--- Set whether MUSCL and limiters are used in this solver. ---*/
-  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) {

SU2_CFD/src/solvers/CTurbSolver.cpp

@@ -37,10 +37,6 @@ 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);
-
-  muscl = config->GetMUSCL_Turb();
-  limiter = (config->GetKind_SlopeLimit_Turb() != NO_LIMITER) &&
-            (config->GetInnerIter() <= config->GetLimiterIter());
 }
 
 CTurbSolver::~CTurbSolver() {