From a3ce08dafc0cb369b082d01ccbcb60327834a9ce Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Fri, 17 May 2024 21:04:24 -0700
Subject: [PATCH] modify longruns

---
 .buildkite/longruns/pipeline.yml              | 29 +---------
 .buildkite/longruns_gpu/pipeline.yml          | 53 ++++++++++---------
 ...5km_nz63_clearsky_diagedmf_diffonly_0M.yml | 24 ---------
 ...oe_equil_clearsky_tvinsol_0M_slabocean.yml | 14 -----
 .../longrun_bw_rhoe_equil_highres.yml         | 15 +++---
 .../longrun_bw_rhoe_highres.yml               | 11 ++--
 .../longrun_hs_rhoe_dry_55km_nz63.yml         | 10 ++--
 .../longrun_hs_rhoe_equil_55km_nz63_0M.yml    | 12 ++---
 ...n_hs_rhoe_equil_55km_nz63_0M_deepatmos.yml | 14 ++---
 ...ongrun_sphere_hydrostatic_balance_rhoe.yml | 12 +++--
 docs/src/longruns.md                          |  6 ---
 post_processing/ci_plots.jl                   |  2 -
 12 files changed, 68 insertions(+), 134 deletions(-)
 delete mode 100644 config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml
 delete mode 100644 config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml

diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index bd5396a165..e131e2b493 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -38,7 +38,7 @@ steps:
 
   - wait
 
-  - group: "Targeted AMIP resolution long runs"
+  - group: "Experimental long runs"
 
     steps:
 
@@ -64,30 +64,3 @@ steps:
           slurm_time: 24:00:00
         env:
           JOB_NAME: "longrun_ssp_bw_rhoe_equil_highres"
