Merge pull request #2889 from CliMA/aj/diagnostic_edmf_1M

Add 1M microphysics to diagnostic edmf

.buildkite/pipeline.yml

@@ -501,30 +501,38 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Diagnostic EDMFX Rico in a box"
+      - label: ":umbrella: Diagnostic EDMFX Rico in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/diagnostic_edmfx_rico_box.yml
         artifact_paths: "diagnostic_edmfx_rico_box/output_active/*"
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Diagnostic EDMFX TRMM in a box"
+      - label: ":umbrella: Diagnostic EDMFX TRMM in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/diagnostic_edmfx_trmm_box.yml
         artifact_paths: "diagnostic_edmfx_trmm_box/output_active/*"
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Diagnostic EDMFX TRMM stretched grid in a box"
+      - label: ":umbrella: Diagnostic EDMFX TRMM stretched grid in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/diagnostic_edmfx_trmm_stretched_box.yml
         artifact_paths: "diagnostic_edmfx_trmm_stretched_box/output_active/*"
         agents:
           slurm_mem: 20GB
 
+      - label: ":genie: Diagnostic EDMFX TRMM 0M in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/diagnostic_edmfx_trmm_box_0M.yml
+        artifact_paths: "diagnostic_edmfx_trmm_box_0M/output_active/*"
+        agents:
+          slurm_mem: 20GB
+
       - label: ":genie: Diagnostic EDMFX aquaplanet with TKE"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl

config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml

@@ -1,20 +1,20 @@
 dt_save_state_to_disk: "3hours"
 dt_save_to_sol: "Inf"
 job_id: gpu_diagnostic_edmfx_aquaplanet
-surface_setup: DefaultMoninObukhov 
+surface_setup: DefaultMoninObukhov
 rad: clearsky
-turbconv: diagnostic_edmfx 
+turbconv: diagnostic_edmfx
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true
-edmfx_upwinding: first_order 
-edmfx_entr_model: "Generalized" 
-edmfx_detr_model: "Generalized" 
-edmfx_nh_pressure: true 
+edmfx_upwinding: first_order
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
-moist: equil 
+moist: equil
 precip_model: 0M
-dt: 100secs 
-t_end: 6hours 
+dt: 100secs
+t_end: 6hours
 toml: [toml/diagnostic_edmfx_box.toml]

config/model_configs/diagnostic_edmfx_aquaplanet.yml

@@ -1,21 +1,21 @@
 job_id: diagnostic_edmfx_aquaplanet
 surface_setup: DefaultMoninObukhov
 rad: clearsky
-turbconv: diagnostic_edmfx 
+turbconv: diagnostic_edmfx
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true
-edmfx_upwinding: first_order 
-edmfx_entr_model: "Generalized" 
-edmfx_detr_model: "Generalized" 
-edmfx_nh_pressure: true 
+edmfx_upwinding: first_order
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
-moist: equil 
+moist: equil
 precip_model: 0M
 override_τ_precip: false
-dt: 100secs 
-t_end: 12hours 
+dt: 100secs
+t_end: 12hours
 dt_save_state_to_disk: 12hours
 regression_test: true
 toml: [toml/diagnostic_edmfx_trmm_box.toml]

config/model_configs/diagnostic_edmfx_rico_box.yml

@@ -8,13 +8,14 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true
 edmfx_upwinding: first_order
-edmfx_entr_model: "Generalized" 
-edmfx_detr_model: "Generalized" 
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
 edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
-precip_model: "0M"
+apply_limiter: false
+precip_model: "1M"
 config: box
 hyperdiff: "true"
 x_max: 1e8
@@ -34,3 +35,5 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+  - short_name: [husra, hussn]
+    period: 10mins

config/model_configs/diagnostic_edmfx_trmm_box.yml

@@ -7,15 +7,14 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true
 edmfx_upwinding: first_order
-edmfx_entr_model: "Generalized" 
-edmfx_detr_model: "Generalized" 
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
 edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 apply_limiter: false
-precip_model: "0M"
-override_τ_precip: false
+precip_model: "1M"
 config: box
 hyperdiff: "true"
 x_max: 1e8
@@ -36,3 +35,5 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+  - short_name: [husra, hussn]
+    period: 10mins

config/model_configs/diagnostic_edmfx_trmm_box_0M.yml

@@ -0,0 +1,39 @@
+job_id: diagnostic_edmfx_trmm_box_0M
+initial_condition: TRMM_LBA
+rad: TRMM_LBA
+surface_setup: TRMM_LBA
+turbconv: diagnostic_edmfx
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+prognostic_tke: true
+edmfx_upwinding: first_order
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+moist: equil
+apply_limiter: false
+precip_model: "0M"
+override_τ_precip: false
+config: box
+hyperdiff: "true"
+x_max: 1e8
+y_max: 1e8
+x_elem: 2
+y_elem: 2
+z_elem: 82
+z_max: 16400
+z_stretch: false
+dt: 200secs
+t_end: 6hours
+dt_save_state_to_disk: 10mins
+FLOAT_TYPE: "Float64"
+toml: [toml/diagnostic_edmfx_trmm_box_0M.toml]
+netcdf_output_at_levels: true
+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]
+    period: 10mins
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
+    period: 10mins

config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml

@@ -15,7 +15,7 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 apply_limiter: false
-precip_model: "0M"
+precip_model: "1M"
 override_τ_precip: false
 config: box
 hyperdiff: "true"
@@ -38,3 +38,5 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
+  - short_name: [husra, hussn]
+    period: 10mins

post_processing/ci_plots.jl

@@ -1012,9 +1012,7 @@ EDMFBoxPlots = Union{
     Val{:diagnostic_edmfx_bomex_box},
     Val{:diagnostic_edmfx_bomex_stretched_box},
     Val{:diagnostic_edmfx_dycoms_rf01_box},
-    Val{:diagnostic_edmfx_rico_box},
-    Val{:diagnostic_edmfx_trmm_box},
-    Val{:diagnostic_edmfx_trmm_stretched_box},
+    Val{:diagnostic_edmfx_trmm_box_0M},
     Val{:diagnostic_edmfx_dycoms_rf01_explicit_box},
     Val{:prognostic_edmfx_adv_test_column},
     Val{:prognostic_edmfx_gabls_column},
@@ -1032,6 +1030,9 @@ EDMFBoxPlots = Union{
 EDMFBoxPlotsWithPrecip = Union{
     Val{:prognostic_edmfx_rico_column},
     Val{:prognostic_edmfx_trmm_column},
+    Val{:diagnostic_edmfx_rico_box},
+    Val{:diagnostic_edmfx_trmm_box},
+    Val{:diagnostic_edmfx_trmm_stretched_box},
 }