cleanup for second order method (not tested yet)

Author: bigfooted

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -1073,8 +1073,8 @@ void CFVMFlowSolverBase<V, R>::PushSolutionBackInTime(unsigned long TimeIter, bo
     solver_container[iMesh][FLOW_SOL]->GetNodes()->Set_Solution_time_n();
     // nijso asks: we are in first order here: can this be removed?
     solver_container[iMesh][FLOW_SOL]->GetNodes()->Set_Solution_time_n1();
-    solver_container[iMesh][FLOW_SOL]->GetNodes()->Set_Density_time_n();
-    
+    solver_container[iMesh][FLOW_SOL]->GetNodes()->SetDensity_time_n();
+    solver_container[iMesh][FLOW_SOL]->GetNodes()->SetDensity_time_n1();
     if (rans) {
       solver_container[iMesh][TURB_SOL]->GetNodes()->Set_Solution_time_n();
       // nijso asks: we are in first order here: can this be removed?
@@ -1107,8 +1107,8 @@ void CFVMFlowSolverBase<V, R>::PushSolutionBackInTime(unsigned long TimeIter, bo
     for (unsigned short iMesh = 0; iMesh <= config->GetnMGLevels(); iMesh++) {
       // nijso asks: now we are at second order, but we push solution to time_n instead of time_n1 ?
       solver_container[iMesh][FLOW_SOL]->GetNodes()->Set_Solution_time_n();
-      solver_container[iMesh][FLOW_SOL]->GetNodes()->Set_Density_time_n();
-      solver_container[iMesh][FLOW_SOL]->GetNodes()->Set_Density_time_n1();
+      solver_container[iMesh][FLOW_SOL]->GetNodes()->SetDensity_time_n();
+      solver_container[iMesh][FLOW_SOL]->GetNodes()->SetDensity_time_n1();
       if (rans) solver_container[iMesh][TURB_SOL]->GetNodes()->Set_Solution_time_n();
 
       geometry[iMesh]->nodes->SetVolume_n();

SU2_CFD/include/solvers/CScalarSolver.inl

@@ -697,8 +697,10 @@ void CScalarSolver<VariableType>::SetResidual_DualTime(CGeometry* geometry, CSol
       if (Conservative) {
         if (incompressible)
           Density_n = flowNodes->GetDensity_time_n(iPoint);  // Updated for transient density
+          // nijso: no second order for dynamic meshes?
         else
           Density_n = flowNodes->GetSolution_time_n(iPoint, 0);
+          // nijso: no second order for dynamic meshes?
       }
 
       for (iNeigh = 0; iNeigh < geometry->nodes->GetnPoint(iPoint); iNeigh++) {
@@ -756,7 +758,7 @@ void CScalarSolver<VariableType>::SetResidual_DualTime(CGeometry* geometry, CSol
             else
               Density_n = flowNodes->GetSolution_time_n(iPoint, 0);
           }
-
+          // nijso: what about second order?
           for (iVar = 0; iVar < nVar; iVar++) LinSysRes(iPoint, iVar) += Density_n * U_time_n[iVar] * Residual_GCL;
         }
         END_SU2_OMP_FOR

SU2_CFD/include/variables/CEulerVariable.hpp

@@ -189,16 +189,16 @@ class CEulerVariable : public CFlowVariable {
     return Primitive(iPoint, indices.Density()) <= 0.0;
   }
 
-  inline void Set_Density_time_n(unsigned long iPoint, su2double val) {
-    Density_time_n[iPoint] = val;
+  inline void SetDensity_Time_n(unsigned long iPoint, su2double val_density_time_n) {
+    Density_time_n[iPoint] = val_density_time_n;
   }
 
-  inline void Set_Density_time_n1(unsigned long iPoint, su2double val) {
-    Density_time_n1[iPoint] = val;
+  inline void SetDensity_time_n1(unsigned long iPoint, su2double val_density_time_n1) {
+    Density_time_n1[iPoint] = val_density_time_n1;
   }
 
-  inline void Set_Density_unsteady(unsigned long iPoint, su2double val) {
-    Density_unsteady[iPoint] = val;
+  inline void SetDensity_Unsteady(unsigned long iPoint, su2double val_density_unsteady) {
+    Density_unsteady[iPoint] = val_density_unsteady;
   }
 
   /*!

SU2_CFD/include/variables/CIncEulerVariable.hpp

@@ -101,15 +101,15 @@ class CIncEulerVariable : public CFlowVariable {
     return val_density <= 0.0;
   }
 
-  inline void Set_Density_time_n(unsigned long iPoint, su2double val) {
+  inline void SetDensity_time_n(unsigned long iPoint, su2double val) {
     Density_time_n[iPoint] = val;
   }
 
-  inline void Set_Density_time_n1(unsigned long iPoint, su2double val) {
+  inline void SetDensity_time_n1(unsigned long iPoint, su2double val) {
     Density_time_n1[iPoint] = val;
   }
 
-  inline void Set_Density_unsteady(unsigned long iPoint, su2double val) {
+  inline void SetDensity_Unsteady(unsigned long iPoint, su2double val) {
     Density_unsteady[iPoint] = val;
   }
 

SU2_CFD/include/variables/CVariable.hpp

@@ -70,7 +70,7 @@ class CVariable {
   MatrixType Solution_time_n;    /*!< \brief Solution of the problem at time n for dual-time stepping technique. */
   MatrixType Solution_time_n1;   /*!< \brief Solution of the problem at time n-1 for dual-time stepping technique. */
   VectorType Delta_Time;         /*!< \brief Time step. */
-  VectorType Density_unsteady;
+  VectorType Density_unsteady;       /*!< \brief density for unsteady flows. */
   VectorType Density_time_n;         /*!< \brief density at time n for dual-time stepping technique. */
   VectorType Density_time_n1;        /*!< \brief density at time n for dual-time stepping technique. */
 
@@ -297,12 +297,12 @@ class CVariable {
     /*!
    * \brief Set the density at time n.
    */
-  void Set_Density_time_n();
+  void SetDensity_time_n();
 
     /*!
    * \brief Set the density at time n-1.
    */
-  void Set_Density_time_n1();
+  void SetDensity_time_n1();
 
   /*!
    * \brief Set the variable solution at time n.
@@ -337,15 +337,15 @@ class CVariable {
     Solution_time_n1(iPoint,iVar) = val_sol;
   }
 
-  inline void Set_Density_time_n(unsigned long iPoint, su2double val) {
+  inline void SetDensity_time_n(unsigned long iPoint, su2double val) {
     Density_time_n[iPoint] = val;
   }
 
-   inline void Set_Density_time_n1(unsigned long iPoint, su2double val) {
+   inline void SetDensity_time_n1(unsigned long iPoint, su2double val) {
     Density_time_n1[iPoint] = val;
   }
 
-  inline void Set_Density_unsteady(unsigned long iPoint, su2double val) {
+  inline void SetDensity_unsteady(unsigned long iPoint, su2double val) {
     Density_unsteady[iPoint] = val;
   } 
 

SU2_CFD/src/integration/CIntegration.cpp

@@ -248,8 +248,8 @@ void CIntegration::SetDualTime_Solver(const CGeometry *geometry, CSolver *solver
   /*--- Store old solution ---*/
   solver->GetNodes()->Set_Solution_time_n1();
   solver->GetNodes()->Set_Solution_time_n();
-  solver->GetNodes()->Set_Density_time_n();
-  solver->GetNodes()->Set_Density_time_n1();
+  solver->GetNodes()->SetDensity_time_n();
+  solver->GetNodes()->SetDensity_time_n1();
 
   SU2_OMP_SAFE_GLOBAL_ACCESS(solver->ResetCFLAdapt();)
 

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -2755,15 +2755,13 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
 
       Density_time_nM1 = nodes->GetDensity_time_n1(iPoint);
       Density_time_n = nodes->GetDensity_time_n(iPoint);
-      Density_unsteady = nodes->GetDensity_unsteady(iPoint);
       Density = nodes->GetDensity(iPoint);
       Cp = nodes->GetSpecificHeatCp(iPoint);
 
       /*--- Compute the conservative variable vector for all time levels. ---*/
-
+      // nijso: note that we still assume that cp is constant in time.
       V2U(Density_time_nM1, Cp, V_time_nM1, U_time_nM1);
       V2U(Density_time_n, Cp, V_time_n, U_time_n);
-      // nijso asks: what is the difference between density_unsteady and density?
       V2U(Density, Cp, V_time_nP1, U_time_nP1);
 
       /*--- CV volume at time n+1. As we are on a static mesh, the volume

SU2_CFD/src/variables/CIncEulerVariable.cpp

@@ -58,7 +58,8 @@ CIncEulerVariable::CIncEulerVariable(su2double density, su2double pressure, cons
   if (dual_time) {
     Solution_time_n = Solution;
     Solution_time_n1 = Solution;
-    Density_unsteady = density;
+    Density_time_n = density;
+    Density_time_n1 = density;
   }
 
   if (config->GetKind_Streamwise_Periodic() != ENUM_STREAMWISE_PERIODIC::NONE) {
@@ -69,6 +70,7 @@ CIncEulerVariable::CIncEulerVariable(su2double density, su2double pressure, cons
 }
 
 bool CIncEulerVariable::SetPrimVar(unsigned long iPoint, CFluidModel *FluidModel)  {
+
   bool physical = true;
 
   /*--- Set the value of the pressure ---*/

SU2_CFD/src/variables/CIncNSVariable.cpp

@@ -78,7 +78,6 @@ bool CIncNSVariable::SetPrimVar(unsigned long iPoint, su2double eddy_visc, su2do
   /*--- Set the value of the density ---*/
 
   const auto check_dens = SetDensity(iPoint, FluidModel->GetDensity());
-  Density_unsteady[iPoint] = FluidModel->GetDensity();
 
   /*--- Non-physical solution found. Revert to old values. ---*/
 
@@ -102,6 +101,9 @@ bool CIncNSVariable::SetPrimVar(unsigned long iPoint, su2double eddy_visc, su2do
 
   }
 
+/*--- Set density for unsteady problems ---*/
+Density_unsteady[iPoint] = FluidModel->GetDensity();
+
   /*--- Set the value of the velocity and velocity^2 (requires density) ---*/
 
   SetVelocity(iPoint);

SU2_CFD/src/variables/CVariable.cpp

@@ -61,17 +61,15 @@ CVariable::CVariable(unsigned long npoint, unsigned long ndim, unsigned long nva
   Solution.resize(nPoint,nVar) = su2double(0.0);
   Solution_Old.resize(nPoint,nVar) = su2double(0.0);
 
-  if (config->GetTime_Domain())
-    Solution_time_n.resize(nPoint,nVar) = su2double(0.0);
-
   if (config->GetTime_Domain()) {
+    Solution_time_n.resize(nPoint,nVar) = su2double(0.0);
     Density_unsteady.resize(nPoint);
     Density_time_n.resize(nPoint);
     Density_time_n1.resize(nPoint);
   }
 
   if (config->GetTime_Marching() != TIME_MARCHING::STEADY)
-    Solution_time_n1.resize(nPoint,nVar) = su2double(0.0);    
+    Solution_time_n1.resize(nPoint,nVar) = su2double(0.0);
 
   /*--- User defined source terms ---*/
   if (config->GetPyCustomSource()) UserDefinedSource.resize(nPoint,nVar) = su2double(0.0);
@@ -105,13 +103,13 @@ void CVariable::Set_Solution_time_n() {
   parallelCopy(Solution.size(), Solution.data(), Solution_time_n.data());
 }
 
-void CVariable::Set_Density_time_n(){
+void CVariable::SetDensity_time_n(){
   assert(Density_time_n.size() == Density_unsteady.size());
   parallelCopy(Density_unsteady.size(),Density_unsteady.data(), Density_time_n.data());
 }
 
-void CVariable::Set_Density_time_n1(){
-  assert(Density_time_n.size() == Density_unsteady.size());
+void CVariable::SetDensity_time_n1(){
+  assert(Density_time_n1.size() == Density_time_n.size());
   parallelCopy(Density_time_n.size(),Density_time_n.data(), Density_time_n1.data());
 }
 void CVariable::Set_Solution_time_n1() {