-      
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + prognostic edmf diffusion only + 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/*"
-        agents:
-          slurm_ntasks: 64
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16GB
-          slurm_time: 24:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M"
-
-  - group: "Low resolution long runs"
-
-    steps:
-
-      - label: ":computer: low resolution aquaplanet equilmoist clearsky radiation + time-varying insolation + slab ocean"
-        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/*"
-        agents:
-          slurm_ntasks: 8
-          slurm_mem_per_cpu: 16GB
-          slurm_time: 24:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean"
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
index fbaaf0ff4e..a2e02ce751 100644
--- a/.buildkite/longruns_gpu/pipeline.yml
+++ b/.buildkite/longruns_gpu/pipeline.yml
@@ -39,7 +39,7 @@ steps:
 
   - wait
 
-  - group: "Targeted resolution long runs"
+  - group: "helem 30 dycore"
     steps:
 
       - label: ":computer: hydrostatic balance (ρe_tot)"
@@ -91,45 +91,28 @@ steps:
           slurm_time: 12:00:00
         env:
           JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M"
-
-      - label: ":computer: aquaplanet equilmoist gray radiation + 0M microphysics"
+      
+      - label: ":computer: held-suarez equilmoist + deep-atmosphere eqns"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + diagnostic edmf diffusion only + 0M microphysics"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
+          JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos"
         agents:
           slurm_gpus: 1
           slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M"
 
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + time-varying insolation + 0M microphysics + slab ocean"
-        command:
-          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/output_active/*"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 12:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean"
+  - group: "helem 16 aquaplanet"
+    steps:
 
-      - label: ":computer: held-suarez equilmoist + deep-atmosphere eqns"
+      - label: ":computer: aquaplanet equilmoist gray radiation + 0M microphysics"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         env:
           CLIMACORE_DISTRIBUTED: "MPI"
-          JOB_NAME: "longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos"
+          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M"
         agents:
           slurm_gpus: 1
           slurm_time: 12:00:00
@@ -164,6 +147,16 @@ steps:
         env:
           JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M"
 
+        - label: ":computer: aquaplanet equilmoist clearsky radiation + prognostic edmf diffusion only + 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/*"
+        agents:
+          slurm_gpus: 1
+          slurm_time: 12:00:00
+        env:
+          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M"
+
       - label: ":computer: aquaplanet equilmoist clearsky radiation + 0M microphysics + earth topography"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
@@ -194,6 +187,16 @@ steps:
         env:
           JOB_NAME: "longrun_aquaplanet_clearsky_1M"
 
+      - label: ":computer: aquaplanet equilmoist clearsky radiation + time-varying insolation + 0M microphysics + slab ocean"
+        command:
+          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+        artifact_paths: "$$JOB_NAME/output_active/*"
+        agents:
+          slurm_gpus: 1
+          slurm_time: 12:00:00
+        env:
+          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean"
+
   - group: "DYAMOND"
 
     steps:
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml
deleted file mode 100644
index 494baf4dfd..0000000000
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-h_elem: 16
-z_max: 55000.0
-z_elem: 63
-dz_bottom: 30.0
-dz_top: 3000.0
-moist: "equil"
-precip_model: "0M"
-override_τ_precip: false
-rad: "clearsky"
-dt_rad: "6hours"
-surface_setup: "DefaultMoninObukhov"
-turbconv: "diagnostic_edmfx"
-implicit_diffusion: true
-approximate_linear_solve_iters: 2
-prognostic_tke: true
-edmfx_upwinding: "first_order"
-edmfx_nh_pressure: true
-edmfx_sgs_mass_flux: false
-edmfx_sgs_diffusive_flux: true
-rayleigh_sponge: true
-dt_save_state_to_disk: "30days"
-dt: "100secs"
-t_end: "60days"
-toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
deleted file mode 100644
index 47fe4429ac..0000000000
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-dt_save_state_to_disk: "10days"
-t_end: "100days"
-moist: "equil"
-precip_model: "0M"
-surface_setup: "DefaultMoninObukhov"
-vert_diff: "FriersonDiffusion"
-implicit_diffusion: true
-approximate_linear_solve_iters: 2
-rad: "clearsky"
-idealized_insolation: false
-dt_rad: "1hours"
-prognostic_surface: "PrognosticSurfaceTemperature"
-check_conservation: true
-bubble: false
diff --git a/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml
index d5189ad241..66829c50dc 100644
--- a/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml
+++ b/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml
@@ -1,12 +1,13 @@
-dt_save_state_to_disk: "10days"
-initial_condition: "MoistBaroclinicWave"
-z_elem: 45
-dt: "300secs"
-t_end: "100days"
+h_elem: 30
+z_elem: 63
 dz_bottom: 30.0
-h_elem: 16
-precip_model: "0M"
+dz_top: 3000.0
+dt: "100secs"
+t_end: "100days"
+initial_condition: "MoistBaroclinicWave"
 moist: "equil"
+precip_model: "0M"
+dt_save_state_to_disk: "10days"
 diagnostics:
   - short_name: [pfull, wa, va, rv, hus, ke]
     period: 1days
diff --git a/config/longrun_configs/longrun_bw_rhoe_highres.yml b/config/longrun_configs/longrun_bw_rhoe_highres.yml
index 9ce825803b..d6515e4ee2 100644
--- a/config/longrun_configs/longrun_bw_rhoe_highres.yml
+++ b/config/longrun_configs/longrun_bw_rhoe_highres.yml
@@ -1,10 +1,11 @@
+h_elem: 30
+z_elem: 63
 dz_bottom: 30.0
-dt_save_state_to_disk: "10days"
-h_elem: 16
-initial_condition: "DryBaroclinicWave"
+dz_top: 3000.0
+dt: "200secs"
 t_end: "100days"
-z_elem: 45
-dt: "400secs"
+initial_condition: "DryBaroclinicWave"
+dt_save_state_to_disk: "10days"
 diagnostics:
   - short_name: [pfull, wa, va, rv, ke]
     period: 1days
diff --git a/config/longrun_configs/longrun_hs_rhoe_dry_55km_nz63.yml b/config/longrun_configs/longrun_hs_rhoe_dry_55km_nz63.yml
index 77e9ab523f..45b9a7f8a3 100644
--- a/config/longrun_configs/longrun_hs_rhoe_dry_55km_nz63.yml
+++ b/config/longrun_configs/longrun_hs_rhoe_dry_55km_nz63.yml
@@ -1,11 +1,11 @@
+h_elem: 30
+z_elem: 63
+z_max: 55000.0
 dz_bottom: 30.0
 dz_top: 3000.0
-dt_save_state_to_disk: "10days"
+dt: "200secs"
 t_end: "300days"
-h_elem: 16
-z_elem: 63
-z_max: 55000.0
 forcing: "held_suarez"
-dt: "300secs"
 rayleigh_sponge: true
+dt_save_state_to_disk: "10days"
 toml: [toml/longrun_hs_rhoe_dry_55km_nz63.toml]
diff --git a/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M.yml b/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M.yml
index 1059f13259..88bd1d91e6 100644
--- a/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M.yml
+++ b/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M.yml
@@ -1,14 +1,14 @@
-dt_save_state_to_disk: "10days"
-dt: "150secs"
-t_end: "300days"
-h_elem: 16
+h_elem: 30
 z_elem: 63
+z_max: 55000.0
 dz_bottom: 30.0
 dz_top: 3000.0
-z_max: 55000.0
-vert_diff: "true"
+dt: "100secs"
+t_end: "300days"
 moist: "equil"
 precip_model: "0M"
+vert_diff: "true"
 rayleigh_sponge: true
 forcing: "held_suarez"
+dt_save_state_to_disk: "10days"
 toml: [toml/longrun_hs_rhoe_equil_55km_nz63_0M.toml]
diff --git a/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos.yml b/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos.yml
index 8c9a268629..dcb013565c 100644
--- a/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos.yml
+++ b/config/longrun_configs/longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos.yml
@@ -1,15 +1,15 @@
-dt_save_state_to_disk: "10days"
-dt: "150secs"
-t_end: "300days"
-h_elem: 16
+h_elem: 30
 z_elem: 63
+z_max: 55000.0
 dz_bottom: 30.0
 dz_top: 3000.0
-z_max: 55000.0
-vert_diff: "true"
+dt: "100secs"
+t_end: "300days"
+deep_atmosphere: true
 moist: "equil"
 precip_model: "0M"
+vert_diff: "true"
 rayleigh_sponge: true
 forcing: "held_suarez"
-deep_atmosphere: true
+dt_save_state_to_disk: "10days"
 toml: [toml/longrun_hs_rhoe_equil_55km_nz63_0M.toml]
diff --git a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
index 5e2152ddb4..969ea25383 100644
--- a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
+++ b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
@@ -1,8 +1,10 @@
-h_elem: 16
-z_elem: 45
+dt_save_state_to_disk: "10days"
+dt: "150secs"
+t_end: "300days"
+h_elem: 30
+z_elem: 63
 dz_bottom: 30.0
-dt: "400secs"
+dz_top: 3000.0
+z_max: 55000.0
 perturb_initstate: false
 discrete_hydrostatic_balance: true
-t_end: "800days"
-dt_save_state_to_disk: "10days"
diff --git a/docs/src/longruns.md b/docs/src/longruns.md
index c6bcda2a92..db9163b8ea 100644
--- a/docs/src/longruns.md
+++ b/docs/src/longruns.md
@@ -61,12 +61,6 @@ longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M
 Aquaplanet with idealized insolation, gray radiation, and 0-moment microphysics.
 ```
 ```
-longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M
-
-Aquaplanet with idealized insolation, clear-sky radiation, diagnostic edmf (diffusion only)
-and 0-moment microphysics.
-```
-```
 longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean
 
 Aquaplanet with slab ocean with time-varying insolation, clear-sky radiation,
diff --git a/post_processing/ci_plots.jl b/post_processing/ci_plots.jl
index 30f3ad8fd9..bb3ec13c3f 100644
--- a/post_processing/ci_plots.jl
+++ b/post_processing/ci_plots.jl
@@ -852,7 +852,6 @@ end
 function make_plots(
     ::Union{
         Val{:aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean},
-        Val{:longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean},
         Val{
             :longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean,
         },
@@ -913,7 +912,6 @@ AquaplanetPlots = Union{
     Val{:sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M},
-    Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M},