refactor output

Author: pcarruscag

SU2_CFD/include/output/CElasticityOutput.hpp

@@ -40,6 +40,7 @@ class CElasticityOutput final: public COutput {
   unsigned short nVar_FEM; //!< Number of FEM variables
   bool linear_analysis,    //!< Boolean indicating a linear analysis
        nonlinear_analysis, //!< Boolean indicating a nonlinear analysis
+       coupled_heat,       //!< Boolean indicating a thermoelastic analysis
        dynamic;            //!< Boolean indicating a dynamic analysis
 
 public:
@@ -82,6 +83,11 @@ class CElasticityOutput final: public COutput {
    * \param[in] config - Definition of the particular problem.
    * \return <TRUE> if the residuals should be initialized.
    */
-  bool SetInitResiduals(const CConfig *config) override ;
+  bool SetInitResiduals(const CConfig *config) override;
 
+  /*!
+   * \brief LoadSurfaceData
+   */
+  void LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint,
+                       unsigned short iMarker, unsigned long iVertex) override;
 };

SU2_CFD/include/output/CHeatOutput.hpp

@@ -50,12 +50,22 @@ class CHeatOutput final: public CFVMOutput {
    */
   void SetHistoryOutputFields(CConfig *config) override;
 
+  /*!
+   * \brief Set the available history output fields in another output instance.
+   */
+  static void SetHistoryOutputFieldsImpl(CConfig *config, COutput* output);
+
   /*!
    * \brief Load the history output field values
    * \param[in] config - Definition of the particular problem.
    */
   void LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) override;
 
