Fix primal unsteady HEAT (and therefore CHT) restarts.

TobiKattmann · TobiKattmann · commit 49907533ffe0 · 2021-05-09T16:40:37.000+02:00
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
@@ -2921,18 +2921,6 @@ void CFluidDriver::Preprocess(unsigned long Iter) {
       config_container[iZone]->SetPhysicalTime(0.0);
   }
 
-//  /*--- Read the target pressure ---*/
-
-//  if (config_container[ZONE_0]->GetInvDesign_Cp() == YES)
-//    output[ZONE_0]->SetCp_InverseDesign(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL],
-//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], ExtIter);
-
-//  /*--- Read the target heat flux ---*/
-
-//  if (config_container[ZONE_0]->GetInvDesign_HeatFlux() == YES)
-//    output[ZONE_0]->SetHeatFlux_InverseDesign(solver_container[ZONE_0][INST_0][MESH_0][FLOW_SOL],
-//        geometry_container[ZONE_0][INST_0][MESH_0], config_container[ZONE_0], ExtIter);
-
   /*--- Set the initial condition for EULER/N-S/RANS and for a non FSI simulation ---*/
 
   if(!fsi) {
diff --git a/SU2_CFD/src/drivers/CMultizoneDriver.cpp b/SU2_CFD/src/drivers/CMultizoneDriver.cpp
@@ -244,6 +244,12 @@ void CMultizoneDriver::Preprocess(unsigned long TimeIter) {
                                                                              solver_container[iZone][INST_0],
                                                                              config_container[iZone], TimeIter);
     }
+    else if (!fsi && !config_container[iZone]->GetDiscrete_Adjoint() && config_container[iZone]->GetHeatProblem()) {
+      /*--- Set the initial condition for HEAT equation ---------------------------------------------*/
+      solver_container[iZone][INST_0][MESH_0][HEAT_SOL]->SetInitialCondition(geometry_container[iZone][INST_0],
+                                                                              solver_container[iZone][INST_0],
+                                                                              config_container[iZone], TimeIter);
+    }
   }
 
   SU2_MPI::Barrier(SU2_MPI::GetComm());
diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -129,6 +129,12 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
                                                                             solver_container[ZONE_0][INST_0],
                                                                             config_container[ZONE_0], TimeIter);
   }
+  else if ( config_container[ZONE_0]->GetHeatProblem()) {
+    /*--- Set the initial condition for HEAT equation ---------------------------------------------*/
+    solver_container[ZONE_0][INST_0][MESH_0][HEAT_SOL]->SetInitialCondition(geometry_container[ZONE_0][INST_0],
+                                                                            solver_container[ZONE_0][INST_0],
+                                                                            config_container[ZONE_0], TimeIter);
+  }
 
   SU2_MPI::Barrier(SU2_MPI::GetComm());
 
diff --git a/SU2_CFD/src/solvers/CHeatSolver.cpp b/SU2_CFD/src/solvers/CHeatSolver.cpp
@@ -137,6 +137,8 @@ CHeatSolver::CHeatSolver(CGeometry *geometry, CConfig *config, unsigned short iM
     config->SetHeat_Flux_Ref(config->GetViscosity_Ref()*config->GetSpecific_Heat_Cp());
   }
 
+  config->SetDelta_UnstTimeND(config->GetDelta_UnstTime() / config->GetTime_Ref());
+
   /*--- Store the value of the temperature and the heat flux density at the boundaries,
    used for communications with donor cells ---*/
 
@@ -1358,7 +1360,7 @@ void CHeatSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_co
 
   const bool restart   = (config->GetRestart() || config->GetRestart_Flow());
   const bool dual_time = ((config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) ||
-                    (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND));
+                          (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 ---*/

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,12 @@ void CMultizoneDriver::Preprocess(unsigned long TimeIter) {`
`244`	`244`	`solver_container[iZone][INST_0],`
`245`	`245`	`config_container[iZone], TimeIter);`
`246`	`246`	`}`
	`247`	`+ else if (!fsi && !config_container[iZone]->GetDiscrete_Adjoint() && config_container[iZone]->GetHeatProblem()) {`
	`248`	`+ /--- Set the initial condition for HEAT equation ---------------------------------------------/`
	`249`	`+ solver_container[iZone][INST_0][MESH_0][HEAT_SOL]->SetInitialCondition(geometry_container[iZone][INST_0],`
	`250`	`+ solver_container[iZone][INST_0],`
	`251`	`+ config_container[iZone], TimeIter);`
	`252`	`+ }`
`247`	`253`	`}`
`248`	`254`
`249`	`255`	`SU2_MPI::Barrier(SU2_MPI::GetComm());`