Revert implicit class data switch.

Author: TobiKattmann

SU2_CFD/include/solvers/CScalarSolver.hpp

@@ -57,7 +57,6 @@ 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. */
 

SU2_CFD/include/solvers/CScalarSolver.inl

@@ -79,6 +79,7 @@ CScalarSolver<VariableType>::~CScalarSolver() {
 
 template <class VariableType>
 void CScalarSolver<VariableType>::CommonPreprocessing(CGeometry *geometry, const CConfig *config, const bool Output) {
+  const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
 
   /*--- Clear residual and system matrix, not needed for
    * reducer strategy as we write over the entire matrix. ---*/
@@ -113,6 +114,8 @@ 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);
+
   /*--- 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. ---*/
@@ -455,6 +458,7 @@ 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,8 +58,7 @@ 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);
+  /*--- 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());
@@ -396,6 +395,7 @@ 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.
@@ -540,6 +540,7 @@ 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

@@ -38,7 +38,6 @@ CTurbSolver::CTurbSolver(CGeometry* geometry, CConfig *config, bool 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());
@@ -337,6 +336,7 @@ void CTurbSolver::LoadRestart(CGeometry** geometry, CSolver*** solver, CConfig*
 }
 
 void CTurbSolver::Impose_Fixed_Values(const CGeometry *geometry, const CConfig *config){
+  const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
 
   /*--- Check whether turbulence quantities are fixed to far-field values on a half-plane. ---*/
   if(config->GetTurb_Fixed_Values()){

config_template.cfg

@@ -1500,8 +1500,8 @@ CONVEXITY_CHECK_DEPTH = 3
 %                              0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
 FFD_DEFINITION= (MAIN_BOX, 0.5, 0.25, -0.25, 1.5, 0.25, -0.25, 1.5, 0.75, -0.25, 0.5, 0.75, -0.25, 0.5, 0.25, 0.25, 1.5, 0.25, 0.25, 1.5, 0.75, 0.25, 0.5, 0.75, 0.25)
 %
-% FFD box degree: 3D case (x_degree, y_degree, z_degree)
-%                 2D case (x_degree, y_degree, 0)
+% FFD box degree: 3D case (i_degree, j_degree, k_degree)
+%                 2D case (i_degree, j_degree, 0)
 FFD_DEGREE= (10, 10, 1)
 %
 % Surface grid continuity at the intersection with the faces of the FFD boxes.