move to scalarsolver

Author: bigfooted

SU2_CFD/include/solvers/CScalarSolver.hpp

@@ -508,6 +508,12 @@ class CScalarSolver : public CSolver {
   void LoadRestart(CGeometry** geometry, CSolver*** solver, CConfig* config, int val_iter,
                            bool val_update_geo) override = 0;
 
+  /*!
+   * \brief Move solution to previous time levels (for restarts).
+   */
+  void PushSolutionBackInTime(unsigned long TimeIter, bool restart,CSolver*** solver_container,
+                              CGeometry** geometry, CConfig* config);
+
   /*!
    * \brief Scalar solvers support OpenMP+MPI.
    */

SU2_CFD/include/solvers/CScalarSolver.inl

@@ -832,3 +832,37 @@ void CScalarSolver<VariableType>::SetResidual_DualTime(CGeometry* geometry, CSol
 
   }  // end dynamic grid
 }
+
+
+template <class VariableType>
+void CScalarSolver<VariableType>::PushSolutionBackInTime(unsigned long TimeIter, bool restart,CSolver*** solver_container,
+                              CGeometry** geometry, CConfig* config) {
+  const bool dual_time = ((config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) ||
+                            (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND));
+  /*--- The value of the solution for the first iteration of the dual time ---*/
+
+  if (dual_time && (TimeIter == 0 || (restart && (long)TimeIter == (long)config->GetRestart_Iter()))) {
+
+    /*--- Push back the initial condition to previous solution containers
+     for a 1st-order restart or when simply intitializing to freestream. ---*/
+
+    for (auto iMesh = 0u; iMesh <= config->GetnMGLevels(); iMesh++) {
+      nodes->Set_Solution_time_n();
+      nodes->Set_Solution_time_n1();
+    }
+
+    if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
+        (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND)) {
+
+      /*--- Load an additional restart file for a 2nd-order restart ---*/
+
+      LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), true);
+
+      /*--- Push back this new solution to time level N. ---*/
+
+      for (auto iMesh = 0u; iMesh <= config->GetnMGLevels(); iMesh++) {
+        nodes->Set_Solution_time_n();
+      }
+    }
+  }
+}

SU2_CFD/include/solvers/CSpeciesSolver.hpp

@@ -178,8 +178,8 @@ class CSpeciesSolver : public CScalarSolver<CSpeciesVariable> {
   /*!
    * \brief Move solution to previous time levels (for restarts).
    */
-  void PushSolutionBackInTime(unsigned long TimeIter, bool restart, CSolver*** solver_container,
-                              CGeometry** geometry, CConfig* config);
+  //void PushSolutionBackInTime(unsigned long TimeIter, bool restart, CSolver*** solver_container,
+  //                            CGeometry** geometry, CConfig* config);
 
   /*!
    * \brief Impose the fluid interface boundary condition using tranfer data.

SU2_CFD/src/solvers/CSpeciesFlameletSolver.cpp

@@ -34,6 +34,8 @@
 #include "../../include/variables/CFlowVariable.hpp"
 #include "../../include/variables/CSpeciesFlameletVariable.hpp"
 
+/*--- Explicit instantiation of the parent class of CSpeciesFlameletSolver. ---*/
+//template class CScalarSolver<CSpeciesFlameletVariable>;
 CSpeciesFlameletSolver::CSpeciesFlameletSolver(CGeometry* geometry, CConfig* config, unsigned short iMesh)
     : CSpeciesSolver(geometry, config, true) {
 
@@ -314,8 +316,8 @@ void CSpeciesFlameletSolver::SetInitialCondition(CGeometry** geometry, CSolver**
   }
 
   /*--- All the unsteady initialization ---*/
-  CSpeciesSolver::PushSolutionBackInTime(ExtIter, restart, solver_container, geometry, config);
-
+  //CScalarSolver<CSpeciesFlameletVariable>::PushSolutionBackInTime(ExtIter, restart, solver_container, geometry, config);
+  CSpeciesSolver::SetInitialCondition(geometry, solver_container, config, ExtIter);
 }
 
 void CSpeciesFlameletSolver::SetPreconditioner(CGeometry* geometry, CSolver** solver_container, CConfig* config) {

SU2_CFD/src/solvers/CSpeciesSolver.cpp

@@ -571,59 +571,9 @@ void CSpeciesSolver::Source_Residual(CGeometry *geometry, CSolver **solver_conta
 
 }
 
-
 void CSpeciesSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_container, CConfig *config, unsigned long TimeIter) {
 
   const bool restart   = (config->GetRestart() || config->GetRestart_Flow());
 
-  PushSolutionBackInTime(TimeIter, restart, solver_container, geometry,config);
-}
-
-void CSpeciesSolver::PushSolutionBackInTime(unsigned long TimeIter, bool restart, CSolver*** solver_container,
-                              CGeometry** geometry, CConfig* config) {
-
-
-  const bool dual_time = ((config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) ||
-                          (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND));
-
-
-  /*--- If restart solution, then interpolate the flow solution to
-   all the multigrid levels, this is important with the dual time strategy ---*/
-
-  if (restart && (TimeIter == 0)) {
-
-    for (auto iMesh = 1u; iMesh <= config->GetnMGLevels(); iMesh++) {
-      MultigridRestriction(*geometry[iMesh - 1], solver_container[iMesh - 1][SPECIES_SOL]->GetNodes()->GetSolution(),
-                           *geometry[iMesh], solver_container[iMesh][SPECIES_SOL]->GetNodes()->GetSolution());
-      solver_container[iMesh][SPECIES_SOL]->InitiateComms(geometry[iMesh], config, MPI_QUANTITIES::SOLUTION);
-      solver_container[iMesh][SPECIES_SOL]->CompleteComms(geometry[iMesh], config, MPI_QUANTITIES::SOLUTION);
-    }
-  }
-
-  /*--- The value of the solution for the first iteration of the dual time ---*/
-
-  if (dual_time && (TimeIter == 0 || (restart && (long)TimeIter == (long)config->GetRestart_Iter()))) {
-
-    /*--- Push back the initial condition to previous solution containers
-     for a 1st-order restart or when simply intitializing to freestream. ---*/
-
-    for (auto iMesh = 0u; iMesh <= config->GetnMGLevels(); iMesh++) {
-      solver_container[iMesh][SPECIES_SOL]->GetNodes()->Set_Solution_time_n();
-      solver_container[iMesh][SPECIES_SOL]->GetNodes()->Set_Solution_time_n1();
-    }
-
-    if ((restart && (long)TimeIter == (long)config->GetRestart_Iter()) &&
-        (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND)) {
-
-      /*--- Load an additional restart file for a 2nd-order restart ---*/
-
-      solver_container[MESH_0][SPECIES_SOL]->LoadRestart(geometry, solver_container, config, SU2_TYPE::Int(config->GetRestart_Iter()-1), true);
-
-      /*--- Push back this new solution to time level N. ---*/
-
-      for (auto iMesh = 0u; iMesh <= config->GetnMGLevels(); iMesh++) {
-        solver_container[iMesh][SPECIES_SOL]->GetNodes()->Set_Solution_time_n();
-      }
-    }
-  }
-}
+  CScalarSolver<CSpeciesVariable>::PushSolutionBackInTime(TimeIter, restart, solver_container, geometry, config);
+}