port from j/soares

adds soares test case

clima formatter

replace detrainment limiter with default

cleans up ci plots

.buildkite/pipeline.yml

@@ -828,6 +828,16 @@ steps:
         agents:
           slurm_mem: 20GB
 
+      - label: ":genie: Prognostic EDMFX Soares in a column"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_soares_column.yml
+          --job_id prognostic_edmfx_soares_column
+        artifact_paths: "prognostic_edmfx_soares_column/output_active/*"
+        agents:
+          slurm_mem: 20GB
+        soft_fail: true
+
   - group: "GPU"
     steps:
 

config/model_configs/prognostic_edmfx_soares_column.yml

@@ -0,0 +1,35 @@
+initial_condition: "Soares"
+surface_setup: "Soares"
+rayleigh_sponge: true
+turbconv: "prognostic_edmfx"
+implicit_diffusion: true
+implicit_sgs_advection: false
+approximate_linear_solve_iters: 2
+edmfx_upwinding: "first_order"
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "SmoothArea"
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+edmfx_nh_pressure: true
+edmfx_filter: true
+prognostic_tke: false # should we set this as true or false?
+moist: "equil"
+config: "column"
+hyperdiff: false
+z_max: 3750
+z_elem: 75
+z_stretch: false
+perturb_initstate: false
+dt: "5secs"
+t_end: "8hours"
+dt_save_state_to_disk: "14hours"
+toml: [toml/prognostic_edmfx.toml]
+netcdf_interpolation_num_points: [2, 2, 100]
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
+    period: 10mins
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 10mins
+ode_algo: ARS343

post_processing/ci_plots.jl

@@ -1181,6 +1181,7 @@ EDMFBoxPlots = Union{
     Val{:prognostic_edmfx_gcmdriven_column},
     Val{:prognostic_edmfx_bomex_box},
     Val{:rcemipii_box_diagnostic_edmfx},
+    Val{:prognostic_edmfx_soares_column},
 }
 
 EDMFBoxPlotsWithPrecip = Union{

src/surface_conditions/surface_setups.jl

@@ -91,8 +91,9 @@ function (::Soares)(params)
     z0 = FT(0.16) # 0.16 is taken from the Nieuwstadt paper.
     θ_flux = FT(0.06)
     q_flux = FT(2.5e-5)
+    ustar::FT = 0.28 # just to initilize grid mean covariances
     parameterization =
-        MoninObukhov(; z0, fluxes = θAndQFluxes(; θ_flux, q_flux))
+        MoninObukhov(; z0, fluxes = θAndQFluxes(; θ_flux, q_flux), ustar)
     return SurfaceState(; parameterization, T, p, q_vap)
 end