Use ClimaParams c_smag for Smagorinsky LES closure

CliMA · Dec 4, 2024 · dadaf31 · dadaf31
1 parent 33a2af5
commit dadaf31
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -148,9 +148,6 @@ hyperdiff:
 smagorinsky_lilly:
   help: "Smagorinsky-Lilly diffusive closure [`false` (default), `true`]"
   value: false
-c_smag: 
-  help: "Smagorinsky coefficient"
-  value: 0.2
 prandtl_turbulent_neutral:
   help: "Turbulent Prandtl number for neutral stratification"
   value: 0.333

diff --git a/config/model_configs/box_density_current_test.yml b/config/model_configs/box_density_current_test.yml
@@ -2,7 +2,6 @@ reference_job_id: "les_box"
 initial_condition: "DryDensityCurrentProfile"
 config: "box"
 smagorinsky_lilly: true
-c_smag: 0.25
 discrete_hydrostatic_balance: true
 hyperdiff: "false"
 x_max: 51200.0

diff --git a/config/model_configs/les_isdac_box.yml b/config/model_configs/les_isdac_box.yml
@@ -15,7 +15,6 @@ approximate_linear_solve_iters: 2
 hyperdiff: "false" 
 apply_limiter: false
 smagorinsky_lilly: true
-c_smag: 0.20
 prandtl_turbulent_neutral: 0.333
 # time- and spatial discretization
 x_elem: 10

diff --git a/src/solver/model_getters.jl b/src/solver/model_getters.jl
@@ -158,7 +158,7 @@ end
 
 function get_smagorinsky_lilly_model(parsed_args, params, ::Type{FT}) where {FT}
     is_model_active = parsed_args["smagorinsky_lilly"]
-    Cs = parsed_args["c_smag"]
+    Cs = CAP.c_smag(params)
     Pr_t = parsed_args["prandtl_turbulent_neutral"]  # Turbulent Prandtl number for neutral stratification
     @assert is_model_active in (true, false)
     return if is_model_active == true

diff --git a/toml/box_density_current_test.toml b/toml/box_density_current_test.toml
@@ -0,0 +1,2 @@
+[c_smag]
+value = 0.25