From bb98f5fd973f343baf716b8ccdf12d194e0dab0a Mon Sep 17 00:00:00 2001 From: emaberman Date: Wed, 26 Jun 2024 11:56:14 +0300 Subject: [PATCH 01/12] Change SST variable's limits --- SU2_CFD/src/solvers/CTurbSSTSolver.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp index 555f8e77155..639c7ace7dc 100644 --- a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp +++ b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp @@ -108,12 +108,6 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh constants[9] = 0.44; //gamma_2 constants[10] = 10.0; // production limiter constant } - /*--- Initialize lower and upper limits---*/ - lowerlimit[0] = 1.0e-10; - upperlimit[0] = 1.0e10; - - lowerlimit[1] = 1.0e-4; - upperlimit[1] = 1.0e15; /*--- Far-field flow state quantities and initialization. ---*/ su2double rhoInf, *VelInf, muLamInf, Intensity, viscRatio, muT_Inf; @@ -129,6 +123,14 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh su2double kine_Inf = 3.0/2.0*(VelMag2*Intensity*Intensity); su2double omega_Inf = rhoInf*kine_Inf/(muLamInf*viscRatio); + /*--- Initialize lower and upper limits---*/ + lowerlimit[0] = 1.0e-20 * kine_Inf; + upperlimit[0] = 1.0e10; + + lowerlimit[1] = 1.0e-6 * omega_Inf; + upperlimit[1] = 1.0e16; + + Solution_Inf[0] = kine_Inf; Solution_Inf[1] = omega_Inf; From 355a6ce39fcc5bc8ddf48362429c5edd8528a36b Mon Sep 17 00:00:00 2001 From: emaberman Date: Thu, 4 Jul 2024 10:13:33 +0300 Subject: [PATCH 02/12] Give user control of lower limit Coefficient --- Common/include/CConfig.hpp | 14 ++++++++++++++ Common/src/CConfig.cpp | 4 ++++ SU2_CFD/src/solvers/CTurbSSTSolver.cpp | 12 ++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp index 494c9542922..4b02a32f2b5 100644 --- a/Common/include/CConfig.hpp +++ b/Common/include/CConfig.hpp @@ -878,6 +878,8 @@ class CConfig { ReThetaT_FreeStream, /*!< \brief Freestream Transition Momentum Thickness Reynolds Number (for LM transition model) of the fluid. */ NuFactor_FreeStream, /*!< \brief Ratio of turbulent to laminar viscosity. */ NuFactor_Engine, /*!< \brief Ratio of turbulent to laminar viscosity at the engine. */ + KFactor_LowerLimit, /*!< \Non dimensional coefficient for lower limit of K in SST model. */ + OmegaFactor_LowerLimit, /*!< \Non dimensional coefficient for lower limit of omega in SST model. */ SecondaryFlow_ActDisk, /*!< \brief Ratio of turbulent to laminar viscosity at the actuator disk. */ Initial_BCThrust, /*!< \brief Ratio of turbulent to laminar viscosity at the actuator disk. */ Pressure_FreeStream, /*!< \brief Total pressure of the fluid. */ @@ -2008,6 +2010,18 @@ class CConfig { */ su2double GetNuFactor_FreeStream(void) const { return NuFactor_FreeStream; } + /*! + * \brief Get the k constant factor define a lower limit by multiplication with values in SST turbulencemodel. + * \return Non-dimensionalized freestream intensity. + */ + su2double GetKFactor_LowerLimit(void) const { return KFactor_LowerLimit; } + + /*! + * \brief Get the w constant factor define a lower limit by multiplication with values in SST turbulencemodel. + * \return Non-dimensionalized freestream intensity. + */ + su2double GetOmegaFactor_LowerLimit(void) const { return OmegaFactor_LowerLimit; } + /*! * \brief Get the value of the non-dimensionalized engine turbulence intensity. * \return Non-dimensionalized engine intensity. diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 5ff351cfee5..8b99552bcf6 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -1420,6 +1420,10 @@ void CConfig::SetConfig_Options() { /* DESCRIPTION: */ addDoubleOption("FREESTREAM_NU_FACTOR", NuFactor_FreeStream, 3.0); /* DESCRIPTION: */ + addDoubleOption("LOWER_LIMIT_K_FACTOR", KFactor_LowerLimit, 1.0e-20); + /* DESCRIPTION: */ + addDoubleOption("LOWER_LIMIT_OMEGA_FACTOR", OmegaFactor_LowerLimit, 1e-06); + /* DESCRIPTION: */ addDoubleOption("ENGINE_NU_FACTOR", NuFactor_Engine, 3.0); /* DESCRIPTION: */ addDoubleOption("ACTDISK_SECONDARY_FLOW", SecondaryFlow_ActDisk, 0.0); diff --git a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp index 639c7ace7dc..6b9dfa433d7 100644 --- a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp +++ b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp @@ -97,7 +97,7 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh constants[5] = 0.0828; //beta_2 constants[6] = 0.09; //betaStar constants[7] = 0.31; //a1 - + if (sstParsedOptions.version == SST_OPTIONS::V1994){ constants[8] = constants[4]/constants[6] - constants[2]*0.41*0.41/sqrt(constants[6]); //alfa_1 constants[9] = constants[5]/constants[6] - constants[3]*0.41*0.41/sqrt(constants[6]); //alfa_2 @@ -123,12 +123,16 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh su2double kine_Inf = 3.0/2.0*(VelMag2*Intensity*Intensity); su2double omega_Inf = rhoInf*kine_Inf/(muLamInf*viscRatio); + /*--- Constants to use for lower limit of turbulence variable. ---*/ + su2double Ck = config->GetKFactor_LowerLimit(); + su2double Cw = config->GetOmegaFactor_LowerLimit(); + /*--- Initialize lower and upper limits---*/ - lowerlimit[0] = 1.0e-20 * kine_Inf; + lowerlimit[0] = Ck * kine_Inf; upperlimit[0] = 1.0e10; - lowerlimit[1] = 1.0e-6 * omega_Inf; - upperlimit[1] = 1.0e16; + lowerlimit[1] = Cw * omega_Inf; + upperlimit[1] = 1.0e15; Solution_Inf[0] = kine_Inf; From 3ed4417bdea7c626fe7b6da1eeb409aeb311809e Mon Sep 17 00:00:00 2001 From: Eitan Aberman <139676851+emaberman@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:11:02 +0300 Subject: [PATCH 03/12] Update config_template.cfg add options to config_template --- config_template.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config_template.cfg b/config_template.cfg index 74832ef98db..925726fd3ed 100644 --- a/config_template.cfg +++ b/config_template.cfg @@ -1801,6 +1801,10 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % Reduction factor of the CFL coefficient in the turbulence problem CFL_REDUCTION_TURB= 1.0 +% Control lower limit constants of the SST model (C*phi_infinity) +LOWER_LIMIT_K_FACTOR= 1e-20 +LOWER_LIMIT_OMEGA_FACTOR= 1e-6 + % --------------------- HEAT NUMERICAL METHOD DEFINITION ----------------------% % % Value of the thermal diffusivity From ab66e081250baccdedf9586b49c84a00e4132c33 Mon Sep 17 00:00:00 2001 From: emaberman Date: Mon, 22 Jul 2024 12:05:06 +0300 Subject: [PATCH 04/12] update default values and allow backwards compatibility of the code by adding normalized lower limit as SST option --- Common/include/option_structure.hpp | 5 +++++ Common/src/CConfig.cpp | 15 +++++++++++---- SU2_CFD/src/solvers/CTurbSSTSolver.cpp | 18 +++++++++++------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index 9bbe613c4bc..678ad3e6e88 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -990,6 +990,7 @@ enum class SST_OPTIONS { V, /*!< \brief Menter k-w SST model with vorticity production terms. */ KL, /*!< \brief Menter k-w SST model with Kato-Launder production terms. */ UQ, /*!< \brief Menter k-w SST model with uncertainty quantification modifications. */ + DLL, /*!< \brief Menter k-w SST model with dimensionless lower limit clipping of turbulence variables. */ }; static const MapType SST_Options_Map = { MakePair("NONE", SST_OPTIONS::NONE) @@ -1002,6 +1003,7 @@ static const MapType SST_Options_Map = { MakePair("VORTICITY", SST_OPTIONS::V) MakePair("KATO-LAUNDER", SST_OPTIONS::KL) MakePair("UQ", SST_OPTIONS::UQ) + MakePair("DIMENSIONLESS_LIMIT", SST_OPTIONS::DLL) }; /*! @@ -1013,6 +1015,7 @@ struct SST_ParsedOptions { bool sust = false; /*!< \brief Bool for SST model with sustaining terms. */ bool uq = false; /*!< \brief Bool for using uncertainty quantification. */ bool modified = false; /*!< \brief Bool for modified (m) SST model. */ + bool dll = false; /*!< \brief Bool dimensionless lower limit. */ }; /*! @@ -1048,6 +1051,7 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne const bool sst_v = IsPresent(SST_OPTIONS::V); const bool sst_kl = IsPresent(SST_OPTIONS::KL); const bool sst_uq = IsPresent(SST_OPTIONS::UQ); + const bool sst_dll = IsPresent(SST_OPTIONS::DLL); if (sst_1994 && sst_2003) { SU2_MPI::Error("Two versions (1994 and 2003) selected for SST_OPTIONS. Please choose only one.", CURRENT_FUNCTION); @@ -1071,6 +1075,7 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne SSTParsedOptions.sust = sst_sust; SSTParsedOptions.modified = sst_m; SSTParsedOptions.uq = sst_uq; + SSTParsedOptions.dll = sst_dll; return SSTParsedOptions; } diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 8b99552bcf6..29a893d56d2 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -1420,9 +1420,9 @@ void CConfig::SetConfig_Options() { /* DESCRIPTION: */ addDoubleOption("FREESTREAM_NU_FACTOR", NuFactor_FreeStream, 3.0); /* DESCRIPTION: */ - addDoubleOption("LOWER_LIMIT_K_FACTOR", KFactor_LowerLimit, 1.0e-20); + addDoubleOption("LOWER_LIMIT_K_FACTOR", KFactor_LowerLimit, 1.0e-15); /* DESCRIPTION: */ - addDoubleOption("LOWER_LIMIT_OMEGA_FACTOR", OmegaFactor_LowerLimit, 1e-06); + addDoubleOption("LOWER_LIMIT_OMEGA_FACTOR", OmegaFactor_LowerLimit, 1e-05); /* DESCRIPTION: */ addDoubleOption("ENGINE_NU_FACTOR", NuFactor_Engine, 3.0); /* DESCRIPTION: */ @@ -6161,8 +6161,8 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) { if (sstParsedOptions.version == SST_OPTIONS::V1994) cout << "-1994"; else cout << "-2003"; if (sstParsedOptions.modified) cout << "m"; - if (sstParsedOptions.sust) cout << " with sustaining terms, and"; - + if (sstParsedOptions.sust) cout << " with sustaining terms,"; + switch (sstParsedOptions.production) { case SST_OPTIONS::KL: cout << " with Kato-Launder production"; @@ -6178,6 +6178,13 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) { cout << " with no production modification"; break; } + + if (sstParsedOptions.dll){ + cout << "\nusing non dimensional lower limits relative to infinity values clipping by Coefficients:" ; + cout << " C_w= " << OmegaFactor_LowerLimit << " and C_k= " <GetKFactor_LowerLimit(); su2double Cw = config->GetOmegaFactor_LowerLimit(); /*--- Initialize lower and upper limits---*/ - lowerlimit[0] = Ck * kine_Inf; + if (sstParsedOptions.dll) { + lowerlimit[0] = Ck * kine_Inf; + lowerlimit[1] = Cw * omega_Inf; + } else { + lowerlimit[0] = 1.0e-10; + lowerlimit[1] = 1.0e-4; + } + upperlimit[0] = 1.0e10; - - lowerlimit[1] = Cw * omega_Inf; upperlimit[1] = 1.0e15; - - Solution_Inf[0] = kine_Inf; - Solution_Inf[1] = omega_Inf; - /*--- Eddy viscosity, initialized without stress limiter at the infinity ---*/ muT_Inf = rhoInf*kine_Inf/omega_Inf; From d79dc6dbc10ca443b92baccd8f83743a3f51650b Mon Sep 17 00:00:00 2001 From: Eitan Aberman <139676851+emaberman@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:18:32 +0300 Subject: [PATCH 05/12] Update Common/include/CConfig.hpp add space Co-authored-by: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> --- Common/include/CConfig.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp index ce9ba30ac60..d4f94008ddc 100644 --- a/Common/include/CConfig.hpp +++ b/Common/include/CConfig.hpp @@ -2011,7 +2011,7 @@ class CConfig { su2double GetNuFactor_FreeStream(void) const { return NuFactor_FreeStream; } /*! - * \brief Get the k constant factor define a lower limit by multiplication with values in SST turbulencemodel. + * \brief Get the k constant factor define a lower limit by multiplication with values in SST turbulence model. * \return Non-dimensionalized freestream intensity. */ su2double GetKFactor_LowerLimit(void) const { return KFactor_LowerLimit; } From 64acfa4f75a20f80b9104e257fc963565f0ec68c Mon Sep 17 00:00:00 2001 From: Eitan Aberman <139676851+emaberman@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:18:57 +0300 Subject: [PATCH 06/12] Update SU2_CFD/src/solvers/CTurbSSTSolver.cpp Co-authored-by: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> --- SU2_CFD/src/solvers/CTurbSSTSolver.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp index ce666519214..8c3e726defc 100644 --- a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp +++ b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp @@ -97,7 +97,6 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh constants[5] = 0.0828; //beta_2 constants[6] = 0.09; //betaStar constants[7] = 0.31; //a1 - if (sstParsedOptions.version == SST_OPTIONS::V1994){ constants[8] = constants[4]/constants[6] - constants[2]*0.41*0.41/sqrt(constants[6]); //alfa_1 constants[9] = constants[5]/constants[6] - constants[3]*0.41*0.41/sqrt(constants[6]); //alfa_2 From cbc71b84e3127c7dbb8767052b288954a1c66196 Mon Sep 17 00:00:00 2001 From: Eitan Aberman <139676851+emaberman@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:19:17 +0300 Subject: [PATCH 07/12] Update SU2_CFD/src/solvers/CTurbSSTSolver.cpp Co-authored-by: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> --- SU2_CFD/src/solvers/CTurbSSTSolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp index 8c3e726defc..4c546ca7ae8 100644 --- a/SU2_CFD/src/solvers/CTurbSSTSolver.cpp +++ b/SU2_CFD/src/solvers/CTurbSSTSolver.cpp @@ -129,7 +129,7 @@ CTurbSSTSolver::CTurbSSTSolver(CGeometry *geometry, CConfig *config, unsigned sh su2double Ck = config->GetKFactor_LowerLimit(); su2double Cw = config->GetOmegaFactor_LowerLimit(); - /*--- Initialize lower and upper limits---*/ + /*--- Initialize lower and upper limits. ---*/ if (sstParsedOptions.dll) { lowerlimit[0] = Ck * kine_Inf; lowerlimit[1] = Cw * omega_Inf; From 755a24cc7ca8eb62b4bdc9d81f2e02d3d065f77b Mon Sep 17 00:00:00 2001 From: Eitan Aberman <139676851+emaberman@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:22:32 +0300 Subject: [PATCH 08/12] Update config_template.cfg Update config_template.cfg optins --- config_template.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config_template.cfg b/config_template.cfg index a6188f3cbfc..ecf00315bd8 100644 --- a/config_template.cfg +++ b/config_template.cfg @@ -21,7 +21,7 @@ SOLVER= EULER % Specify turbulence model (NONE, SA, SST) KIND_TURB_MODEL= NONE % -% Specify versions/corrections of the SST model (V2003m, V1994m, VORTICITY, KATO_LAUNDER, UQ, SUSTAINING, COMPRESSIBILITY-WILCOX, COMPRESSIBILITY-SARKAR) +% Specify versions/corrections of the SST model (V2003m, V1994m, VORTICITY, KATO_LAUNDER, UQ, SUSTAINING, COMPRESSIBILITY-WILCOX, COMPRESSIBILITY-SARKAR, DIMENSIONLESS_LIMIT) SST_OPTIONS= NONE % % Specify versions/corrections of the SA model (NEGATIVE, EDWARDS, WITHFT2, QCR2000, COMPRESSIBILITY, ROTATION, BCM, EXPERIMENTAL) @@ -1802,8 +1802,8 @@ TIME_DISCRE_TURB= EULER_IMPLICIT CFL_REDUCTION_TURB= 1.0 % Control lower limit constants of the SST model (C*phi_infinity) -LOWER_LIMIT_K_FACTOR= 1e-20 -LOWER_LIMIT_OMEGA_FACTOR= 1e-6 +LOWER_LIMIT_K_FACTOR= 1e-15 +LOWER_LIMIT_OMEGA_FACTOR= 1e-5 % --------------------- HEAT NUMERICAL METHOD DEFINITION ----------------------% % From a7951604cbf3bc61e245e489ff1f3533030741a2 Mon Sep 17 00:00:00 2001 From: emaberman Date: Mon, 22 Jul 2024 12:26:03 +0300 Subject: [PATCH 09/12] fix merge conflicts --- Common/include/option_structure.hpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index f4bb35b2779..c5b7e82f32b 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -1063,13 +1063,10 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne const bool sst_v = IsPresent(SST_OPTIONS::V); const bool sst_kl = IsPresent(SST_OPTIONS::KL); const bool sst_uq = IsPresent(SST_OPTIONS::UQ); -<<<<<<< HEAD - const bool sst_dll = IsPresent(SST_OPTIONS::DLL); -======= const bool sst_compWilcox = IsPresent(SST_OPTIONS::COMP_Wilcox); const bool sst_compSarkar = IsPresent(SST_OPTIONS::COMP_Sarkar); ->>>>>>> develop - + const bool sst_dll = IsPresent(SST_OPTIONS::DLL); + if (sst_1994 && sst_2003) { SU2_MPI::Error("Two versions (1994 and 2003) selected for SST_OPTIONS. Please choose only one.", CURRENT_FUNCTION); } else if (sst_2003) { From 4500c424932f2f8286e5a553581b9e3d0b9dadfe Mon Sep 17 00:00:00 2001 From: emaberman Date: Mon, 22 Jul 2024 12:37:41 +0300 Subject: [PATCH 10/12] clear trailing white spaces --- Common/include/option_structure.hpp | 2 +- Common/src/CConfig.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index c5b7e82f32b..308ee22c301 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -1066,7 +1066,7 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne const bool sst_compWilcox = IsPresent(SST_OPTIONS::COMP_Wilcox); const bool sst_compSarkar = IsPresent(SST_OPTIONS::COMP_Sarkar); const bool sst_dll = IsPresent(SST_OPTIONS::DLL); - + if (sst_1994 && sst_2003) { SU2_MPI::Error("Two versions (1994 and 2003) selected for SST_OPTIONS. Please choose only one.", CURRENT_FUNCTION); } else if (sst_2003) { diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 9cc50ddc4f9..bf2122f01a7 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -6170,7 +6170,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) { else cout << "-2003"; if (sstParsedOptions.modified) cout << "m"; if (sstParsedOptions.sust) cout << " with sustaining terms,"; - + switch (sstParsedOptions.production) { case SST_OPTIONS::KL: cout << " with Kato-Launder production"; @@ -6193,12 +6193,12 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) { break; } - if (sstParsedOptions.dll){ + if (sstParsedOptions.dll){ cout << "\nusing non dimensional lower limits relative to infinity values clipping by Coefficients:" ; cout << " C_w= " << OmegaFactor_LowerLimit << " and C_k= " < Date: Mon, 22 Jul 2024 12:56:35 +0300 Subject: [PATCH 11/12] fix merge mishaps --- Common/include/option_structure.hpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index 308ee22c301..4c4287ad7c4 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -990,12 +990,9 @@ enum class SST_OPTIONS { V, /*!< \brief Menter k-w SST model with vorticity production terms. */ KL, /*!< \brief Menter k-w SST model with Kato-Launder production terms. */ UQ, /*!< \brief Menter k-w SST model with uncertainty quantification modifications. */ -<<<<<<< HEAD - DLL, /*!< \brief Menter k-w SST model with dimensionless lower limit clipping of turbulence variables. */ -======= COMP_Wilcox, /*!< \brief Menter k-w SST model with Compressibility correction of Wilcox. */ COMP_Sarkar, /*!< \brief Menter k-w SST model with Compressibility correction of Sarkar. */ ->>>>>>> develop + DLL, /*!< \brief Menter k-w SST model with dimensionless lower limit clipping of turbulence variables. */ }; static const MapType SST_Options_Map = { MakePair("NONE", SST_OPTIONS::NONE) @@ -1008,12 +1005,9 @@ static const MapType SST_Options_Map = { MakePair("VORTICITY", SST_OPTIONS::V) MakePair("KATO-LAUNDER", SST_OPTIONS::KL) MakePair("UQ", SST_OPTIONS::UQ) -<<<<<<< HEAD - MakePair("DIMENSIONLESS_LIMIT", SST_OPTIONS::DLL) -======= MakePair("COMPRESSIBILITY-WILCOX", SST_OPTIONS::COMP_Wilcox) MakePair("COMPRESSIBILITY-SARKAR", SST_OPTIONS::COMP_Sarkar) ->>>>>>> develop + MakePair("DIMENSIONLESS_LIMIT", SST_OPTIONS::DLL) }; /*! @@ -1098,12 +1092,10 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne SSTParsedOptions.sust = sst_sust; SSTParsedOptions.modified = sst_m; SSTParsedOptions.uq = sst_uq; -<<<<<<< HEAD - SSTParsedOptions.dll = sst_dll; -======= SSTParsedOptions.compWilcox = sst_compWilcox; SSTParsedOptions.compSarkar = sst_compSarkar; ->>>>>>> develop + SSTParsedOptions.dll = sst_dll; + return SSTParsedOptions; } From de4098779650385a25fc60f01901e83535ce0f01 Mon Sep 17 00:00:00 2001 From: emaberman Date: Mon, 22 Jul 2024 13:02:20 +0300 Subject: [PATCH 12/12] fix spaces --- Common/include/option_structure.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index 4c4287ad7c4..64c781a34f8 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -1095,7 +1095,7 @@ inline SST_ParsedOptions ParseSSTOptions(const SST_OPTIONS *SST_Options, unsigne SSTParsedOptions.compWilcox = sst_compWilcox; SSTParsedOptions.compSarkar = sst_compSarkar; SSTParsedOptions.dll = sst_dll; - + return SSTParsedOptions; }