+  /*!
+   * \brief Set the history output field values in another output instance.
+   */
+  static void LoadHistoryDataImpl(CConfig *config, CGeometry *geometry, CSolver **solver, COutput* output);
+
   /*!
    * \brief Set the available volume output fields
    * \param[in] config - Definition of the particular problem.

SU2_CFD/include/output/COutput.hpp

@@ -55,6 +55,7 @@ class CSolver;
 class CFileWriter;
 class CParallelDataSorter;
 class CConfig;
+class CHeatOutput;
 
 using namespace std;
 
@@ -65,6 +66,7 @@ using namespace std;
  */
 class COutput {
 protected:
+  friend class CHeatOutput;
 
   /*----------------------------- General ----------------------------*/
 

SU2_CFD/include/solvers/CFEASolver.hpp

@@ -101,19 +101,12 @@ class CFEASolver : public CFEASolverBase {
   bool body_forces = false;    /*!< \brief Whether any body force is active. */
 
   /*!
- * \brief Pointer to the heat solver for coupled simulations.
- *
- * This member stores a pointer to the heat solver, which handles
- * the solution of the heat equation in weakly coupled simulations.
- * It is initialized during the preprocessing step if the configuration
- * enables the weak coupling of heat and elasticity solvers. This solver
- * provides temperature information to the finite element elasticity solver
- * and contributes to the coupled residuals.
- *
- * The `heat_solver` pointer remains `nullptr` when the heat solver is not enabled
- * in the configuration. Memory for the heat solver is dynamically allocated
- * during initialization and released in the destructor to avoid memory leaks.
- */
+   * \brief Pointer to the heat solver for coupled simulations.
+   *
+   * This member stores a pointer to the heat solver, which handles the solution of the heat equation in weakly coupled
+   * simulations. It is initialized during the preprocessing step if the configuration enables the weak coupling of
+   * heat and elasticity solvers. This solver provides temperature information to the finite element elasticity solver.
+   */
   CSolver* heat_solver = nullptr;
 
   /*!

SU2_CFD/src/iteration/CFEAIteration.cpp

@@ -48,12 +48,12 @@ void CFEAIteration::Iterate(COutput* output, CIntegration**** integration, CGeom
   CIntegration* feaIntegration = integration[val_iZone][val_iInst][FEA_SOL];
   CSolver* feaSolver = solver[val_iZone][val_iInst][MESH_0][FEA_SOL];
 
-  /*--- Add heat solver integration step ---*/
-    if (config[val_iZone]->GetWeakly_Coupled_Heat()) {
+  /*--- Add heat solver integration step. ---*/
+  if (config[val_iZone]->GetWeakly_Coupled_Heat()) {
     config[val_iZone]->SetGlobalParam(MAIN_SOLVER::HEAT_EQUATION, RUNTIME_HEAT_SYS);
-    integration[val_iZone][val_iInst][HEAT_SOL]->SingleGrid_Iteration(
-        geometry, solver, numerics, config, RUNTIME_HEAT_SYS, val_iZone, val_iInst);
-    }
+    integration[val_iZone][val_iInst][HEAT_SOL]->SingleGrid_Iteration(geometry, solver, numerics, config,
+                                                                      RUNTIME_HEAT_SYS, val_iZone, val_iInst);
+  }
 
   /*--- FEA equations ---*/
   config[val_iZone]->SetGlobalParam(MAIN_SOLVER::FEM_ELASTICITY, RUNTIME_FEA_SYS);

SU2_CFD/src/output/CElasticityOutput.cpp

@@ -24,18 +24,18 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
-
-
 #include "../../include/output/CElasticityOutput.hpp"
+#include "../../include/output/CHeatOutput.hpp"
 
 #include "../../../Common/include/geometry/CGeometry.hpp"
 #include "../../include/solvers/CSolver.hpp"
 
 CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COutput(config, nDim, false) {
 
-  linear_analysis = (config->GetGeometricConditions() == STRUCT_DEFORMATION::SMALL);
-  nonlinear_analysis = (config->GetGeometricConditions() == STRUCT_DEFORMATION::LARGE);
-  dynamic = (config->GetTime_Domain());
+  linear_analysis = config->GetGeometricConditions() == STRUCT_DEFORMATION::SMALL;
+  nonlinear_analysis = config->GetGeometricConditions() == STRUCT_DEFORMATION::LARGE;
+  coupled_heat = config->GetWeakly_Coupled_Heat();
+  dynamic = config->GetTime_Domain();
 
   /*--- Initialize number of variables ---*/
   if (linear_analysis) nVar_FEM = nDim;
@@ -48,20 +48,21 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
   }
 
   /*--- Default fields for screen output ---*/
-  if (nRequestedScreenFields == 0){
+  if (nRequestedScreenFields == 0) {
     if (dynamic) requestedScreenFields.emplace_back("TIME_ITER");
     if (multiZone) requestedScreenFields.emplace_back("OUTER_ITER");
     requestedScreenFields.emplace_back("INNER_ITER");
-    if(linear_analysis){
+    if (linear_analysis) {
       requestedScreenFields.emplace_back("RMS_DISP_X");
       requestedScreenFields.emplace_back("RMS_DISP_Y");
       requestedScreenFields.emplace_back("RMS_DISP_Z");
     }
-    if(nonlinear_analysis){
+    if (nonlinear_analysis) {
       requestedScreenFields.emplace_back("RMS_UTOL");
       requestedScreenFields.emplace_back("RMS_RTOL");
       requestedScreenFields.emplace_back("RMS_ETOL");
     }
+    if (coupled_heat) requestedScreenFields.emplace_back("RMS_TEMPERATURE");
     requestedScreenFields.emplace_back("VMS");
     nRequestedScreenFields = requestedScreenFields.size();
   }
@@ -71,11 +72,8 @@ CElasticityOutput::CElasticityOutput(CConfig *config, unsigned short nDim) : COu
     requestedVolumeFields.emplace_back("COORDINATES");
     requestedVolumeFields.emplace_back("SOLUTION");
     requestedVolumeFields.emplace_back("STRESS");
-    if (dynamic) {
-      requestedVolumeFields.emplace_back("VELOCITY");
-      requestedVolumeFields.emplace_back("ACCELERATION");
-    }
     if (config->GetTopology_Optimization()) requestedVolumeFields.emplace_back("TOPOLOGY");
+    if (coupled_heat) requestedVolumeFields.emplace_back("PRIMITIVE");
     nRequestedVolumeFields = requestedVolumeFields.size();
   }
 
@@ -148,20 +146,18 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
     SetHistoryOutputValue("TOPOL_DISCRETENESS", fea_solver->GetTotal_OFDiscreteness());
   }
 
+  /*--- Add heat solver data if available. ---*/
+  if (coupled_heat) {
+    CHeatOutput::LoadHistoryDataImpl(config, geometry, solver, this);
+    SetHistoryOutputValue("LINSOL_ITER_HEAT", heat_solver->GetIterLinSolver());
+    SetHistoryOutputValue("LINSOL_RESIDUAL_HEAT", log10(heat_solver->GetResLinSolver()));
+  }
+
   ComputeSimpleCustomOutputs(config);
 
   /*--- Keep this as last, since it uses the history values that were set. ---*/
   SetCustomAndComboObjectives(FEA_SOL, config, solver);
 
-  /*--- Add heat solver data if available ---*/
-  if (heat_solver) {
-    SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
-    SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
-    SetHistoryOutputValue("AVG_TEMPERATURE", heat_solver->GetTotal_AvgTemperature());
-    SetHistoryOutputValue("TOTAL_HEATFLUX", heat_solver->GetTotal_HeatFlux());
-    SetHistoryOutputValue("MAXIMUM_HEATFLUX", heat_solver->GetTotal_MaxHeatFlux());
-  }
-
 }
 
 void CElasticityOutput::SetHistoryOutputFields(CConfig *config) {
@@ -199,14 +195,11 @@ void CElasticityOutput::SetHistoryOutputFields(CConfig *config) {
   }
   AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
 
-  if (config->GetWeakly_Coupled_Heat()) {
-    AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root mean square residual of the temperature", HistoryFieldType::RESIDUAL);
-    AddHistoryOutput("MAX_TEMPERATURE", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature", HistoryFieldType::RESIDUAL);
-    AddHistoryOutput("AVG_TEMPERATURE", "avg[T]", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Average temperature on all surfaces", HistoryFieldType::COEFFICIENT);
-    AddHistoryOutput("TOTAL_HEATFLUX", "HF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heat flux on all surfaces", HistoryFieldType::COEFFICIENT);
-    AddHistoryOutput("MAXIMUM_HEATFLUX", "MaxHF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Maximum heat flux on all surfaces", HistoryFieldType::COEFFICIENT);
+  if (coupled_heat) {
+    CHeatOutput::SetHistoryOutputFieldsImpl(config, this);
+    AddHistoryOutput("LINSOL_ITER_HEAT", "LinSolIterHeat", ScreenOutputFormat::INTEGER, "LINSOL", "Number of iterations of the linear solver.");
+    AddHistoryOutput("LINSOL_RESIDUAL_HEAT", "LinSolResHeat", ScreenOutputFormat::FIXED, "LINSOL", "Residual of the linear solver.");
   }
-
 }
 
 void CElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -232,6 +225,10 @@ void CElasticityOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSo
     SetVolumeOutputValue("ACCELERATION-Y", iPoint, Node_Struc->GetSolution_Accel(iPoint, 1));
     if (nDim == 3) SetVolumeOutputValue("ACCELERATION-Z", iPoint, Node_Struc->GetSolution_Accel(iPoint, 2));
   }
+  if (coupled_heat) {
+    CVariable* Node_Heat = solver[HEAT_SOL]->GetNodes();
+    SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Heat->GetSolution(iPoint, 0));
+  }
 
   SetVolumeOutputValue("STRESS-XX", iPoint, Node_Struc->GetStress_FEM(iPoint)[0]);
   SetVolumeOutputValue("STRESS-YY", iPoint, Node_Struc->GetStress_FEM(iPoint)[1]);
@@ -277,6 +274,10 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
     if (nDim == 3) AddVolumeOutput("ACCELERATION-Z", "Acceleration_z", "SOLUTION", "z-component of the acceleration vector");
   }
 
+  if (coupled_heat) {
+    AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION", "Temperature");
+  }
+
   AddVolumeOutput("STRESS-XX",    "Sxx", "STRESS", "x-component of the normal stress vector");
   AddVolumeOutput("STRESS-YY",    "Syy", "STRESS", "y-component of the normal stress vector");
   AddVolumeOutput("STRESS-XY",    "Sxy", "STRESS", "xy shear stress component");
@@ -293,8 +294,8 @@ void CElasticityOutput::SetVolumeOutputFields(CConfig *config){
     AddVolumeOutput("TOPOL_DENSITY", "Topology_Density", "TOPOLOGY", "filtered topology density");
   }
 
-  if (config->GetWeakly_Coupled_Heat()) {
-    AddVolumeOutput("TEMPERATURE", "Temperature", "SOLUTION", "Temperature");
+  if (coupled_heat) {
+    AddVolumeOutput("HEAT_FLUX", "Heat_Flux", "PRIMITIVE", "Heatflux");
     AddVolumeOutput("RES_TEMPERATURE", "Residual_Temperature", "RESIDUAL", "Residual of the temperature");
   }
 
@@ -305,3 +306,12 @@ bool CElasticityOutput::SetInitResiduals(const CConfig *config){
   return (config->GetTime_Domain() == NO && (curInnerIter  == 0));
 
 }
+
+void CElasticityOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint,
+                                        unsigned short iMarker, unsigned long iVertex) {
+  if (!coupled_heat || !config->GetViscous_Wall(iMarker)) return;
+
+  /* Heat flux value at each surface grid node. */
+  SetVolumeOutputValue("HEAT_FLUX", iPoint, solver[HEAT_SOL]->GetHeatFlux(iMarker, iVertex));
+
+}

SU2_CFD/src/output/CHeatOutput.cpp

@@ -72,42 +72,54 @@ CHeatOutput::CHeatOutput(CConfig *config, unsigned short nDim) : CFVMOutput(conf
 
 }
 
+void CHeatOutput::LoadHistoryDataImpl(CConfig *config, CGeometry *geometry, CSolver **solver, COutput* output) {
+
+  CSolver* heat_solver = solver[HEAT_SOL];
+
+  output->SetHistoryOutputValue("TOTAL_HEATFLUX", heat_solver->GetTotal_HeatFlux());
+  output->SetHistoryOutputValue("MAXIMUM_HEATFLUX", heat_solver->GetTotal_MaxHeatFlux());
+  output->SetHistoryOutputValue("AVG_TEMPERATURE", heat_solver->GetTotal_AvgTemperature());
+  output->SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
+  output->SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
+  if (config->GetMultizone_Problem()) {
+    output->SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
+  }
+  output->SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
+}
+
 void CHeatOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSolver **solver) {
 
   CSolver* heat_solver = solver[HEAT_SOL];
 
-  SetHistoryOutputValue("TOTAL_HEATFLUX", heat_solver->GetTotal_HeatFlux());
-  SetHistoryOutputValue("MAXIMUM_HEATFLUX", heat_solver->GetTotal_MaxHeatFlux());
-  SetHistoryOutputValue("AVG_TEMPERATURE", heat_solver->GetTotal_AvgTemperature());
-  SetHistoryOutputValue("RMS_TEMPERATURE", log10(heat_solver->GetRes_RMS(0)));
-  SetHistoryOutputValue("MAX_TEMPERATURE", log10(heat_solver->GetRes_Max(0)));
-  if (multiZone)
-    SetHistoryOutputValue("BGS_TEMPERATURE", log10(heat_solver->GetRes_BGS(0)));
+  LoadHistoryDataImpl(config, geometry, solver, this);
 
   SetHistoryOutputValue("LINSOL_ITER", heat_solver->GetIterLinSolver());
   SetHistoryOutputValue("LINSOL_RESIDUAL", log10(heat_solver->GetResLinSolver()));
-  SetHistoryOutputValue("CFL_NUMBER", config->GetCFL(MESH_0));
 
   ComputeSimpleCustomOutputs(config);
 
   /*--- Keep this as last, since it uses the history values that were set. ---*/
   SetCustomAndComboObjectives(HEAT_SOL, config, solver);
 }
 
+void CHeatOutput::SetHistoryOutputFieldsImpl(CConfig *config, COutput* output) {
 
-void CHeatOutput::SetHistoryOutputFields(CConfig *config){
+  output->AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root mean square residual of the temperature", HistoryFieldType::RESIDUAL);
+  output->AddHistoryOutput("MAX_TEMPERATURE", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature", HistoryFieldType::RESIDUAL);
+  output->AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "Block-Gauss-Seidel residual of the temperature", HistoryFieldType::RESIDUAL);
 
-  AddHistoryOutput("LINSOL_ITER", "LinSolIter", ScreenOutputFormat::INTEGER, "LINSOL", "Number of iterations of the linear solver.");
-  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", ScreenOutputFormat::FIXED, "LINSOL", "Residual of the linear solver.");
+  output->AddHistoryOutput("TOTAL_HEATFLUX", "HF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  output->AddHistoryOutput("MAXIMUM_HEATFLUX", "MaxHF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Maximum heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  output->AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Average temperature on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
+  output->AddHistoryOutput("CFL_NUMBER", "CFL number", ScreenOutputFormat::SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
+}
 
-  AddHistoryOutput("RMS_TEMPERATURE", "rms[T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root mean square residual of the temperature", HistoryFieldType::RESIDUAL);
-  AddHistoryOutput("MAX_TEMPERATURE", "max[T]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of the temperature", HistoryFieldType::RESIDUAL);
-  AddHistoryOutput("BGS_TEMPERATURE", "bgs[T]", ScreenOutputFormat::FIXED, "BGS_RES", "Block-Gauss-Seidel residual of the temperature", HistoryFieldType::RESIDUAL);
+void CHeatOutput::SetHistoryOutputFields(CConfig *config) {
 
-  AddHistoryOutput("TOTAL_HEATFLUX", "HF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("MAXIMUM_HEATFLUX", "MaxHF", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Maximum heatflux on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("AVG_TEMPERATURE", "AvgTemp", ScreenOutputFormat::SCIENTIFIC, "HEAT", "Average temperature on all surfaces defined in MARKER_MONITORING", HistoryFieldType::COEFFICIENT);
-  AddHistoryOutput("CFL_NUMBER", "CFL number", ScreenOutputFormat::SCIENTIFIC, "CFL_NUMBER", "Current value of the CFL number");
+  SetHistoryOutputFieldsImpl(config, this);
+
+  AddHistoryOutput("LINSOL_ITER", "LinSolIter", ScreenOutputFormat::INTEGER, "LINSOL", "Number of iterations of the linear solver.");
+  AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", ScreenOutputFormat::FIXED, "LINSOL", "Residual of the linear solver.");
 
   AddHistoryOutput("COMBO", "ComboObj", ScreenOutputFormat::SCIENTIFIC, "COMBO", "Combined obj. function value.", HistoryFieldType::COEFFICIENT);
 }