Unsteady CHT

Common/include/option_structure.hpp

@@ -163,7 +163,7 @@ enum ENUM_SOLVER {
   INC_EULER = 4,                    /*!< \brief Definition of the incompressible Euler's solver. */
   INC_NAVIER_STOKES =5,             /*!< \brief Definition of the incompressible Navier-Stokes' solver. */
   INC_RANS = 6,                     /*!< \brief Definition of the incompressible Reynolds-averaged Navier-Stokes' (RANS) solver. */
-  HEAT_EQUATION_FVM = 7,            /*!< \brief Definition of the finite volume heat solver. */
+  HEAT_EQUATION = 7,                /*!< \brief Definition of the finite volume heat solver. */
   FLUID_STRUCTURE_INTERACTION = 8,  /*!< \brief Definition of a FSI solver. */
   FEM_ELASTICITY = 9,               /*!< \brief Definition of a FEM solver. */
   ADJ_EULER = 10,                   /*!< \brief Definition of the continuous adjoint Euler's solver. */
@@ -202,15 +202,15 @@ static const MapType<string, ENUM_SOLVER> Solver_Map = {
   MakePair("ADJ_EULER", ADJ_EULER)
   MakePair("ADJ_NAVIER_STOKES", ADJ_NAVIER_STOKES)
   MakePair("ADJ_RANS", ADJ_RANS )
-  MakePair("HEAT_EQUATION_FVM", HEAT_EQUATION_FVM)
+  MakePair("HEAT_EQUATION", HEAT_EQUATION)
   MakePair("ELASTICITY", FEM_ELASTICITY)
   MakePair("DISC_ADJ_EULER", DISC_ADJ_EULER)
   MakePair("DISC_ADJ_RANS", DISC_ADJ_RANS)
   MakePair("DISC_ADJ_NAVIERSTOKES", DISC_ADJ_NAVIER_STOKES)
   MakePair("DISC_ADJ_INC_EULER", DISC_ADJ_INC_EULER)
   MakePair("DISC_ADJ_INC_RANS", DISC_ADJ_INC_RANS)
   MakePair("DISC_ADJ_INC_NAVIERSTOKES", DISC_ADJ_INC_NAVIER_STOKES)
-  MakePair("DISC_ADJ_HEAT_EQUATION_FVM", DISC_ADJ_HEAT)
+  MakePair("DISC_ADJ_HEAT_EQUATION", DISC_ADJ_HEAT)
   MakePair("DISC_ADJ_FEM_EULER", DISC_ADJ_FEM_EULER)
   MakePair("DISC_ADJ_FEM_RANS", DISC_ADJ_FEM_RANS)
   MakePair("DISC_ADJ_FEM_NS", DISC_ADJ_FEM_NS)

Common/src/CConfig.cpp

@@ -1062,6 +1062,8 @@ void CConfig::SetPointersNull(void) {
 
   Mesh_Box_Size = NULL;
 
+  Time_Ref = 1.0;
+
 }
 
 void CConfig::SetRunTime_Options(void) {
@@ -4832,7 +4834,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
       case FEM_ELASTICITY:
         Kind_Solver = DISC_ADJ_FEM;
         break;
-      case HEAT_EQUATION_FVM:
+      case HEAT_EQUATION:
         Kind_Solver = DISC_ADJ_HEAT;
         break;
       default:
@@ -8188,7 +8190,7 @@ void CConfig::SetGlobalParam(unsigned short val_solver,
         SetKind_TimeIntScheme(Kind_TimeIntScheme_AdjTurb);
       }
       break;
-    case HEAT_EQUATION_FVM:
+    case HEAT_EQUATION:
       if (val_system == RUNTIME_HEAT_SYS) {
         SetKind_ConvNumScheme(NONE, NONE, NONE, NONE, NONE, NONE);
         SetKind_TimeIntScheme(Kind_TimeIntScheme_Heat);

SU2_CFD/include/drivers/CDiscAdjMultizoneDriver.hpp

@@ -198,4 +198,11 @@ class CDiscAdjMultizoneDriver : public CMultizoneDriver {
    * \param[in] iZone - Zone where solver residuals are computed.
    */
   void SetResidual_BGS(unsigned short iZone);
+
+  /*!
+   * \brief gets Convergence on physical time scale, (deactivated in adjoint case)
+   * \return false
+   */
+  inline bool GetTimeConvergence() const override {return false;};
+
 };

SU2_CFD/include/drivers/CDiscAdjSinglezoneDriver.hpp

@@ -129,8 +129,8 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
 
   /*!
    * \brief gets Convergence on physical time scale, (deactivated in adjoint case)
-   * \return true, if convergence criteria has been met, else false
+   * \return false
    */
-  bool GetTimeConvergence() const override;
+  inline bool GetTimeConvergence() const override {return false;};
 
 };

SU2_CFD/include/drivers/CMultizoneDriver.hpp

@@ -131,4 +131,11 @@ class CMultizoneDriver : public CDriver {
 
   bool Monitor(unsigned long TimeIter);
 
+  /*!
+   * \brief  Returns whether all specified windowed-time-averaged ouputs have been converged
+   * \return Boolean indicating whether the problem is converged.
+   */
+  inline virtual bool GetTimeConvergence() const{
+    return driver_output->GetTimeConvergence();
+  }
 };

SU2_CFD/include/iteration_structure.hpp

@@ -682,7 +682,8 @@ class CFEMFluidIteration : public CFluidIteration {
  * \brief Class for driving an iteration of the heat system.
  * \author T. Economon
  */
-class CHeatIteration : public CIteration {
+class CHeatIteration : public CFluidIteration {
+
 public:
 
   /*!
@@ -696,22 +697,6 @@ class CHeatIteration : public CIteration {
    */
   ~CHeatIteration(void);
 
-  /*!
-   * \brief Preprocessing to prepare for an iteration of the physics.
-   * \param[in] ??? - Description here.
-   */
-  void Preprocess(COutput *output,
-                  CIntegration ****integration,
-                  CGeometry ****geometry,
-                  CSolver *****solver,
-                  CNumerics ******numerics,
-                  CConfig **config,
-                  CSurfaceMovement **surface_movement,
-                  CVolumetricMovement ***grid_movement,
-                  CFreeFormDefBox*** FFDBox,
-                  unsigned short val_iZone,
-                  unsigned short val_iInst);
-
   /*!
    * \brief Perform a single iteration of the heat system.
    * \param[in] output - Pointer to the COutput class.
@@ -737,7 +722,7 @@ class CHeatIteration : public CIteration {
                unsigned short val_iInst);
 
   /*!
-   * \brief Perform a single iteration of the wave system.
+   * \brief Iterate the heat system for a number of Inner_Iter iterations.
    * \param[in] output - Pointer to the COutput class.
    * \param[in] integration - Container vector with all the integration methods.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -747,19 +732,18 @@ class CHeatIteration : public CIteration {
    * \param[in] surface_movement - Surface movement classes of the problem.
    * \param[in] grid_movement - Volume grid movement classes of the problem.
    * \param[in] FFDBox - FFD FFDBoxes of the problem.
-   * \param[in] val_iZone - zone of the problem.
    */
   void Solve(COutput *output,
-               CIntegration ****integration,
-               CGeometry ****geometry,
-               CSolver *****solver,
-               CNumerics ******numerics,
-               CConfig **config,
-               CSurfaceMovement **surface_movement,
-               CVolumetricMovement ***grid_movement,
-               CFreeFormDefBox*** FFDBox,
-               unsigned short val_iZone,
-               unsigned short val_iInst);
+             CIntegration ****integration,
+             CGeometry ****geometry,
+             CSolver *****solver,
+             CNumerics ******numerics,
+             CConfig **config,
+             CSurfaceMovement **surface_movement,
+             CVolumetricMovement ***grid_movement,
+             CFreeFormDefBox*** FFDBox,
+             unsigned short val_iZone,
+             unsigned short val_iInst);
 
   /*!
    * \brief Updates the containers for the heat system.
@@ -776,41 +760,6 @@ class CHeatIteration : public CIteration {
               CFreeFormDefBox*** FFDBox,
               unsigned short val_iZone,
               unsigned short val_iInst);
-
-  /*!
-   * \brief Monitors the convergence and other metrics for the heat system.
-   * \param[in] ??? - Description here.
-   */
-  bool Monitor(COutput *output,
-      CIntegration ****integration,
-      CGeometry ****geometry,
-      CSolver *****solver,
-      CNumerics ******numerics,
-      CConfig **config,
-      CSurfaceMovement **surface_movement,
-      CVolumetricMovement ***grid_movement,
-      CFreeFormDefBox*** FFDBox,
-      unsigned short val_iZone,
-      unsigned short val_iInst);
-
-  /*!
-   * \brief Postprocess ???.
-   * \param[in] solver - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void Postprocess(COutput *output,
-                   CIntegration ****integration,
-                   CGeometry ****geometry,
-                   CSolver *****solver,
-                   CNumerics ******numerics,
-                   CConfig **config,
-                   CSurfaceMovement **surface_movement,
-                   CVolumetricMovement ***grid_movement,
-                   CFreeFormDefBox*** FFDBox,
-                   unsigned short val_iZone,
-                   unsigned short val_iInst);
-
 };
 
 /*!

SU2_CFD/include/solvers/CHeatSolverFVM.hpp → SU2_CFD/include/solvers/CHeatSolver.hpp

@@ -1,7 +1,7 @@
 /*!
- * \file CHeatSolverFVM.hpp
- * \brief Headers of the CHeatSolverFVM class
- * \author O. Burghardt
+ * \file CHeatSolver.hpp
+ * \brief Headers of the CHeatSolver class
+ * \author F. Palacios, T. Economon
  * \version 7.0.1 "Blackbird"
  *
  * SU2 Project Website: https://su2code.github.io
@@ -28,14 +28,15 @@
 #pragma once
 
 #include "CSolver.hpp"
-#include "../variables/CHeatFVMVariable.hpp"
+#include "../variables/CHeatVariable.hpp"
 
-/*! \class CHeatSolverFVM
- *  \brief Main class for defining the finite-volume heat solver.
- *  \author O. Burghardt
- *  \date January 19, 2018.
+/*!
+ * \class CHeatSolver
+ * \brief Main class for defining the finite-volume heat solver.
+ * \author O. Burghardt
+ * \version 7.0.1 "Blackbird"
  */
-class CHeatSolverFVM final : public CSolver {
+class CHeatSolver final : public CSolver {
 protected:
   unsigned short nVarFlow, nMarker, CurrentMesh;
   su2double **HeatFlux, *HeatFlux_per_Marker, *Surface_HF, Total_HeatFlux, AllBound_HeatFlux,
@@ -44,7 +45,7 @@ class CHeatSolverFVM final : public CSolver {
             *Surface_Areas, Total_HeatFlux_Areas, Total_HeatFlux_Areas_Monitor;
   su2double ***ConjugateVar, ***InterfaceVar;
 
-  CHeatFVMVariable* nodes = nullptr;  /*!< \brief The highest level in the variable hierarchy this solver can safely use. */
+  CHeatVariable* nodes = nullptr;  /*!< \brief The highest level in the variable hierarchy this solver can safely use. */
 
   /*!
    * \brief Return nodes to allow CSolver::base_nodes to be set.
@@ -56,17 +57,17 @@ class CHeatSolverFVM final : public CSolver {
   /*!
    * \brief Constructor of the class.
    */
-  CHeatSolverFVM(void);
+  CHeatSolver(void);
 
   /*!
    * \brief Constructor of the class.
    */
-  CHeatSolverFVM(CGeometry *geometry, CConfig *config, unsigned short iMesh);
+  CHeatSolver(CGeometry *geometry, CConfig *config, unsigned short iMesh);
 
   /*!
    * \brief Destructor of the class.
    */
-  virtual ~CHeatSolverFVM(void);
+  virtual ~CHeatSolver(void);
 
   /*!
    * \brief Restart residual and compute gradients.
@@ -380,4 +381,4 @@ class CHeatSolverFVM final : public CSolver {
    */
   inline su2double GetHeatFlux(unsigned short val_marker, unsigned long val_vertex) const override { return HeatFlux[val_marker][val_vertex]; }
 
-};
+};

SU2_CFD/include/variables/CHeatFVMVariable.hpp → SU2_CFD/include/variables/CHeatVariable.hpp

@@ -1,5 +1,5 @@
 /*!
- * \file CHeatFVMVariable.hpp
+ * \file CHeatVariable.hpp
  * \brief Class for defining the variables of the finite-volume heat equation solver.
  * \author F. Palacios, T. Economon
  * \version 7.0.1 "Blackbird"
@@ -30,12 +30,12 @@
 #include "CVariable.hpp"
 
 /*!
- * \class CHeatFVMVariable
+ * \class CHeatVariable
  * \brief Class for defining the variables of the finite-volume heat equation solver.
  * \author O. Burghardt
  * \version 7.0.1 "Blackbird"
  */
-class CHeatFVMVariable final : public CVariable {
+class CHeatVariable final : public CVariable {
 protected:
   MatrixType Solution_Direct;  /*!< \brief Direct solution container for use in the adjoint Heat solver. */
 
@@ -51,12 +51,12 @@ class CHeatFVMVariable final : public CVariable {
    * \param[in] nvar - Number of variables of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  CHeatFVMVariable(su2double heat, unsigned long npoint, unsigned long ndim, unsigned long nvar, CConfig *config);
+  CHeatVariable(su2double heat, unsigned long npoint, unsigned long ndim, unsigned long nvar, CConfig *config);
 
   /*!
    * \brief Destructor of the class.
    */
-  ~CHeatFVMVariable() = default;
+  ~CHeatVariable() = default;
 
   /*!
    * \brief Get the value of the reconstruction variables gradient at a node.

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -635,7 +635,7 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
         case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
           // per-surface output to be added soon
           break;
-        case HEAT_EQUATION_FVM: case DISC_ADJ_HEAT:
+        case HEAT_EQUATION: case DISC_ADJ_HEAT:
           // per-surface output to be added soon
           break;
         default:

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -542,7 +542,3 @@ void CDiscAdjSinglezoneDriver::SecondaryRecording(){
   AD::ClearAdjoints();
 
 }
-
-bool CDiscAdjSinglezoneDriver::GetTimeConvergence() const{
-  return false;
-}