Merge pull request #3468 from CliMA/he/fix-c-smag

using ClimaParams `c_smag`, `Pr_t`
CliMA · Dec 5, 2024 · 34c0345 · 34c0345
2 parents c6f4c71 + 37c9800
commit 34c0345
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 36 deletions.
diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -148,12 +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
 bubble:
   help: "Enable bubble correction for more accurate surface areas"
   value: true

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
@@ -14,7 +13,6 @@ z_elem: 45
 z_stretch: false
 dt: "0.25secs"
 t_end: "20secs"
-prandtl_turbulent_neutral: 0.333
 dt_save_state_to_disk: "5secs"
 netcdf_interpolation_num_points: [40, 40, 80]
 diagnostics:

diff --git a/config/model_configs/les_isdac_box.yml b/config/model_configs/les_isdac_box.yml
@@ -15,8 +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
 x_max: 3.2e3

diff --git a/src/parameterized_tendencies/les_sgs_models/smagorinsky_lilly.jl b/src/parameterized_tendencies/les_sgs_models/smagorinsky_lilly.jl
@@ -28,7 +28,8 @@ These quantities are computed for both cell centers and faces, with prefixes `
 function set_smagorinsky_lilly_precomputed_quantities!(Y, p)
 
     (; atmos, precomputed, scratch, params) = p
-    (; Cs, Pr_t) = atmos.smagorinsky_lilly
+    c_smag = CAP.c_smag(params)
+    Pr_t = CAP.Prandtl_number_0(CAP.turbconv_params(params))
     (; ᶜu, ᶠu³, ᶜts, ᶜτ_smag, ᶠτ_smag, ᶜD_smag, ᶠD_smag) = precomputed
     FT = eltype(Y)
     grav = CAP.grav(params)
@@ -77,7 +78,7 @@ function set_smagorinsky_lilly_precomputed_quantities!(Y, p)
     ᶜΔ = @. ᶜtemp_scalar = ∛(Δ_xy * ᶜΔ_z) * ᶜfb
 
     # Smagorinsky-Lilly eddy viscosity
-    ᶜνₜ = @. ᶜtemp_scalar = Cs^2 * ᶜΔ^2 * ᶜS_norm
+    ᶜνₜ = @. ᶜtemp_scalar = c_smag^2 * ᶜΔ^2 * ᶜS_norm
     ᶠνₜ = @. ᶠtemp_scalar = ᶠinterp(ᶜνₜ)
 
     # Subgrid-scale momentum flux tensor, `τ = -2 νₜ ∘ S`

diff --git a/src/solver/model_getters.jl b/src/solver/model_getters.jl
@@ -159,16 +159,10 @@ function get_viscous_sponge_model(parsed_args, params, ::Type{FT}) where {FT}
     end
 end
 
-function get_smagorinsky_lilly_model(parsed_args, params, ::Type{FT}) where {FT}
+function get_smagorinsky_lilly_model(parsed_args)
     is_model_active = parsed_args["smagorinsky_lilly"]
-    Cs = parsed_args["c_smag"]
-    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
-        SmagorinskyLilly{FT}(; Cs, Pr_t)
-    else
-        nothing
-    end
+    return is_model_active ? SmagorinskyLilly() : nothing
 end
 
 function get_rayleigh_sponge_model(parsed_args, params, ::Type{FT}) where {FT}

diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl
@@ -85,11 +85,7 @@ function get_atmos(config::AtmosConfig, params)
         diff_mode = implicit_diffusion ? Implicit() : Explicit(),
         sgs_adv_mode = implicit_sgs_advection ? Implicit() : Explicit(),
         viscous_sponge = get_viscous_sponge_model(parsed_args, params, FT),
-        smagorinsky_lilly = get_smagorinsky_lilly_model(
-            parsed_args,
-            params,
-            FT,
-        ),
+        smagorinsky_lilly = get_smagorinsky_lilly_model(parsed_args),
         rayleigh_sponge = get_rayleigh_sponge_model(parsed_args, params, FT),
         sfc_temperature = get_sfc_temperature_form(parsed_args),
         insolation = get_insolation_form(parsed_args),

diff --git a/src/solver/types.jl b/src/solver/types.jl
@@ -131,10 +131,7 @@ Base.@kwdef struct ViscousSponge{FT} <: AbstractSponge
 end
 
 abstract type AbstractEddyViscosityModel end
-Base.@kwdef struct SmagorinskyLilly{FT} <: AbstractEddyViscosityModel
-    Cs::FT = 0.2
-    Pr_t::FT = 1 / 3
-end
+struct SmagorinskyLilly <: AbstractEddyViscosityModel end
 
 Base.@kwdef struct RayleighSponge{FT} <: AbstractSponge
     zd::FT

diff --git a/test/parameterized_tendencies/les_closures/smagorinsky_lilly.jl b/test/parameterized_tendencies/les_closures/smagorinsky_lilly.jl
@@ -57,13 +57,7 @@ import Thermodynamics as TD
     Y.c.uₕ .= Geometry.Covariant12Vector(vel)
     Y.f.u₃ .= Geometry.Covariant3Vector(w)
 
-    horizontal_smagorinsky_lilly_tendency(
-        Yₜ,
-        Y,
-        p,
-        t,
-        SmagorinskyLilly(FT(0.2)),
-    )
+    horizontal_smagorinsky_lilly_tendency(Yₜ, Y, p, t, SmagorinskyLilly())
 
     ### Component test begins here
 end
diff --git a/toml/box_density_current_test.toml b/toml/box_density_current_test.toml
@@ -0,0 +1,7 @@
+[c_smag]
+value = 0.25
+type = "float"
+
+[mixing_length_Prandtl_number_0]
+value = 0.33333
+type = "float"
diff --git a/toml/les_isdac.toml b/toml/les_isdac.toml
@@ -1,2 +1,6 @@
 [zd_rayleigh]
 value = 2000.0
+
+[mixing_length_Prandtl_number_0]
+value = 0.33333
+type = "float"