33 * \brief All the information about the definition of the physical problem.
44 * The subroutines and functions are in the <i>CConfig.cpp</i> file.
55 * \author F. Palacios, T. Economon, B. Tracey
6- * \version 7.2.0 "Blackbird"
6+ * \version 7.2.1 "Blackbird"
77 *
88 * SU2 Project Website: https://su2code.github.io
99 *
@@ -554,7 +554,7 @@ class CConfig {
554554 STRUCT_DEFORMATION Kind_Struct_Solver; /* !< \brief Determines the geometric condition (small or large deformations) for structural analysis. */
555555 unsigned short Kind_DV_FEA; /* !< \brief Kind of Design Variable for FEA problems.*/
556556
557- unsigned short Kind_Turb_Model; /* !< \brief Turbulent model definition. */
557+ TURB_MODEL Kind_Turb_Model; /* !< \brief Turbulent model definition. */
558558 unsigned short Kind_SGS_Model; /* !< \brief LES SGS model definition. */
559559 unsigned short Kind_Trans_Model, /* !< \brief Transition model definition. */
560560 Kind_ActDisk, Kind_Engine_Inflow,
@@ -821,10 +821,13 @@ class CConfig {
821821 Pressure_Thermodynamic, /* !< \brief Thermodynamic pressure of the fluid. */
822822 Temperature_FreeStream, /* !< \brief Total temperature of the fluid. */
823823 Temperature_ve_FreeStream; /* !< \brief Total vibrational-electronic temperature of the fluid. */
824- su2double Prandtl_Lam, /* !< \brief Laminar Prandtl number for the gas. */
825- Prandtl_Turb, /* !< \brief Turbulent Prandtl number for the gas. */
826- wallModelKappa, /* !< \brief von Karman constant kappa for turbulence wall modeling */
827- wallModelB, /* !< \brief constant B for turbulence wall modeling */
824+ unsigned short wallModel_MaxIter; /* !< \brief maximum number of iterations for the Newton method for the wall model */
825+ su2double wallModel_Kappa, /* !< \brief von Karman constant kappa for turbulence wall modeling */
826+ wallModel_B, /* !< \brief constant B for turbulence wall modeling */
827+ wallModel_RelFac, /* !< \brief relaxation factor for the Newton method used in the wall model */
828+ wallModel_MinYplus; /* !< \brief minimum Y+ value, below which the wall model is not used anymore */
829+ su2double Prandtl_Lam, /* !< \brief Laminar Prandtl number for the gas. */
830+ Prandtl_Turb, /* !< \brief Turbulent Prandtl number for the gas. */
828831 Length_Ref, /* !< \brief Reference length for non-dimensionalization. */
829832 Pressure_Ref, /* !< \brief Reference pressure for non-dimensionalization. */
830833 Temperature_Ref, /* !< \brief Reference temperature for non-dimensionalization.*/
@@ -833,7 +836,7 @@ class CConfig {
833836 Velocity_Ref, /* !< \brief Reference velocity for non-dimensionalization.*/
834837 Time_Ref, /* !< \brief Reference time for non-dimensionalization. */
835838 Viscosity_Ref, /* !< \brief Reference viscosity for non-dimensionalization. */
836- Conductivity_Ref, /* !< \brief Reference conductivity for non-dimensionalization. */
839+ Thermal_Conductivity_Ref, /* !< \brief Reference conductivity for non-dimensionalization. */
837840 Energy_Ref, /* !< \brief Reference viscosity for non-dimensionalization. */
838841 Wall_Temperature, /* !< \brief Temperature at an isotropic wall in Kelvin. */
839842 Omega_Ref, /* !< \brief Reference angular velocity for non-dimensionalization. */
@@ -1671,13 +1674,31 @@ class CConfig {
16711674 * \brief Get the value of the von Karman constant kappa for turbulence wall modeling.
16721675 * \return von Karman constant.
16731676 */
1674- su2double GetwallModelKappa ( void ) const { return wallModelKappa ; }
1677+ su2double GetwallModel_Kappa ( ) const { return wallModel_Kappa ; }
16751678
16761679 /* !
1677- * \brief Get the value of the von Karman constant kappa for turbulence wall modeling.
1678- * \return von Karman constant.
1680+ * \brief Get the value of the max. number of Newton iterations for turbulence wall modeling.
1681+ * \return Max number of iterations.
1682+ */
1683+ unsigned short GetwallModel_MaxIter () const { return wallModel_MaxIter; }
1684+
1685+ /* !
1686+ * \brief Get the value of the relaxation factor for turbulence wall modeling.
1687+ * \return Relaxation factor.
1688+ */
1689+ su2double GetwallModel_RelFac () const { return wallModel_RelFac; }
1690+
1691+ /* !
1692+ * \brief Get the value of the minimum Y+ value below which the wall function is deactivated.
1693+ * \return Minimum Y+ value.
1694+ */
1695+ su2double GetwallModel_MinYPlus () const { return wallModel_MinYplus; }
1696+
1697+ /* !
1698+ * \brief Get the value of the wall model constant B for turbulence wall modeling.
1699+ * \return Wall model constant B.
16791700 */
1680- su2double GetwallModelB ( void ) const { return wallModelB ; }
1701+ su2double GetwallModel_B ( ) const { return wallModel_B ; }
16811702
16821703 /* !
16831704 * \brief Get the value of the thermal diffusivity for solids.
@@ -1753,10 +1774,10 @@ class CConfig {
17531774 su2double GetFan_Poly_Eff (void ) const { return Fan_Poly_Eff; }
17541775
17551776 /* !
1756- * \brief Get the value of the reference conductivity for non-dimensionalization.
1757- * \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.
17581779 */
1759- su2double GetConductivity_Ref (void ) const { return Conductivity_Ref ; }
1780+ su2double GetThermal_Conductivity_Ref (void ) const { return Thermal_Conductivity_Ref ; }
17601781
17611782 /* !
17621783 * \brief Get the value of the reference angular velocity for non-dimensionalization.
@@ -2376,7 +2397,7 @@ class CConfig {
23762397 * \brief Set the reference conductivity for nondimensionalization.
23772398 * \param[in] val_conductivity_ref - Value of the reference conductivity.
23782399 */
2379- 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; }
23802401
23812402 /* !
23822403 * \brief Set the nondimensionalized freestream pressure.
@@ -4162,7 +4183,7 @@ class CConfig {
41624183 * \brief Get the kind of the turbulence model.
41634184 * \return Kind of the turbulence model.
41644185 */
4165- unsigned short GetKind_Turb_Model (void ) const { return Kind_Turb_Model; }
4186+ TURB_MODEL GetKind_Turb_Model (void ) const { return Kind_Turb_Model; }
41664187
41674188 /* !
41684189 * \brief Get the kind of the transition model.
0 commit comments