rft: split horizontal and vertical smagorinsky

Author: haakon-e

config/default_configs/default_config.yml

@@ -163,8 +163,14 @@ vert_diff:
 hyperdiff:
   help: "Hyperdiffusion. Use `CAM_SE` for sensible default values and ClimaHyperdiffusion for user control. [`CAM_SE` (default), `ClimaHyperdiffusion` (or `true`), `none` (or `false`)]"
   value: "CAM_SE"
-smagorinsky_lilly:
-  help: "Smagorinsky-Lilly diffusive closure [`false` (default), `true`]"
+smagorinsky:
+  help: "Smagorinsky diffusive closure in the horizontal and vertical [`false` (default), `true`]"
+  value: false
+smagorinsky_horizontal:
+  help: "Smagorinsky diffusive closure in the horizontal [`false` (default), `true`]"
+  value: false
+smagorinsky_vertical:
+  help: "Smagorinsky diffusive closure in the vertical [`false` (default), `true`]"
   value: false
 bubble:
   help: "Enable bubble correction for more accurate surface areas"

src/solver/model_getters.jl

@@ -169,10 +169,14 @@ function get_viscous_sponge_model(parsed_args, params, ::Type{FT}) where {FT}
     end
 end
 
-function get_smagorinsky_lilly_model(parsed_args)
-    is_model_active = parsed_args["smagorinsky_lilly"]
-    @assert is_model_active in (true, false)
-    return is_model_active ? SmagorinskyLilly() : nothing
+function get_smagorinsky_model(parsed_args; dir)
+    dir = (; h = "horizontal", v = "vertical")[dir]
+    smag_dir = parsed_args["smagorinsky_$dir"]
+    smag = parsed_args["smagorinsky"]
+    @assert smag_dir isa Bool "'smagorinsky_$dir' must be `true` or `false`."
+    @assert smag isa Bool "'smagorinsky' must be `true` or `false`."
+    @assert smag ⊼ smag_dir "Only one of 'smagorinsky' and 'smagorinsky_$dir' can be set to true."
+    return smag_dir || smag ? SmagorinskyLilly() : nothing
 end
 
 function get_rayleigh_sponge_model(parsed_args, params, ::Type{FT}) where {FT}

src/solver/type_getters.jl

@@ -145,7 +145,8 @@ function get_atmos(config::AtmosConfig, params)
                                Explicit(),
         sgs_vertdiff_mode = implicit_sgs_vertdiff ? Implicit() : Explicit(),
         sgs_mf_mode = implicit_sgs_mass_flux ? Implicit() : Explicit(),
-        smagorinsky_lilly = get_smagorinsky_lilly_model(parsed_args),
+        smagorinsky_horizontal = get_smagorinsky_model(parsed_args; dir = :h),
+        smagorinsky_vertical = get_smagorinsky_model(parsed_args; dir = :v),
 
         # AtmosGravityWave
         non_orographic_gravity_wave = get_non_orographic_gravity_wave_model(