Merge pull request #1107 from su2code/heat_solver_fixes

Heat solver fixes for primal and adjoint CHT simulations

Author: pcarruscag

Common/include/CConfig.hpp

@@ -5137,21 +5137,19 @@ class CConfig {
   bool GetHold_GridFixed(void) const { return Hold_GridFixed; }
 
   /*!
+   * \author H. Kline
    * \brief Get the kind of objective function. There are several options: Drag coefficient,
    *        Lift coefficient, efficiency, etc.
    * \note The objective function will determine the boundary condition of the adjoint problem.
+   * \param[in] val_obj
    * \return Kind of objective function.
    */
-  unsigned short GetKind_ObjFunc(void) const { return Kind_ObjFunc[0]; }
+  unsigned short GetKind_ObjFunc(unsigned short val_obj = 0) const { return Kind_ObjFunc[val_obj]; }
 
   /*!
-   * \author H. Kline
-   * \brief Get the kind of objective function. There are several options: Drag coefficient,
-   *        Lift coefficient, efficiency, etc.
-   * \note The objective function will determine the boundary condition of the adjoint problem.
-   * \return Kind of objective function.
+   * \brief Similar to GetKind_ObjFunc but returns the corresponding string.
    */
-  unsigned short GetKind_ObjFunc(unsigned short val_obj) const { return Kind_ObjFunc[val_obj]; }
+  string GetName_ObjFunc(unsigned short val_obj = 0) const;
 
   /*!
    * \author H. Kline
@@ -5180,12 +5178,6 @@ class CConfig {
    */
   su2double GetCoeff_ObjChainRule(unsigned short iVar) const { return Obj_ChainRuleCoeff[iVar]; }
 
-  /*!
-   * \author H. Kline
-   * \brief Get the flag indicating whether to comput a combined objective.
-   */
-  bool GetComboObj(void);
-
   /*!
    * \brief Get the kind of sensitivity smoothing technique.
    * \return Kind of sensitivity smoothing technique.

Common/src/CConfig.cpp

@@ -9309,6 +9309,13 @@ short CConfig::FindInterfaceMarker(unsigned short iInterface) const {
   return -1;
 }
 
+string CConfig::GetName_ObjFunc(unsigned short val_obj) const {
+  for (auto item : Objective_Map)
+    if (item.second == static_cast<ENUM_OBJECTIVE>(Kind_ObjFunc[val_obj]))
+      return item.first;
+  return string();
+}
+
 void CConfig::Tick(double *val_start_time) {
 
 #ifdef PROFILE

Common/src/geometry/CPhysicalGeometry.cpp

@@ -8425,7 +8425,7 @@ void CPhysicalGeometry::ComputeMeshQualityStatistics(CConfig *config) {
     const unsigned long jPoint = edges->GetNode(iEdge,1);
 
     const unsigned long GlobalIndex_i = nodes->GetGlobalIndex(iPoint);
-    const unsigned long GlobalIndex_j = nodes->GetGlobalIndex(iPoint);
+    const unsigned long GlobalIndex_j = nodes->GetGlobalIndex(jPoint);
 
     /*-- Area normal for the current edge. Recall that this normal
      is computed by summing the normals of adjacent faces along

Common/src/linear_algebra/CSysSolve.cpp

@@ -246,7 +246,7 @@ unsigned long CSysSolve<ScalarType>::CG_LinSolver(const CSysVector<ScalarType> &
     norm_r = r.norm();
     norm0  = b.norm();
     if ((norm_r < tol*norm0) || (norm_r < eps)) {
-      if (master) cout << "CSysSolve::ConjugateGradient(): system solved by initial guess." << endl;
+      if (master && !mesh_deform) cout << "CSysSolve::ConjugateGradient(): system solved by initial guess." << endl;
       return 0;
     }
 

SU2_CFD/include/drivers/CDiscAdjSinglezoneDriver.hpp

@@ -7,7 +7,7 @@
  *
  * SU2 Project Website: https://su2code.github.io
  *
- * The SU2 Project is maintained by the SU2 Foundation 
+ * The SU2 Project is maintained by the SU2 Foundation
  * (http://su2foundation.org)
  *
  * Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
@@ -42,6 +42,7 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
   unsigned short RecordingState;                /*!< \brief The kind of recording the tape currently holds.*/
   unsigned short MainVariables,                 /*!< \brief The kind of recording linked to the main variables of the problem.*/
                  SecondaryVariables;            /*!< \brief The kind of recording linked to the secondary variables of the problem.*/
+  int MainSolver;                               /*!< \brief Index of the main adjoint solver. */
   su2double ObjFunc;                            /*!< \brief The value of the objective function.*/
   CIteration* direct_iteration;                 /*!< \brief A pointer to the direct iteration.*/
 

SU2_CFD/include/iteration/CHeatIteration.hpp

@@ -60,29 +60,25 @@ class CHeatIteration : public CFluidIteration {
                CVolumetricMovement*** grid_movement, CFreeFormDefBox*** FFDBox, unsigned short val_iZone,
                unsigned short val_iInst) override;
 
-  /*!
-   * \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.
-   * \param[in] solver - Container vector with all the solutions.
-   * \param[in] numerics - Description of the numerical method (the way in which the equations are solved).
-   * \param[in] config - Definition of the particular problem.
-   * \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.
-   */
-  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) override;
-
   /*!
    * \brief Updates the containers for the heat system.
-   * \param[in] ??? - Description here.
    */
   void Update(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) override;
