Skip to content

Commit 7af71d6

Browse files
committed
naming consistency
1 parent 13f7e35 commit 7af71d6

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Common/include/CConfig.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,9 @@ class CConfig {
639639
su2double Relaxation_Factor_Adjoint; /*!< \brief Relaxation coefficient for variable updates of adjoint solvers. */
640640
su2double Relaxation_Factor_CHT; /*!< \brief Relaxation coefficient for the update of conjugate heat variables. */
641641
su2double EntropyFix_Coeff; /*!< \brief Entropy fix coefficient. */
642-
su2double SST_UnderRelaxation_Factor; /*!< \brief UnderRelaxation Factor for SST Turbulent Variables*/
643-
su2double SA_UnderRelaxation_Factor; /*!< \brief UnderRelaxation Factor for SST Turbulent Variables*/
644-
su2double Flow_UnderRelaxation_Factor; /*!< \brief UnderRelaxation Factor for SST Turbulent Variables*/
642+
su2double Max_Update_SST; /*!< \brief Cap for the Under-Relaxation Factor for SST Turbulent Variables*/
643+
su2double Max_Update_SA; /*!< \brief Cap for the Under-Relaxation Factor for SA Turbulent Variables*/
644+
su2double Max_Update_Flow; /*!< \brief Cap for the Under-Relaxation Factor for Flow Density and Energy Variables*/
645645
unsigned short nLocationStations, /*!< \brief Number of section cuts to make when outputting mesh and cp . */
646646
nWingStations; /*!< \brief Number of section cuts to make when calculating internal volume. */
647647
su2double Kappa_1st_AdjFlow, /*!< \brief Lax 1st order dissipation coefficient for adjoint flow equations (coarse multigrid levels). */
@@ -4232,19 +4232,19 @@ class CConfig {
42324232
* \brief Get the under-relaxation for flow variables density and energy.
42334233
* \return under-relaxation for flow variables.
42344234
*/
4235-
su2double GetUnderRelax_Flow(void) const { return Flow_UnderRelaxation_Factor; }
4235+
su2double GetUnderRelax_Flow(void) const { return Max_Update_Flow; }
42364236

42374237
/*!
42384238
* \brief Get the under-relaxation for SA variable, nu_tilde.
42394239
* \return under-relaxation for SA variables.
42404240
*/
4241-
su2double GetUnderRelax_SA(void) const { return SA_UnderRelaxation_Factor; }
4241+
su2double GetUnderRelax_SA(void) const { return Max_Update_SA; }
42424242

42434243
/*!
42444244
* \brief Get the under-relaxation for SST turbulence variables k and omega.
42454245
* \return under-relaxation for SST variables.
42464246
*/
4247-
su2double GetUnderRelax_SST(void) const { return SST_UnderRelaxation_Factor; }
4247+
su2double GetUnderRelax_SST(void) const { return Max_Update_SST; }
42484248

42494249
/*!
42504250
* \brief Get the number of samples used in quasi-Newton methods.

Common/src/CConfig.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,12 +1897,12 @@ void CConfig::SetConfig_Options() {
18971897
addEnumOption("DISCADJ_LIN_PREC", Kind_DiscAdj_Linear_Prec, Linear_Solver_Prec_Map, ILU);
18981898
/* DESCRIPTION: Linear solver for the discete adjoint systems */
18991899

1900-
addDoubleOption("UR_FACTOR_FLOW", Flow_UnderRelaxation_Factor, 0.2);
1901-
/* DESCRIPTION: Under-Relaxation Factor for Density and Energy Variables */
1902-
addDoubleOption("UR_FACTOR_SA", SA_UnderRelaxation_Factor, 0.99);
1903-
/* DESCRIPTION: Under-Relaxation Factor for SA Turbulence Variables */
1904-
addDoubleOption("UR_FACTOR_SST", SST_UnderRelaxation_Factor, 1.0);
1905-
/* DESCRIPTION: Under-Relaxation Factor for SST Turbulence Variables */
1900+
addDoubleOption("MAX_UPDATE_CAP_FLOW", Max_Update_Flow, 0.2);
1901+
/* DESCRIPTION: Max value for under-relaxation cap for density and energy variables */
1902+
addDoubleOption("MAX_UPDATE_CAP_SA", Max_Update_SA, 0.99);
1903+
/* DESCRIPTION: Max value for under-relaxation cap for SA turbulence variables */
1904+
addDoubleOption("MAX_UPDATE_CAP_SST", Max_Update_SST, 1.0);
1905+
/* DESCRIPTION: Max value for under-relaxation cap for SST turbulence variables */
19061906
/*!\par CONFIG_CATEGORY: Convergence\ingroup Config*/
19071907
/*--- Options related to convergence ---*/
19081908

config_template.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1852,7 +1852,7 @@ CFL_REDUCTION_TURB= 1.0
18521852
LOWER_LIMIT_K_FACTOR= 1e-15
18531853
LOWER_LIMIT_OMEGA_FACTOR= 1e-5
18541854
1855-
% Use numerically computed exact Jacobians for standard SA turbulence model
1855+
% Use numerically computed exact Jacobians for turbulence models
18561856
% Slower per iteration but potentialy more stable and capable of higher CFL
18571857
USE_ACCURATE_TURB_JACOBIANS= NO
18581858
%

0 commit comments

Comments
 (0)