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.

Sign up for GitHub

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

Minor TurbChoice struct cleanup #2046

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Minor TurbChoice struct cleanup #2046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc0a23
Cleanup TurbChoice struct
ewquon Jan 7, 2025
67ce9a4
Merge branch 'development' into cleanup_smag_datastruct
ewquon Jan 7, 2025
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
31 changes: 16 additions & 15 deletions Source/DataStructs/ERF_TurbStruct.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ struct TurbChoice {

// LES constants...
query_one_or_per_level(pp, "Cs" ,Cs, lev, max_level);
query_one_or_per_level(pp, "CI" ,CI, lev, max_level);
query_one_or_per_level(pp, "Pr_t",Pr_t, lev, max_level);
query_one_or_per_level(pp, "Sc_t",Sc_t, lev, max_level);

Expand Down Expand Up @@ -136,17 +135,16 @@ struct TurbChoice {
if (les_type != LESType::None) {
if (les_type == LESType::Smagorinsky) {
amrex::Print() << "Cs : " << Cs << std::endl;
amrex::Print() << "CI : " << CI << std::endl;
amrex::Print() << "Pr_t : " << Pr_t << std::endl;
amrex::Print() << "Sc_t : " << Sc_t << std::endl;
}
if (les_type == LESType::Deardorff) {
amrex::Print() << "Ce : " << Ce << std::endl;
amrex::Print() << "Ce at wall : " << Ce_wall << std::endl;
amrex::Print() << "Ck : " << Ck << std::endl;
amrex::Print() << "sigma_k : " << sigma_k << std::endl;
amrex::Print() << "reference theta : " << theta_ref << std::endl;
}
amrex::Print() << "reference theta : " << theta_ref << std::endl;
amrex::Print() << "Pr_t : " << Pr_t << std::endl;
amrex::Print() << "Sc_t : " << Sc_t << std::endl;
}

if (pbl_type == PBLType::MYNN25) {
Expand All @@ -173,25 +171,28 @@ struct TurbChoice {

// LES model
LESType les_type;
// Smagorinsky Cs coefficient
amrex::Real Cs = 0.0;
// Smagorinsky CI coefficient
amrex::Real CI = 0.0;
// Smagorinsky Turbulent Prandtl Number

// Turbulent Prandtl number
amrex::Real Pr_t = amrex::Real(1.0) / amrex::Real(3.0);
amrex::Real Pr_t_inv = amrex::Real(3.0);
// Smagorinsky Turbulent Schmidt Number

// Turbulent Schmidt number
amrex::Real Sc_t = 1.0;
amrex::Real Sc_t_inv = 1.0;

// Deardorff Ce coefficient
// Smagorinsky Cs coefficient
amrex::Real Cs = 0.0;

// Deardorff
// - Ce coefficient
amrex::Real Ce = 0.93;
amrex::Real Ce_wall = 0.0; // if > 0, then set Ce to this at k=0
// Deardorff Ck coefficient
// - Ck coefficient
amrex::Real Ck = 0.1;
// Deardorff sigma_k coefficient
// - sigma_k coefficient
amrex::Real sigma_k = 0.5;

// - reference potential temperature used to quantify the stratification in
// a stable region
amrex::Real theta_ref = 300.0;

// RANS type
Expand Down
Loading