+
+  /*!
+   * \brief Override the preprocessing of CFluidIteration.
+   */
+  inline void Preprocess(COutput*, CIntegration****, CGeometry****, CSolver*****, CNumerics******, CConfig**,
+                         CSurfaceMovement**, CVolumetricMovement***, CFreeFormDefBox***, unsigned short,
+                         unsigned short) override {}
+
+  /*!
+   * \brief Override the postprocessing of CFluidIteration.
+   */
+  inline void Postprocess(COutput*, CIntegration****, CGeometry****, CSolver*****, CNumerics******, CConfig**,
+                          CSurfaceMovement**, CVolumetricMovement***, CFreeFormDefBox***, unsigned short,
+                          unsigned short) override {}
 };

SU2_CFD/include/solvers/CDiscAdjFEASolver.hpp

@@ -176,10 +176,9 @@ class CDiscAdjFEASolver final : public CSolver {
   /*!
    * \brief Extract and set the geometrical sensitivity.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - The solver container holding all terms of the solution.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetSensitivity(CGeometry *geometry, CSolver **solver, CConfig *config) override;
+  void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver*) override;
 
   /*!
    * \brief Set the objective function.

SU2_CFD/include/solvers/CDiscAdjMeshSolver.hpp

@@ -39,8 +39,8 @@
  */
 class CDiscAdjMeshSolver final : public CSolver {
 private:
-  unsigned short KindDirect_Solver;
-  CSolver *direct_solver;
+  unsigned short KindDirect_Solver = 0;
+  CSolver *direct_solver = nullptr;
 
   CDiscAdjMeshBoundVariable* nodes = nullptr;   /*!< \brief Variables of the discrete adjoint mesh solver. */
 
@@ -97,10 +97,10 @@ class CDiscAdjMeshSolver final : public CSolver {
   /*!
    * \brief Extract and set the geometrical sensitivity.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - The solver container holding all terms of the solution.
    * \param[in] config - Definition of the particular problem.
+   * \param[in] target_solver - The target solver to store the sensitivities.
    */
-  void SetSensitivity(CGeometry *geometry, CSolver **solver, CConfig *config) override;
+  void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver* target_solver) override;
 
   /*!
    * \brief Prepare the solver for a new recording.

SU2_CFD/include/solvers/CDiscAdjSolver.hpp

@@ -156,10 +156,9 @@ class CDiscAdjSolver final : public CSolver {
   /*!
    * \brief Extract and set the geometrical sensitivity.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - The solver container holding all terms of the solution.
    * \param[in] config - Definition of the particular problem.
    */
-  void SetSensitivity(CGeometry *geometry, CSolver **solver, CConfig *config) override;
+  void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver*) override;
 
   /*!
    * \brief Set the objective function.

SU2_CFD/include/solvers/CSolver.hpp

@@ -3805,10 +3805,10 @@ class CSolver {
   /*!
    * \brief A virtual member. Extract and set the geometrical sensitivity.
    * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver - The solver container holding all terms of the solution.
    * \param[in] config - Definition of the particular problem.
+   * \param[in] target_solver - The target solver for the sensitivities, optional, for when the mesh solver is used.
    */
-  inline virtual void SetSensitivity(CGeometry *geometry, CSolver **solver, CConfig *config){ }
+  inline virtual void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver *target_solver = nullptr){ }
 
   /*!
    * \brief A virtual member. Extract and set the derivative of objective function.