su2code · TobiKattmann · Jul 31, 2021 · Mar 9, 2021 · Mar 9, 2021 · Mar 9, 2021
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -87,6 +87,7 @@ jobs:
       - name: Run Tests in Container
         uses: docker://su2code/test-su2:20200303
         with:
+          # -t <Tutorials-branch> -c <Testcases-branch>
           args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
   unit_tests:
     runs-on: ubuntu-latest

diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp
@@ -1086,7 +1086,8 @@ enum BC_TYPE {
   ENGINE_EXHAUST = 22,        /*!< \brief Boundary nacelle exhaust. */
   RIEMANN_BOUNDARY= 24,       /*!< \brief Riemann Boundary definition. */
   ISOTHERMAL = 25,            /*!< \brief No slip isothermal wall boundary condition. */
-  HEAT_FLUX  = 26,            /*!< \brief No slip constant heat flux wall boundary condition. */
+  HEAT_FLUX = 26,             /*!< \brief No slip constant heat flux wall boundary condition. */
+  HEAT_TRANSFER = 27,         /*!< \brief No slip heat transfer boundary condition. */
   ACTDISK_INLET = 32,         /*!< \brief Actuator disk inlet boundary definition. */
   ACTDISK_OUTLET = 33,        /*!< \brief Actuator disk outlet boundary definition. */
   CLAMPED_BOUNDARY = 34,      /*!< \brief Clamped Boundary definition. */

diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
diff --git a/SU2_CFD/include/solvers/CIncNSSolver.hpp b/SU2_CFD/include/solvers/CIncNSSolver.hpp
@@ -38,7 +38,7 @@
 class CIncNSSolver final : public CIncEulerSolver {
 
   /*!
-   * \brief Generic implementation of the isothermal and heatflux walls.
+   * \brief Generic implementation of the isothermal, heatflux and heat-transfer/convection walls.
    */
   void BC_Wall_Generic(const CGeometry *geometry,
                        const CConfig *config,
@@ -157,6 +157,16 @@ class CIncNSSolver final : public CIncEulerSolver {
                           CConfig *config,
                           unsigned short val_marker) override;
 
+  /*!
+   * \brief Impose a heat flux by prescribing a heat transfer coefficient and a temperature at infinity.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_marker - Surface marker where the boundary condition is applied.
+   */
+  void BC_HeatTransfer_Wall(const CGeometry *geometry,
+                            const CConfig *config,
+                            const unsigned short val_marker) override;
+
   /*!
    * \brief Impose the (received) conjugate heat variables.
    * \param[in] geometry - Geometrical definition of the problem.

diff --git a/SU2_CFD/include/solvers/CNSSolver.hpp b/SU2_CFD/include/solvers/CNSSolver.hpp
@@ -65,7 +65,7 @@ class CNSSolver final : public CEulerSolver {
    */
   void AddDynamicGridResidualContribution(unsigned long iPoint,
                                           unsigned long Point_Normal,
-                                          CGeometry* geometry,
+                                          const CGeometry* geometry,
                                           const su2double* UnitNormal,
                                           su2double Area,
                                           const su2double* GridVel,
@@ -96,6 +96,14 @@ class CNSSolver final : public CEulerSolver {
                                   unsigned short val_marker,
                                   bool cht_mode = false);
 
+  /*!
+   * \brief Generic implementation of the heatflux and heat-transfer/convection walls.
+   */
+  void BC_HeatFlux_Wall_Generic(const CGeometry *geometry,
+                                const CConfig *config,
+                                unsigned short val_marker,
+                                unsigned short kind_boundary);
+
   /*!
    * \brief Compute the viscous contribution for a particular edge.
    * \param[in] iEdge - Edge for which the flux and Jacobians are to be computed.
@@ -185,6 +193,16 @@ class CNSSolver final : public CEulerSolver {
                         CConfig *config,
                         unsigned short val_marker) override;
 
+  /*!
+   * \brief Impose a heat flux by prescribing a heat transfer coefficient and a temperature at infinity.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_marker - Surface marker where the boundary condition is applied.
+   */
+  void BC_HeatTransfer_Wall(const CGeometry *geometry,
+                            const CConfig *config,
+                            const unsigned short val_marker) override;
+
   /*!
    * \brief Impose the Navier-Stokes boundary condition (strong).
    * \param[in] geometry - Geometrical definition of the problem.

diff --git a/SU2_CFD/include/solvers/CSolver.hpp b/SU2_CFD/include/solvers/CSolver.hpp
@@ -1061,6 +1061,16 @@ class CSolver {
                                        CConfig *config,
                                        unsigned short val_marker) { }
 
+  /*!
+   * \brief Impose a heat flux by prescribing a heat transfer coefficient and a temperature at infinity.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] val_marker - Surface marker where the boundary condition is applied.
+   */
+  inline virtual void BC_HeatTransfer_Wall(const CGeometry *geometry,
+                                           const CConfig *config,
+                                           const unsigned short val_marker) { }
+
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.

diff --git a/SU2_CFD/src/fluid/CFluidModel.cpp b/SU2_CFD/src/fluid/CFluidModel.cpp
@@ -59,9 +59,9 @@ void CFluidModel::SetThermalConductivityModel(const CConfig* config) {
     case CONDUCTIVITYMODEL::CONSTANT:
       if (config->GetKind_ConductivityModel_Turb() == CONDUCTIVITYMODEL_TURB::CONSTANT_PRANDTL) {
         ThermalConductivity = unique_ptr<CConstantConductivityRANS>(
-            new CConstantConductivityRANS(config->GetKt_ConstantND(), config->GetPrandtl_Turb()));
+            new CConstantConductivityRANS(config->GetThermal_Conductivity_ConstantND(), config->GetPrandtl_Turb()));
       } else {
-        ThermalConductivity = unique_ptr<CConstantConductivity>(new CConstantConductivity(config->GetKt_ConstantND()));
+        ThermalConductivity = unique_ptr<CConstantConductivity>(new CConstantConductivity(config->GetThermal_Conductivity_ConstantND()));
       }
       break;
     case CONDUCTIVITYMODEL::CONSTANT_PRANDTL:

diff --git a/SU2_CFD/src/integration/CIntegration.cpp b/SU2_CFD/src/integration/CIntegration.cpp
@@ -153,6 +153,9 @@ void CIntegration::Space_Integration(CGeometry *geometry,
       case HEAT_FLUX:
         solver_container[MainSolver]->BC_HeatFlux_Wall(geometry, solver_container, conv_bound_numerics, visc_bound_numerics, config, iMarker);
         break;
+      case HEAT_TRANSFER:
+        solver_container[MainSolver]->BC_HeatTransfer_Wall(geometry, config, iMarker);
+        break;
       case CUSTOM_BOUNDARY:
         solver_container[MainSolver]->BC_Custom(geometry, solver_container, conv_bound_numerics, visc_bound_numerics, config, iMarker);
         break;

diff --git a/SU2_CFD/src/interfaces/cht/CConjugateHeatInterface.cpp b/SU2_CFD/src/interfaces/cht/CConjugateHeatInterface.cpp
@@ -124,13 +124,14 @@ void CConjugateHeatInterface::GetDonor_Variable(CSolver *donor_solution, CGeomet
 
     /*--- Heat solver stand-alone case ---*/
 
-    const su2double thermal_diffusivity = donor_config->GetThermalDiffusivity_Solid();
+    const su2double thermal_diffusivity = donor_config->GetThermalDiffusivity();
     heat_flux_density = thermal_diffusivity*dTdn;
 
+
     if ((donor_config->GetKind_CHT_Coupling() == CHT_COUPLING::DIRECT_TEMPERATURE_ROBIN_HEATFLUX) ||
         (donor_config->GetKind_CHT_Coupling() == CHT_COUPLING::AVERAGED_TEMPERATURE_ROBIN_HEATFLUX)) {
 
-      const su2double rho_cp_solid = donor_config->GetSpecific_Heat_Cp()*donor_config->GetDensity_Solid();
+      const su2double rho_cp_solid = donor_config->GetSpecific_Heat_Cp()*donor_config->GetMaterialDensity(0);
       conductivity_over_dist  = thermal_diffusivity*rho_cp_solid/dist;
     }
   }

diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -1397,8 +1397,8 @@ void CFlowOutput::WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSo
 
           case CONDUCTIVITYMODEL::CONSTANT:
             Breakdown_file << "Conductivity Model: CONSTANT "<< "\n";
-            Breakdown_file << "Molecular Conductivity: " << config->GetKt_Constant()<< " W/m^2.K." << "\n";
-            Breakdown_file << "Molecular Conductivity (non-dim): " << config->GetKt_ConstantND()<< "\n";
+            Breakdown_file << "Molecular Conductivity: " << config->GetThermal_Conductivity_Constant()<< " W/m^2.K." << "\n";
+            Breakdown_file << "Molecular Conductivity (non-dim): " << config->GetThermal_Conductivity_ConstantND()<< "\n";
             break;
 
           default:
@@ -1762,8 +1762,8 @@ void CFlowOutput::WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSo
 
             case CONDUCTIVITYMODEL::CONSTANT:
               Breakdown_file << "Conductivity Model: CONSTANT "<< "\n";
-              Breakdown_file << "Molecular Conductivity: " << config->GetKt_Constant()<< " W/m^2.K." << "\n";
-              Breakdown_file << "Molecular Conductivity (non-dim): " << config->GetKt_ConstantND()<< "\n";
+              Breakdown_file << "Molecular Conductivity: " << config->GetThermal_Conductivity_Constant()<< " W/m^2.K." << "\n";
+              Breakdown_file << "Molecular Conductivity (non-dim): " << config->GetThermal_Conductivity_ConstantND()<< "\n";
               break;
 
             case CONDUCTIVITYMODEL::POLYNOMIAL:

diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -2991,8 +2991,8 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 
           case CONDUCTIVITYMODEL::CONSTANT:
             Breakdown_file << "Conductivity Model: CONSTANT "<< "\n";
-            Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
-            Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
+            Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetThermal_Conductivity_Constant()<< " W/m^2.K." << "\n";
+            Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetThermal_Conductivity_ConstantND()<< "\n";
             break;
 
           default:
@@ -3356,8 +3356,8 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
 
             case CONDUCTIVITYMODEL::CONSTANT:
               Breakdown_file << "Conductivity Model: CONSTANT "<< "\n";
-              Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetKt_Constant()<< " W/m^2.K." << "\n";
-              Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetKt_ConstantND()<< "\n";
+              Breakdown_file << "Molecular Conductivity: " << config[val_iZone]->GetThermal_Conductivity_Constant()<< " W/m^2.K." << "\n";
+              Breakdown_file << "Molecular Conductivity (non-dim): " << config[val_iZone]->GetThermal_Conductivity_ConstantND()<< "\n";
               break;
 
             case CONDUCTIVITYMODEL::POLYNOMIAL:

diff --git a/SU2_CFD/src/solvers/CEulerSolver.cpp b/SU2_CFD/src/solvers/CEulerSolver.cpp
@@ -1334,7 +1334,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
     config->SetMu_Temperature_RefND(config->GetMu_Temperature_Ref()/config->GetTemperature_Ref());
 
     /*--- Constant thermal conductivity model. ---*/
-    config->SetKt_ConstantND(config->GetKt_Constant()/Conductivity_Ref);
+    config->SetThermal_Conductivity_ConstantND(config->GetThermal_Conductivity_Constant()/Conductivity_Ref);
   }
 
   /*--- Create one final fluid model object per OpenMP thread to be able to use them in parallel.
@@ -1480,7 +1480,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
       case CONDUCTIVITYMODEL::CONSTANT:
         ModelTable << "CONSTANT";
         Unit << "W/m^2.K";
-        NonDimTable << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_Constant()/config->GetKt_ConstantND() << Unit.str() << config->GetKt_ConstantND();
+        NonDimTable << "Molecular Cond." << config->GetThermal_Conductivity_Constant() << config->GetThermal_Conductivity_Constant()/config->GetThermal_Conductivity_ConstantND() << Unit.str() << config->GetThermal_Conductivity_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;

diff --git a/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp b/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
@@ -1080,7 +1080,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
     config->SetMu_Temperature_RefND(config->GetMu_Temperature_Ref()/config->GetTemperature_Ref());
 
     /* constant thermal conductivity model */
-    config->SetKt_ConstantND(config->GetKt_Constant()/Conductivity_Ref);
+    config->SetThermal_Conductivity_ConstantND(config->GetThermal_Conductivity_Constant()/Conductivity_Ref);
 
     FluidModel->SetLaminarViscosityModel(config);
     FluidModel->SetThermalConductivityModel(config);
@@ -1183,7 +1183,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig        *config,
       case CONDUCTIVITYMODEL::CONSTANT:
         ModelTable << "CONSTANT";
         Unit << "W/m^2.K";
-        NonDimTable << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_Constant()/config->GetKt_ConstantND() << Unit.str() << config->GetKt_ConstantND();
+        NonDimTable << "Molecular Cond." << config->GetThermal_Conductivity_Constant() << config->GetThermal_Conductivity_Constant()/config->GetThermal_Conductivity_ConstantND() << Unit.str() << config->GetThermal_Conductivity_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;

diff --git a/SU2_CFD/src/solvers/CHeatSolver.cpp b/SU2_CFD/src/solvers/CHeatSolver.cpp
@@ -104,10 +104,9 @@ CHeatSolver::CHeatSolver(CGeometry *geometry, CConfig *config, unsigned short iM
 
   /*--- Set the reference values for temperature ---*/
 
-  su2double Temperature_FreeStream = config->GetInc_Temperature_Init();
-  config->SetTemperature_FreeStream(Temperature_FreeStream);
-
+  su2double Temperature_FreeStream = config->GetTemperature_FreeStream();
   su2double Temperature_Ref = 0.0;
+
   if (config->GetRef_Inc_NonDim() == DIMENSIONAL) {
     Temperature_Ref = 1.0;
   }
@@ -118,22 +117,19 @@ CHeatSolver::CHeatSolver(CGeometry *geometry, CConfig *config, unsigned short iM
     Temperature_Ref = config->GetInc_Temperature_Ref();
   }
   config->SetTemperature_Ref(Temperature_Ref);
+  config->SetTemperature_FreeStreamND(Temperature_FreeStream/Temperature_Ref);
 
   /*--- Set the reference values for heat fluxes. If the heat solver runs stand-alone,
    *    thermal conductivity is read directly from config file ---*/
 
-
   if (heat_equation) {
+    su2double rho_cp = config->GetMaterialDensity(0)*config->GetSpecific_Heat_Cp();
+    config->SetThermalDiffusivity(config->GetThermal_Conductivity_Constant() / rho_cp);
 
-    const su2double rho_cp = config->GetDensity_Solid()*config->GetSpecific_Heat_Cp();
-    config->SetThermalDiffusivity_Solid(config->GetThermalConductivity_Solid() / rho_cp);
-
-    config->SetTemperature_FreeStreamND(config->GetTemperature_Initial_Solid()/config->GetTemperature_Ref());
+    /*--- Fluxes are computed via thermal diffusivity (not conductivity), so we have to divide by rho*cp ---*/
     config->SetHeat_Flux_Ref(rho_cp*Temperature_Ref);
   }
   else if (flow) {
-
-    config->SetTemperature_FreeStreamND(config->GetTemperature_FreeStream()/config->GetTemperature_Ref());
     config->SetHeat_Flux_Ref(config->GetViscosity_Ref()*config->GetSpecific_Heat_Cp());
   }
 
@@ -490,8 +486,8 @@ void CHeatSolver::Viscous_Residual(CGeometry *geometry, CSolver **solver_contain
       thermal_diffusivity_j = (laminar_viscosity/Prandtl_Lam) + (eddy_viscosity_j/Prandtl_Turb);
     }
     else {
-      thermal_diffusivity_i = config->GetThermalDiffusivity_Solid();
-      thermal_diffusivity_j = config->GetThermalDiffusivity_Solid();
+      thermal_diffusivity_i = config->GetThermalDiffusivity();
+      thermal_diffusivity_j = config->GetThermalDiffusivity();
     }
 
     numerics->SetThermalDiffusivity(thermal_diffusivity_i,thermal_diffusivity_j);
@@ -573,7 +569,7 @@ void CHeatSolver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_conta
 
   const su2double laminar_viscosity = config->GetMu_ConstantND();
   const su2double Prandtl_Lam = config->GetPrandtl_Lam();
-  const su2double thermal_diffusivity = flow ? laminar_viscosity/Prandtl_Lam : config->GetThermalDiffusivity_Solid();
+  const su2double thermal_diffusivity = flow ? laminar_viscosity/Prandtl_Lam : config->GetThermalDiffusivity();
 
   //su2double Prandtl_Turb = config->GetPrandtl_Turb();
   //laminar_viscosity = config->GetViscosity_FreeStreamND(); // TDE check for consistency for CHT
@@ -833,7 +829,7 @@ void CHeatSolver::BC_ConjugateHeat_Interface(CGeometry *geometry, CSolver **solv
   const bool implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT);
 
   const su2double Temperature_Ref = config->GetTemperature_Ref();
-  const su2double rho_cp_solid = config->GetDensity_Solid()*config->GetSpecific_Heat_Cp();
+  const su2double rho_cp_solid = config->GetMaterialDensity(0)*config->GetSpecific_Heat_Cp();
 
   if (flow) {
 
@@ -905,7 +901,7 @@ void CHeatSolver::Heat_Fluxes(CGeometry *geometry, CSolver **solver_container, C
   string Marker_Tag, HeatFlux_Tag;
 
   const su2double thermal_diffusivity = flow ? config->GetViscosity_FreeStreamND()/config->GetPrandtl_Lam() :
-                                               config->GetThermalDiffusivity_Solid();
+                                               config->GetThermalDiffusivity();
 
   AllBound_HeatFlux = 0.0;
   AllBound_AverageT = 0.0;
@@ -1028,7 +1024,7 @@ void CHeatSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container,
   Prandtl_Lam = config->GetPrandtl_Lam();
   Prandtl_Turb = config->GetPrandtl_Turb();
 
-  thermal_diffusivity = config->GetThermalDiffusivity_Solid();
+  thermal_diffusivity = config->GetThermalDiffusivity();
 
   /*--- Compute spectral radius based on thermal conductivity ---*/
 
@@ -1066,7 +1062,7 @@ void CHeatSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container,
 
     /*--- Viscous contribution ---*/
 
-    thermal_diffusivity = config->GetThermalDiffusivity_Solid();
+    thermal_diffusivity = config->GetThermalDiffusivity();
     if(flow) {
       if(turb) {
         eddy_viscosity = solver_container[TURB_SOL]->GetNodes()->GetmuT(iPoint);
@@ -1106,7 +1102,7 @@ void CHeatSolver::SetTime_Step(CGeometry *geometry, CSolver **solver_container,
 
       /*--- Viscous contribution ---*/
 
-      thermal_diffusivity = config->GetThermalDiffusivity_Solid();
+      thermal_diffusivity = config->GetThermalDiffusivity();
       if(flow) {
         if(turb) {
           eddy_viscosity = solver_container[TURB_SOL]->GetNodes()->GetmuT(iPoint);

diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
@@ -485,7 +485,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
 
       /*--- Constant thermal conductivity model ---*/
 
-      config->SetKt_ConstantND(config->GetKt_Constant()/Conductivity_Ref);
+      config->SetThermal_Conductivity_ConstantND(config->GetThermal_Conductivity_Constant()/Conductivity_Ref);
 
       /*--- Conductivity model via polynomial. ---*/
 
@@ -655,7 +655,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
       case CONDUCTIVITYMODEL::CONSTANT:
         ModelTable << "CONSTANT";
         Unit << "W/m^2.K";
-        NonDimTable << "Molecular Cond." << config->GetKt_Constant() << config->GetKt_Constant()/config->GetKt_ConstantND() << Unit.str() << config->GetKt_ConstantND();
+        NonDimTable << "Molecular Cond." << config->GetThermal_Conductivity_Constant() << config->GetThermal_Conductivity_Constant()/config->GetThermal_Conductivity_ConstantND() << Unit.str() << config->GetThermal_Conductivity_ConstantND();
         Unit.str("");
         NonDimTable.PrintFooter();
         break;