Add 1M and non-equil moisture to diagnotic EDMF

Author: trontrytel

config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml

@@ -13,9 +13,9 @@ edmfx_detr_model: "Generalized"
 edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
-moist: equil
+moist: nonequil
 cloud_model: "quadrature_sgs"
-precip_model: "0M"
+precip_model: "1M"
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
@@ -28,10 +28,14 @@ z_stretch: false
 dt: 100secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx_0M.toml]
+toml: [toml/diagnostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 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, tke, lmix]
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, husraup, hussnup, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 10mins
+  - short_name: [husra, hussn]
     period: 10mins

config/model_configs/diagnostic_edmfx_rico_box.yml

@@ -12,9 +12,9 @@ edmfx_detr_model: "Generalized"
 edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
-moist: equil
+moist: nonequil
 cloud_model: "quadrature_sgs"
-precip_model: "0M"
+precip_model: "1M"
 call_cloud_diagnostics_per_stage: true
 config: box
 x_max: 1e8
@@ -27,10 +27,14 @@ z_stretch: false
 dt: 100secs
 t_end: 8hours
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx_0M.toml]
+toml: [toml/diagnostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 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, tke, lmix]
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, husraup, hussnup, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 10mins
+  - short_name: [husra, hussn]
     period: 10mins

config/model_configs/diagnostic_edmfx_trmm_box.yml

@@ -11,11 +11,11 @@ edmfx_detr_model: "Generalized"
 edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
-moist: equil
+moist: nonequil
 cloud_model: "quadrature_sgs"
 call_cloud_diagnostics_per_stage: true
 apply_limiter: false
-precip_model: "0M"
+precip_model: "1M"
 config: box
 x_max: 1e8
 y_max: 1e8
@@ -24,14 +24,18 @@ y_elem: 2
 z_elem: 82
 z_max: 16400
 z_stretch: false
-dt: 200secs
+dt: 100secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/diagnostic_edmfx_0M.toml]
+toml: [toml/diagnostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 82]
 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, tke, lmix]
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, husraup, hussnup, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 10mins
+  - short_name: [husra, hussn]
     period: 10mins

post_processing/ci_plots.jl

@@ -1391,16 +1391,19 @@ EDMFBoxPlots = Union{
     Val{:prognostic_edmfx_bomex_box},
     Val{:rcemipii_box_diagnostic_edmfx},
     Val{:prognostic_edmfx_soares_column},
-    Val{:diagnostic_edmfx_dycoms_rf02_box},
-    Val{:diagnostic_edmfx_rico_box},
-    Val{:diagnostic_edmfx_trmm_box},
     Val{:diagnostic_edmfx_trmm_stretched_box},
 }
 
 EDMFBoxPlotsWithPrecip = Union{
     Val{:prognostic_edmfx_rico_column},
     Val{:prognostic_edmfx_trmm_column},
 }
+
+DiagEDMFBoxPlotsWithPrecip = Union{
+    Val{:diagnostic_edmfx_dycoms_rf02_box},
+    Val{:diagnostic_edmfx_rico_box},
+    Val{:diagnostic_edmfx_trmm_box},
+}
 """
     plot_edmf_vert_profile!(grid_loc, var_group)
 
@@ -1476,14 +1479,23 @@ function pair_edmf_names(short_names)
 end
 
 function make_plots(
-    sim_type::Union{EDMFBoxPlots, EDMFBoxPlotsWithPrecip},
+    sim_type::Union{
+        EDMFBoxPlots,
+        EDMFBoxPlotsWithPrecip,
+        DiagEDMFBoxPlotsWithPrecip,
+    },
     output_paths::Vector{<:AbstractString},
 )
     simdirs = SimDir.(output_paths)
 
-    precip_names =
-        sim_type isa EDMFBoxPlotsWithPrecip ?
-        ("husra", "hussn", "husraup", "hussnup", "husraen", "hussnen") : ()
+    if sim_type isa EDMFBoxPlotsWithPrecip
+        precip_names =
+            ("husra", "hussn", "husraup", "hussnup", "husraen", "hussnen")
+    elseif sim_type isa DiagEDMFBoxPlotsWithPrecip
+        precip_names = ("husra", "hussn", "husraup", "hussnup")
+    else
+        precip_names = ()
+    end
 
     short_names = [
         "wa",