From 8faf7d92c24c8349541f600bad1feea19a0461b0 Mon Sep 17 00:00:00 2001
From: szy21 <11598433+szy21@users.noreply.github.com>
Date: Tue, 14 May 2024 14:46:04 -0700
Subject: [PATCH] diagnostic edmf with topography

---
 .buildkite/longruns/pipeline.yml              |  4 +-
 ...equil_helem12_allsky_diagedmf_0M_earth.yml | 41 +++++++++++++++++++
 ...equil_helem12_allsky_progedmf_0M_earth.yml |  2 +-
 ...et_equil_helem12_clearsky_diagedmf_0M.toml | 32 +++++++++++++++
 4 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_diagedmf_0M_earth.yml
 create mode 100644 toml/longrun_aquaplanet_equil_helem12_clearsky_diagedmf_0M.toml

diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index c2521d8261f..8f042a99fae 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -42,7 +42,7 @@ steps:
 
     steps:
       
-      - label: ":computer: aquaplanet equilmoist allsky radiation + prognostic edmf + 0M microphysics"
+      - label: ":computer: aquaplanet equilmoist allsky radiation + diagnostic edmf + 0M microphysics"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
@@ -51,4 +51,4 @@ steps:
           slurm_time: 24:00:00
           slurm_mem: 32GB
         env:
-          JOB_NAME: "longrun_aquaplanet_equil_helem12_allsky_progedmf_0M_earth"
+          JOB_NAME: "longrun_aquaplanet_equil_helem12_allsky_diagedmf_0M_earth"
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_diagedmf_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_diagedmf_0M_earth.yml
new file mode 100644
index 00000000000..30c3a2db516
--- /dev/null
+++ b/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_diagedmf_0M_earth.yml
@@ -0,0 +1,41 @@
+h_elem: 12
+z_max: 55000.0
+z_elem: 30
+dz_bottom: 100.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+rad: "allskywithclear"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+turbconv: "diagnostic_edmfx"
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+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
+rayleigh_sponge: true
+vorticity_hyperdiffusion_coefficient: 1.0
+divergence_damping_factor: 4.0
+scalar_hyperdiffusion_coefficient: 4.0
+smoothing_order: 2
+topo_smoothing: true
+topography: "Earth"
+dt_save_state_to_disk: "10days"
+dt: "20secs"
+t_end: "2days"
+toml: [toml/longrun_aquaplanet_equil_helem12_clearsky_diagedmf_0M.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 1hours
+  - short_name: [arup, waup, rhoaup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 1hours
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 1hours
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_progedmf_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_progedmf_0M_earth.yml
index 8dc33abe5a2..823c393733e 100644
--- a/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_progedmf_0M_earth.yml
+++ b/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_progedmf_0M_earth.yml
@@ -37,7 +37,7 @@ netcdf_output_at_levels: true
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 1hours
-  - short_name: [arup, waup, rhoaup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+  - short_name: [arup, waup, rhoaup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke]
     period: 1hours
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 1hours
diff --git a/toml/longrun_aquaplanet_equil_helem12_clearsky_diagedmf_0M.toml b/toml/longrun_aquaplanet_equil_helem12_clearsky_diagedmf_0M.toml
new file mode 100644
index 00000000000..01517531222
--- /dev/null
+++ b/toml/longrun_aquaplanet_equil_helem12_clearsky_diagedmf_0M.toml
@@ -0,0 +1,32 @@
+[zd_rayleigh]
+value = 35000.0
+
+[alpha_rayleigh_uh]
+value = 0.0
+
+[alpha_rayleigh_w]
+value = 10.0
+
+[precipitation_timescale]
+value = 600
+
+[entr_inv_tau]
+value = 0.002
+
+[entr_coeff]
+value = 0
+
+[detr_inv_tau]
+value = 0
+
+[detr_buoy_coeff]
+value = 0.12
+
+[detr_vertdiv_coeff]
+value = 0
+
+[min_area_limiter_scale]
+value = 0
+
+[max_area_limiter_scale]
+value = 0