Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Implementation of eN transition model #1765

Draft
wants to merge 95 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
e960644
Starting up eN transition implementation
RichRoos Sep 20, 2022
c4b6fca
General file structure
RichRoos Sep 20, 2022
1347597
Forgot some files. Now compilable structure.
RichRoos Sep 20, 2022
56b93c1
Complilable and runnable dry-case (-d) code
RichRoos Sep 22, 2022
fd51593
Merge branch 'su2code:master' into SU2_feature_eN_PR01
RichRoos Sep 22, 2022
604aadb
Merge branch 'develop' into SU2_feature_eN_PR01
bigfooted Sep 22, 2022
c6e7c90
Removing mesh and fixing lgtm error.
RichRoos Sep 23, 2022
53b7914
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Sep 29, 2022
9fc045d
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Oct 3, 2022
e80c407
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Oct 7, 2022
f928a49
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Oct 13, 2022
d469819
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Oct 19, 2022
f231a7f
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Oct 30, 2022
8cdb955
Merging eN and LM transition model + adding some improvements on eN
RichRoos Nov 5, 2022
3641563
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Nov 5, 2022
2b905f4
Last change to conclude addition of eN to LM.
RichRoos Nov 5, 2022
9508e5e
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Nov 11, 2022
c4ed8c9
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Nov 13, 2022
36b4a00
Cleaning up interaction with SA
RichRoos Nov 13, 2022
988a6bd
Merge branch 'SU2_feature_eN_PR01' of https://github.com/RichRoos/SU2…
RichRoos Nov 13, 2022
96628ae
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Nov 24, 2022
c1d6843
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 1, 2022
36fad1b
Reducing N value growth
RichRoos Dec 1, 2022
a30f6a4
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 3, 2022
3618e1a
Slight change in control parameters for better results for smaller grids
RichRoos Dec 5, 2022
0347127
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 6, 2022
aed8767
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 9, 2022
f337507
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 14, 2022
f264b2a
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 19, 2022
cfe99be
Save before difficult? develop merge.
RichRoos Dec 20, 2022
111ad42
Merge remote-tracking branch 'upstream/develop' into SU2_feature_eN_PR01
RichRoos Dec 20, 2022
e80b50f
Create mesh_NACA0012_inv.su2
RichRoos Dec 20, 2022
7390c60
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 20, 2022
90d26ba
Slight changes and better merge of LM and eN code
RichRoos Dec 21, 2022
69055d9
Merge branch 'SU2_feature_eN_PR01' of https://github.com/RichRoos/SU2…
RichRoos Dec 21, 2022
c7826ba
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Dec 31, 2022
2bcf4c5
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 9, 2023
4a8c4f7
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 9, 2023
84ab6a5
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 10, 2023
4dd5b85
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 11, 2023
c761a0c
General clean-up and save before merge with local files
RichRoos Jan 12, 2023
c8c050e
Merge branch 'SU2_feature_eN_PR01' of https://github.com/RichRoos/SU2…
RichRoos Jan 12, 2023
a076372
Last bit of clean-up. Stable simulation again.
RichRoos Jan 13, 2023
668087c
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 13, 2023
359a123
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 14, 2023
fed8133
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 16, 2023
2b1fc32
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 19, 2023
b7028bc
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 22, 2023
3af0d91
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jan 23, 2023
7274d12
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Feb 1, 2023
2c849ee
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Feb 6, 2023
9e75d31
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Feb 7, 2023
9f1a008
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Feb 12, 2023
85d9931
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Feb 20, 2023
398cd3e
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Feb 22, 2023
6a3a27f
Abs(pInf - p) change
RichRoos Feb 22, 2023
db6e709
Merge branch 'SU2_feature_eN_PR01' of https://github.com/RichRoos/SU2…
RichRoos Feb 22, 2023
3bd91c8
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 2, 2023
af49882
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 7, 2023
b5ec705
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 9, 2023
e2de13b
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 13, 2023
3747b22
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 17, 2023
835b705
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 17, 2023
cdd9113
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 20, 2023
173ac5c
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 21, 2023
13029b8
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 22, 2023
4b7e816
Merge branch 'develop' into pr/1765
RichRoos Mar 27, 2023
f1a7a50
Merge branch 'SU2_feature_eN_PR01' of https://github.com/RichRoos/SU2…
RichRoos Mar 27, 2023
20c6541
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 27, 2023
2b2c30f
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 29, 2023
a0b6e33
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Mar 30, 2023
443fec6
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 1, 2023
74c2f47
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 3, 2023
09872f6
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 5, 2023
7389eb2
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 10, 2023
07a9321
Reverting some values to achieve transition again
RichRoos Apr 11, 2023
d8f1195
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 12, 2023
11eed9d
Merge branch 'develop' into pr/1765
RichRoos Apr 17, 2023
14807c8
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 22, 2023
8251c65
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Apr 24, 2023
cf992fc
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos May 1, 2023
5f58b05
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos May 10, 2023
f8648e2
Quick test with AFT2019b
RichRoos May 19, 2023
4a8afaf
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos May 19, 2023
8831125
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos May 22, 2023
36089a7
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos May 27, 2023
93b5883
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jun 4, 2023
3c3136a
Quick update with output variables to solve conflict with develop
RichRoos Jun 4, 2023
3293b11
Merge branch 'SU2_feature_eN_PR01' of https://github.com/RichRoos/SU2…
RichRoos Jun 4, 2023
4264ba0
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jun 11, 2023
8be56fd
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jun 28, 2023
543589e
Merge branch 'develop' into SU2_feature_eN_PR01
RichRoos Jul 10, 2023
3bd7d08
Few changes. Mainly removing bug with "dryrun" and the calculation of…
RichRoos Jul 12, 2023
587f22b
small updates
RichRoos Jul 12, 2023
ae58ced
Save point after removal of debug values
RichRoos Jul 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Common/include/CConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,7 @@ class CConfig {
Tke_FreeStream, /*!< \brief Total turbulent kinetic energy of the fluid. */
Intermittency_FreeStream, /*!< \brief Freestream intermittency (for sagt transition model) of the fluid. */
TurbulenceIntensity_FreeStream, /*!< \brief Freestream turbulent intensity (for sagt transition model) of the fluid. */
AmplificationFactor_FreeStream, /*!< \brief Freestream amplifictation factor for the eN 1 equation transition model. */
Turb2LamViscRatio_FreeStream, /*!< \brief Ratio of turbulent to laminar viscosity. */
NuFactor_FreeStream, /*!< \brief Ratio of turbulent to laminar viscosity. */
NuFactor_Engine, /*!< \brief Ratio of turbulent to laminar viscosity at the engine. */
Expand Down Expand Up @@ -1921,6 +1922,12 @@ class CConfig {
*/
su2double GetIntermittency_FreeStream(void) const { return Intermittency_FreeStream; }

/*!
* \brief Get the value of the non-dimensionalized freestream amplification factor.
* \return Non-dimensionalized freestream amplification factor.
*/
su2double GetAmplificationFactor_FreeStream(void) const { return AmplificationFactor_FreeStream; }

/*!
* \brief Get the value of the non-dimensionalized freestream turbulence intensity.
* \return Non-dimensionalized freestream intensity.
Expand Down
2 changes: 2 additions & 0 deletions Common/include/option_structure.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1166,10 +1166,12 @@ inline SA_ParsedOptions ParseSAOptions(const SA_OPTIONS *SA_Options, unsigned sh
enum class TURB_TRANS_MODEL {
NONE, /*!< \brief No transition model. */
LM, /*!< \brief Kind of transition model (Langtry-Menter (LM) for SST and Spalart-Allmaras). */
EN, /*!< \brief Kind of transition model using Amplification factor purely for Spalart-Allmaras*/
};
static const MapType<std::string, TURB_TRANS_MODEL> Trans_Model_Map = {
MakePair("NONE", TURB_TRANS_MODEL::NONE)
MakePair("LM", TURB_TRANS_MODEL::LM)
MakePair("EN", TURB_TRANS_MODEL::EN)
};

/*!
Expand Down
10 changes: 9 additions & 1 deletion Common/src/CConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4724,7 +4724,11 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
SU2_MPI::Error("The LM transition model is under maintenance.", CURRENT_FUNCTION);
}

if(Turb_Fixed_Values && !OptionIsSet("TURB_FIXED_VALUES_DOMAIN")){
if ((!saParsedOptions.ft2) && (Kind_Trans_Model == TURB_TRANS_MODEL::EN)) {
pcarruscag marked this conversation as resolved.
Show resolved Hide resolved
SU2_MPI::Error("eN transition model is only available with the SA-WITHFT2 turbulence model.", CURRENT_FUNCTION);
}

if (Turb_Fixed_Values && !OptionIsSet("TURB_FIXED_VALUES_DOMAIN")){
SU2_MPI::Error("TURB_FIXED_VALUES activated, but no domain set with TURB_FIXED_VALUES_DOMAIN.", CURRENT_FUNCTION);
}

Expand Down Expand Up @@ -6033,6 +6037,10 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
cout << "." << endl;
break;
}
switch (Kind_Trans_Model) {
case TURB_TRANS_MODEL::NONE: break;
case TURB_TRANS_MODEL::EN: cout << "Low-turbulence Transition model: eN 1 equation model (2014)" << endl; break;
}
cout << "Hybrid RANS/LES: ";
switch (Kind_HybridRANSLES) {
case NO_HYBRIDRANSLES: cout << "No Hybrid RANS/LES" << endl; break;
Expand Down
Loading