Skip to content

Commit 9fe38b7

Browse files
TobiKattmannTobiKattmann
committed
Rename Conductivity_Ref -> Thermal_Conductivity_Ref.
1 parent 194692c commit 9fe38b7

12 files changed

Lines changed: 27 additions & 19 deletions

File tree

‎Common/include/CConfig.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ class CConfig {
836836
Velocity_Ref, /*!< \brief Reference velocity for non-dimensionalization.*/
837837
Time_Ref, /*!< \brief Reference time for non-dimensionalization. */
838838
Viscosity_Ref, /*!< \brief Reference viscosity for non-dimensionalization. */
839-
Conductivity_Ref, /*!< \brief Reference conductivity for non-dimensionalization. */
839+
Thermal_Conductivity_Ref, /*!< \brief Reference conductivity for non-dimensionalization. */
840840
Energy_Ref, /*!< \brief Reference viscosity for non-dimensionalization. */
841841
Wall_Temperature, /*!< \brief Temperature at an isotropic wall in Kelvin. */
842842
Omega_Ref, /*!< \brief Reference angular velocity for non-dimensionalization. */
@@ -1774,10 +1774,10 @@ class CConfig {
17741774
su2double GetFan_Poly_Eff(void) const { return Fan_Poly_Eff; }
17751775

17761776
/*!
1777-
* \brief Get the value of the reference conductivity for non-dimensionalization.
1778-
* \return Reference conductivity for non-dimensionalization.
1777+
* \brief Get the value of the reference thermal conductivity for non-dimensionalization.
1778+
* \return Reference thermal conductivity for non-dimensionalization.
17791779
*/
1780-
su2double GetConductivity_Ref(void) const { return Conductivity_Ref; }
1780+
su2double GetThermal_Conductivity_Ref(void) const { return Thermal_Conductivity_Ref; }
17811781

17821782
/*!
17831783
* \brief Get the value of the reference angular velocity for non-dimensionalization.
@@ -2397,7 +2397,7 @@ class CConfig {
23972397
* \brief Set the reference conductivity for nondimensionalization.
23982398
* \param[in] val_conductivity_ref - Value of the reference conductivity.
23992399
*/
2400-
void SetConductivity_Ref(su2double val_conductivity_ref) { Conductivity_Ref = val_conductivity_ref; }
2400+
void SetConductivity_Ref(su2double val_conductivity_ref) { Thermal_Conductivity_Ref = val_conductivity_ref; }
24012401

24022402
/*!
24032403
* \brief Set the nondimensionalized freestream pressure.

‎Common/src/CConfig.cpp‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,9 @@ void CConfig::SetConfig_Options() {
12231223
addDoubleOption("PRANDTL_LAM", Prandtl_Lam, 0.72);
12241224
/*!\brief PRANDTL_TURB \n DESCRIPTION: Turbulent Prandtl number (0.9 (air), only for compressible flows) \n DEFAULT 0.90 \ingroup Config*/
12251225
addDoubleOption("PRANDTL_TURB", Prandtl_Turb, 0.90);
1226+
1227+
/*--- Options related to wall models. ---*/
1228+
12261229
/*!\brief WALLMODEL_KAPPA \n DESCRIPTION: von Karman constant used for the wall model \n DEFAULT 0.41 \ingroup Config*/
12271230
addDoubleOption("WALLMODEL_KAPPA", wallModel_Kappa, 0.41);
12281231
/*!\brief WALLMODEL_MAXITER \n DESCRIPTION: Max iterations used for the wall model \n DEFAULT 200 \ingroup Config*/
@@ -1231,8 +1234,9 @@ void CConfig::SetConfig_Options() {
12311234
addDoubleOption("WALLMODEL_RELFAC", wallModel_RelFac, 0.5);
12321235
/*!\brief WALLMODEL_MINYPLUS \n DESCRIPTION: lower limit for Y+ used for the wall model \n DEFAULT 5.0 \ingroup Config*/
12331236
addDoubleOption("WALLMODEL_MINYPLUS", wallModel_MinYplus, 5.0);
1234-
/*!\brief WALLMODEL_B \n DESCRIPTION: constant B used for the wall model \n DEFAULT 5.0 \ingroup Config*/
1237+
/*!\brief WALLMODEL_B \n DESCRIPTION: constant B used for the wall model \n DEFAULT 5.5 \ingroup Config*/
12351238
addDoubleOption("WALLMODEL_B", wallModel_B, 5.5);
1239+
12361240
/*!\brief BULK_MODULUS \n DESCRIPTION: Value of the Bulk Modulus \n DEFAULT 1.42E5 \ingroup Config*/
12371241
addDoubleOption("BULK_MODULUS", Bulk_Modulus, 1.42E5);
12381242
/* DESCRIPTION: Epsilon^2 multipier in Beta calculation for incompressible preconditioner. */
@@ -3291,11 +3295,16 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
32913295
if (Kind_WallFunctions[iMarker] != WALL_FUNCTIONS::NONE)
32923296
Wall_Functions = true;
32933297

3294-
if ((Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::ADAPTIVE_FUNCTION) || (Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::SCALABLE_FUNCTION)
3295-
|| (Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::NONEQUILIBRIUM_MODEL))
3296-
3298+
if ((Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::ADAPTIVE_FUNCTION) ||
3299+
(Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::SCALABLE_FUNCTION) ||
3300+
(Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::NONEQUILIBRIUM_MODEL))
32973301
SU2_MPI::Error(string("For RANS problems, use NONE, STANDARD_WALL_FUNCTION or EQUILIBRIUM_WALL_MODEL.\n"), CURRENT_FUNCTION);
32983302

3303+
if (Kind_WallFunctions[iMarker] == WALL_FUNCTIONS::STANDARD_FUNCTION) {
3304+
/// TODO TK:: Add warnings, errors, incompatibilities here.
3305+
3306+
}
3307+
32993308
}
33003309
}
33013310

‎SU2_CFD/include/variables/CIncNSVariable.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class CIncNSVariable final : public CIncEulerVariable {
104104
/*!
105105
* \brief Set the value of the wall shear stress computed by a wall function.
106106
*/
107-
inline void SetTau_Wall(unsigned long iPoint, su2double val_tau_wall) override { Tau_Wall(iPoint) = val_tau_wall; }
107+
inline void SetTau_Wall(unsigned long iPoint, su2double tau_wall) override { Tau_Wall(iPoint) = tau_wall; }
108108

109109
/*!
110110
* \brief Get the value of the wall shear stress computed by a wall function.

‎SU2_CFD/include/variables/CNSVariable.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class CNSVariable final : public CEulerVariable {
158158
/*!
159159
* \brief Set the value of the wall shear stress computed by a wall function.
160160
*/
161-
inline void SetTau_Wall(unsigned long iPoint, su2double val_tau_wall) override { Tau_Wall(iPoint) = val_tau_wall; }
161+
inline void SetTau_Wall(unsigned long iPoint, su2double tau_wall) override { Tau_Wall(iPoint) = tau_wall; }
162162

163163
/*!
164164
* \brief Get the value of the wall shear stress computed by a wall function.

‎SU2_CFD/include/variables/CVariable.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ class CVariable {
21592159
*/
21602160
inline virtual su2double GetSensitivity(unsigned long iPoint, unsigned long iDim) const { return 0.0; }
21612161

2162-
inline virtual void SetTau_Wall(unsigned long iPoint, su2double val_tau_wall) {}
2162+
inline virtual void SetTau_Wall(unsigned long iPoint, su2double tau_wall) {}
21632163

21642164
inline virtual su2double GetTau_Wall(unsigned long iPoint) const { return 0.0; }
21652165

‎SU2_CFD/src/interfaces/cht/CConjugateHeatInterface.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void CConjugateHeatInterface::GetDonor_Variable(CSolver *donor_solution, CGeomet
104104
switch (donor_config->GetKind_ConductivityModel()) {
105105

106106
case CONDUCTIVITYMODEL::CONSTANT:
107-
thermal_conductivity = thermal_conductivityND*donor_config->GetConductivity_Ref();
107+
thermal_conductivity = thermal_conductivityND*donor_config->GetThermal_Conductivity_Ref();
108108
break;
109109

110110
case CONDUCTIVITYMODEL::CONSTANT_PRANDTL:

‎SU2_CFD/src/output/CFlowOutput.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ void CFlowOutput::WriteForcesBreakdown(const CConfig* config, const CSolver* flo
18071807
file << "Reference viscosity: " << config->GetViscosity_Ref();
18081808
if (si_units) file << " N.s/m^2.\n";
18091809
else file << " lbf.s/ft^2.\n";
1810-
file << "Reference conductivity: " << config->GetConductivity_Ref();
1810+
file << "Reference conductivity: " << config->GetThermal_Conductivity_Ref();
18111811
if (si_units) file << " W/m^2.K.\n";
18121812
else file << " lbf/ft.s.R.\n";
18131813
}

‎SU2_CFD/src/output/output_structure_legacy.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3122,7 +3122,7 @@ void COutputLegacy::SpecialOutput_ForcesBreakdown(CSolver *****solver, CGeometry
31223122
if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " N.s/m^2." << "\n";
31233123
else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf.s/ft^2." << "\n";
31243124
if (compressible){
3125-
Breakdown_file << "Reference conductivity: " << config[val_iZone]->GetConductivity_Ref();
3125+
Breakdown_file << "Reference conductivity: " << config[val_iZone]->GetThermal_Conductivity_Ref();
31263126
if (config[val_iZone]->GetSystemMeasurements() == SI) Breakdown_file << " W/m^2.K." << "\n";
31273127
else if (config[val_iZone]->GetSystemMeasurements() == US) Breakdown_file << " lbf/ft.s.R." << "\n";
31283128
}

‎SU2_CFD/src/solvers/CEulerSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ void CEulerSolver::SetNondimensionalization(CConfig *config, unsigned short iMes
12771277
Unit.str("");
12781278
if (config->GetSystemMeasurements() == SI) Unit << "W/m^2.K";
12791279
else if (config->GetSystemMeasurements() == US) Unit << "lbf/ft.s.R";
1280-
NonDimTable << "Conductivity" << "-" << config->GetConductivity_Ref() << Unit.str() << "-";
1280+
NonDimTable << "Conductivity" << "-" << config->GetThermal_Conductivity_Ref() << Unit.str() << "-";
12811281
Unit.str("");
12821282
if (turbulent){
12831283
if (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";

‎SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ void CFEM_DG_EulerSolver::SetNondimensionalization(CConfig *config,
12671267
Unit.str("");
12681268
if (config->GetSystemMeasurements() == SI) Unit << "W/m^2.K";
12691269
else if (config->GetSystemMeasurements() == US) Unit << "lbf/ft.s.R";
1270-
NonDimTable << "Conductivity" << "-" << config->GetConductivity_Ref() << Unit.str() << "-";
1270+
NonDimTable << "Conductivity" << "-" << config->GetThermal_Conductivity_Ref() << Unit.str() << "-";
12711271
Unit.str("");
12721272
if (turbulent) {
12731273
if (config->GetSystemMeasurements() == SI) Unit << "m^2/s^2";

0 commit comments

Comments
 (0)