Reverting Inc DualTime Res to old one and adapting affected regression-test values.

Author: TobiKattmann

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -3050,7 +3050,6 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
 
       LinSysRes.AddBlock(iPoint, Residual);
 
-      // ADD old version
       if (implicit) {
         for (iVar = 1; iVar < nVar; iVar++) {
           if (config->GetTime_Marching() == DT_STEPPING_1ST)
@@ -3060,40 +3059,11 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
         }
         for (iDim = 0; iDim < nDim; iDim++)
           Jacobian_i[iDim+1][iDim+1] = Density*Jacobian_i[iDim+1][iDim+1];
-        Jacobian_i[nDim+1][nDim+1] = Density*Cp*Jacobian_i[nDim+1][nDim+1];
+        if (energy) Jacobian_i[nDim+1][nDim+1] = Density*Cp*Jacobian_i[nDim+1][nDim+1];
 
         Jacobian.AddBlock2Diag(iPoint, Jacobian_i);
       }
-      // ADD old version
 
-      if (implicit && false) {
-
-        SetPreconditioner(config, iPoint);
-        for (iVar = 0; iVar < nVar; iVar++) {
-          for (jVar = 0; jVar < nVar; jVar++) {
-            Jacobian_i[iVar][jVar] = Preconditioner[iVar][jVar];
-          }
-        }
-
-        for (iVar = 0; iVar < nVar; iVar++) {
-          for (jVar = 0; jVar < nVar; jVar++) {
-            if (config->GetTime_Marching() == DT_STEPPING_1ST)
-              Jacobian_i[iVar][jVar] *= Volume_nP1 / TimeStep;
-            if (config->GetTime_Marching() == DT_STEPPING_2ND)
-              Jacobian_i[iVar][jVar] *= (Volume_nP1*3.0)/(2.0*TimeStep);
-          }
-        }
-
-        if (!energy) {
-            for (iVar = 0; iVar < nVar; iVar++) {
-              Jacobian_i[iVar][nDim+1] = 0.0;
-              Jacobian_i[nDim+1][iVar] = 0.0;
-            }
-        }
-
-        Jacobian.AddBlock2Diag(iPoint, Jacobian_i);
-
-      }
     }
 
   }
@@ -3293,7 +3263,6 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
       if (!energy) Residual[nDim+1] = 0.0;
       LinSysRes.AddBlock(iPoint, Residual);
 
-      // ADD old version
       if (implicit) {
         for (iVar = 1; iVar < nVar; iVar++) {
           if (config->GetTime_Marching() == DT_STEPPING_1ST)
@@ -3303,37 +3272,11 @@ void CIncEulerSolver::SetResidual_DualTime(CGeometry *geometry, CSolver **solver
         }
         for (iDim = 0; iDim < nDim; iDim++)
           Jacobian_i[iDim+1][iDim+1] = Density*Jacobian_i[iDim+1][iDim+1];
-        Jacobian_i[nDim+1][nDim+1] = Density*Cp*Jacobian_i[nDim+1][nDim+1];
+        if (energy) Jacobian_i[nDim+1][nDim+1] = Density*Cp*Jacobian_i[nDim+1][nDim+1];
 
         Jacobian.AddBlock2Diag(iPoint, Jacobian_i);
       }
-      // ADD old version
-
-      if (implicit && false) {
-        SetPreconditioner(config, iPoint);
-        for (iVar = 0; iVar < nVar; iVar++) {
-          for (jVar = 0; jVar < nVar; jVar++) {
-            Jacobian_i[iVar][jVar] = Preconditioner[iVar][jVar];
-          }
-        }
-
-        for (iVar = 0; iVar < nVar; iVar++) {
-          for (jVar = 0; jVar < nVar; jVar++) {
-            if (config->GetTime_Marching() == DT_STEPPING_1ST)
-              Jacobian_i[iVar][jVar] *= Volume_nP1 / TimeStep;
-            if (config->GetTime_Marching() == DT_STEPPING_2ND)
-              Jacobian_i[iVar][jVar] *= (Volume_nP1*3.0)/(2.0*TimeStep);
-          }
-        }
 
-        if (!energy) {
-          for (iVar = 0; iVar < nVar; iVar++) {
-            Jacobian_i[iVar][nDim+1] = 0.0;
-            Jacobian_i[nDim+1][iVar] = 0.0;
-          }
-        }
-        Jacobian.AddBlock2Diag(iPoint, Jacobian_i);
-      }
     }
   }
 

TestCases/parallel_regression.py

@@ -814,7 +814,7 @@ def main():
     unst_inc_turb_naca0015_sa.cfg_dir   = "unsteady/pitching_naca0015_rans_inc"
     unst_inc_turb_naca0015_sa.cfg_file  = "config_incomp_turb_sa.cfg"
     unst_inc_turb_naca0015_sa.test_iter = 1
-    unst_inc_turb_naca0015_sa.test_vals = [-2.991060, -6.866340, 1.476415, 0.419712]
+    unst_inc_turb_naca0015_sa.test_vals = [-3.004011, -6.876230, 1.487888, 0.421869]
     unst_inc_turb_naca0015_sa.su2_exec  = "parallel_computation.py -f"
     unst_inc_turb_naca0015_sa.timeout   = 1600
     unst_inc_turb_naca0015_sa.tol       = 0.00001
@@ -1143,8 +1143,8 @@ def main():
     cht_incompressible_unsteady.cfg_dir   = "coupled_cht/incomp_2d_unsteady"
     cht_incompressible_unsteady.cfg_file  = "cht_2d_3cylinders.cfg"
     cht_incompressible_unsteady.test_iter = 2
-    cht_incompressible_unsteady.test_vals = [-1.356091, -0.080383, -0.080387, -0.080384] #last 4 columns
-    cht_incompressible_unsteady.su2_exec  = "SU2_CFD"
+    cht_incompressible_unsteady.test_vals = [-1.307266, -0.080333, -0.080352, -0.080358] #last 4 columns
+    cht_incompressible_unsteady.su2_exec  = "mpirun -n 2 SU2_CFD"
     cht_incompressible_unsteady.timeout   = 1600
     cht_incompressible_unsteady.multizone = True
     cht_incompressible_unsteady.unsteady  = True

TestCases/serial_regression.py

@@ -949,7 +949,7 @@ def main():
     unst_inc_turb_naca0015_sa.cfg_dir   = "unsteady/pitching_naca0015_rans_inc"
     unst_inc_turb_naca0015_sa.cfg_file  = "config_incomp_turb_sa.cfg"
     unst_inc_turb_naca0015_sa.test_iter = 1
-    unst_inc_turb_naca0015_sa.test_vals = [-2.994996, -6.869781, 1.434864, 0.416626] #last 4 columns
+    unst_inc_turb_naca0015_sa.test_vals = [-3.007635, -6.879789, 1.445300, 0.419281] #last 4 columns
     unst_inc_turb_naca0015_sa.su2_exec  = "SU2_CFD"
     unst_inc_turb_naca0015_sa.timeout   = 1600
     unst_inc_turb_naca0015_sa.tol       = 0.00001
@@ -1355,7 +1355,7 @@ def main():
     cht_incompressible_unsteady.cfg_dir   = "coupled_cht/incomp_2d_unsteady"
     cht_incompressible_unsteady.cfg_file  = "cht_2d_3cylinders.cfg"
     cht_incompressible_unsteady.test_iter = 2
-    cht_incompressible_unsteady.test_vals = [-1.356091, -0.080383, -0.080387, -0.080384] #last 4 columns
+    cht_incompressible_unsteady.test_vals = [-1.307266, -0.080333, -0.080352, -0.080358] #last 4 columns
     cht_incompressible_unsteady.su2_exec  = "SU2_CFD"
     cht_incompressible_unsteady.timeout   = 1600
     cht_incompressible_unsteady.multizone = True