From 59882dee0d162c7a16545ef4ca79dd97af4617f7 Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Fri, 17 May 2024 14:56:21 -0700
Subject: [PATCH] clean up ci jobs

---
 .buildkite/pipeline.yml                       | 52 ++++---------------
 .../model_configs/gpu_aquaplanet_dyamond.yml  |  2 +-
 ...lmoist_allsky_gw_raw_zonallyasymmetric.yml |  2 +-
 ...uaplanet_rhoe_equilmoist_allsky_gw_res.yml |  2 +-
 ..._aquaplanet_rhoe_nonequilmoist_allsky.yml} |  9 +---
 ...baroclinic_wave_rhoe_equilmoist_cldiag.yml |  9 ----
 ...roclinic_wave_rhoe_equilmoist_expvdiff.yml | 13 -----
 ...roclinic_wave_rhoe_equilmoist_impvdiff.yml | 12 -----
 ..._suarez_rhoe_equilmoist_hightop_sponge.yml |  2 +-
 .../sphere_held_suarez_rhoe_hightop.yml       |  2 +-
 config/perf_configs/flame_perf_gw.yml         |  2 +-
 perf/flame.jl                                 |  7 +--
 post_processing/ci_plots.jl                   | 21 +-------
 regression_tests/ref_counter.jl               |  5 +-
 14 files changed, 24 insertions(+), 116 deletions(-)
 rename config/model_configs/{sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml => sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml} (65%)
 delete mode 100644 config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_cldiag.yml
 delete mode 100644 config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
 delete mode 100644 config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 09e3b1c0c0..1d16e392bf 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -242,27 +242,6 @@ steps:
         agents:
           slurm_constraint: icelake|cascadelake|skylake|epyc
 
-      - label: ":computer: no lim ARS baroclinic wave (ρe) equilmoist with cloud diagnostics"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_cldiag.yml
-          --job_id sphere_baroclinic_wave_rhoe_equilmoist_cldiag
-        artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_cldiag/output_active/*"
-
-      - label: ":computer: no lim ARS baroclinic wave (ρe) equilmoist explicit vertdiff"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
-          --job_id sphere_baroclinic_wave_rhoe_equilmoist_expvdiff
-        artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_expvdiff/output_active/*"
-
-      - label: ":computer: no lim ARS baroclinic wave (ρe) equilmoist implicit vertdiff"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml
-          --job_id sphere_baroclinic_wave_rhoe_equilmoist_impvdiff
-        artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_impvdiff/output_active/*"
-
       # Add this back when we figure out what to do with SSP and zalesak
       # - label: ":computer: SSP zalesak tracer & energy upwind baroclinic wave (ρe_tot) equilmoist"
       #   command: >
@@ -305,7 +284,7 @@ steps:
   - group: "Sphere Examples (Aquaplanet)"
     steps:
 
-      - label: ":umbrella: aquaplanet (ρe_tot) equilmoist allsky radiation monin_obukhov varying insolation gravity wave (gfdl_restart) high top with 1-moment micro"
+      - label: ":umbrella: aquaplanet (ρe_tot) equil allsky monin_obukhov varying insol gravity wave (gfdl_restart) high top 1-moment"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml
@@ -314,16 +293,7 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":computer: aquaplanet (ρe_tot) nonequilmoist allsky radiation monin_obukhov varying insolation gravity wave (gfdl_restart) high top with 1-moment micro"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml
-          --job_id sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res
-        artifact_paths: "sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res/output_active/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":computer: aquaplanet (ρe_tot) equilmoist allsky radiation monin_obukhov varying insolation gravity wave (raw_topo) high top zonally asymmetric"
+      - label: ":computer: aquaplanet (ρe_tot) equil allsky monin_obukhov varying insol gravity wave (raw_topo) high top zonally asymmetric"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
           --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml
@@ -336,6 +306,15 @@ steps:
         agents:
           slurm_mem: 20GB
           slurm_constraint: icelake|cascadelake|skylake|epyc
+      
+      - label: ":computer: aquaplanet (ρe_tot) nonequilmoist allsky radiation monin_obukhov varying insolation high top 1-moment"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
+          --job_id sphere_aquaplanet_rhoe_nonequilmoist_allsky
+        artifact_paths: "sphere_aquaplanet_rhoe_nonequilmoist_allsky/output_active/*"
+        agents:
+          slurm_mem: 20GB
 
       - label: ":computer: aquaplanet (ρe_tot) slabocean equilmoist allsky radiation monin_obukhov varying insolation"
         command: >
@@ -980,15 +959,6 @@ steps:
         agents:
           slurm_mem: 48GB
 
-      - label: ":fire: Flame graph: perf target (barowave jfnk)"
-        command: >
-          julia --color=yes --project=perf perf/flame.jl
-          --config_file $PERF_CONFIG_PATH/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
-          --job_id flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff
-        artifact_paths: "flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff/*"
-        agents:
-          slurm_mem: 40GB
-
       - label: ":fire: Flame graph: perf target (frierson diffusion)"
         command: >
           julia --color=yes --project=perf perf/flame.jl
diff --git a/config/model_configs/gpu_aquaplanet_dyamond.yml b/config/model_configs/gpu_aquaplanet_dyamond.yml
index f76f52570f..5009b84a5d 100644
--- a/config/model_configs/gpu_aquaplanet_dyamond.yml
+++ b/config/model_configs/gpu_aquaplanet_dyamond.yml
@@ -17,6 +17,6 @@ approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
 dt: "100secs"
-t_end: "12hours"
+t_end: "8hours"
 prescribed_aerosols: ["CB1", "CB2", "DST01", "DST02", "DST03", "DST04", "OC1", "OC2", "SO4", "SOA", "SSLT01", "SSLT02", "SSLT03", "SSLT04"]
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml
index 132f044047..39d3849e9b 100644
--- a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml
+++ b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml
@@ -10,7 +10,7 @@ non_orographic_gravity_wave: true
 dz_bottom: 300.0
 vert_diff: "true"
 idealized_insolation: false
-z_max: 45000.0
+z_max: 55000.0
 precip_model: "0M"
 cloud_model: "grid_scale"
 surface_temperature: "ZonallyAsymmetric"
diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml
index 6510a754a7..b2cbd78a6a 100644
--- a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml
+++ b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml
@@ -1,5 +1,5 @@
 z_elem: 25
-z_max: 45000.0
+z_max: 55000.0
 dz_bottom: 300.0
 dt: "400secs"
 t_end: "24hours"
diff --git a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
similarity index 65%
rename from config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml
rename to config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
index 7c9591c9ab..6ed846b7fb 100644
--- a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res.yml
+++ b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
@@ -1,5 +1,5 @@
 z_elem: 25
-z_max: 45000.0
+z_max: 55000.0
 dz_bottom: 300.0
 dt: "400secs"
 t_end: "18hours"
@@ -12,12 +12,5 @@ precip_model: "nothing"
 rad: "allskywithclear"
 idealized_insolation: false
 rayleigh_sponge: true
-non_orographic_gravity_wave: true
-orographic_gravity_wave: "gfdl_restart"
 surface_setup: "DefaultMoninObukhov"
-prescribed_aerosols: ["CB1", "CB2"]
 toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml]
-diagnostics:
-  - short_name: [edt, evu]
-    reduction_time: average
-    period: "18hours"
diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_cldiag.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_cldiag.yml
deleted file mode 100644
index 1b7bdd1c84..0000000000
--- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_cldiag.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-precip_model: "0M"
-dt_save_state_to_disk: "2days"
-initial_condition: "MoistBaroclinicWave"
-dt: "450secs"
-dt_cloud_fraction: "450secs"
-moist: "equil"
-diagnostics:
-  - short_name: [pfull, wa, va, rv, hus]
-    period: 1days
diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
deleted file mode 100644
index 3cc4649423..0000000000
--- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-precip_model: "0M"
-vert_diff: "true"
-z_elem: 20
-dz_bottom: 100
-dt_save_state_to_disk: "6hours"
-initial_condition: "MoistBaroclinicWave"
-dt: "20secs"
-t_end: "6hours"
-moist: "equil"
-toml: [toml/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.toml]
-diagnostics:
-  - short_name: [pfull, rv, ua, va, wa, ta, hus]
-    period: 6hours
diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml
deleted file mode 100644
index 4c001b5367..0000000000
--- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-precip_model: "0M"
-vert_diff: "true"
-z_elem: 20
-dz_bottom: 100
-dt_save_state_to_disk: "4days"
-initial_condition: "MoistBaroclinicWave"
-implicit_diffusion: true
-max_newton_iters_ode: 2
-dt: "400secs"
-t_end: "4days"
-moist: "equil"
-toml: [toml/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.toml]
diff --git a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml
index ca4feadb5b..a9630366e5 100644
--- a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml
+++ b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml
@@ -6,7 +6,7 @@ t_end: "4days"
 dz_bottom: 300.0
 vert_diff: "true"
 forcing: "held_suarez"
-z_max: 45000.0
+z_max: 55000.0
 precip_model: "0M"
 regression_test: true
 viscous_sponge: true
diff --git a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml
index 95b78f2f18..6e9f232f5b 100644
--- a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml
+++ b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml
@@ -5,4 +5,4 @@ forcing: "held_suarez"
 dt: "400secs"
 z_elem: 25
 deep_atmosphere: true
-z_max: 45000.0
+z_max: 55000.0
diff --git a/config/perf_configs/flame_perf_gw.yml b/config/perf_configs/flame_perf_gw.yml
index 1012d76f3e..dd4aeadb50 100644
--- a/config/perf_configs/flame_perf_gw.yml
+++ b/config/perf_configs/flame_perf_gw.yml
@@ -21,4 +21,4 @@ toml:
 orographic_gravity_wave: "raw_topo"
 idealized_insolation: false
 non_orographic_gravity_wave: true
-z_max: 45000.0
+z_max: 55000.0
diff --git a/perf/flame.jl b/perf/flame.jl
index fbd0941670..f6a8f22506 100644
--- a/perf/flame.jl
+++ b/perf/flame.jl
@@ -42,8 +42,6 @@ allocs_limit["flame_perf_target_tracers"] = 1_184_407
 allocs_limit["flame_perf_target_edmfx"] = 1_383_200
 allocs_limit["flame_perf_diagnostics"] = 21_359_336
 allocs_limit["flame_perf_target_diagnostic_edmfx"] = 1_936_480
-allocs_limit["flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff"] =
-    4_018_252_656
 allocs_limit["flame_perf_target_frierson"] = 4_015_547_056
 allocs_limit["flame_perf_target_threaded"] = 2_298_355
 allocs_limit["flame_perf_target_callbacks"] = 1_285_460
@@ -64,10 +62,7 @@ sampling_rate = expected_allocs <= max_allocs_for_full_sampling ? 1 : 0.01
 
 # Some jobs are problematic (the ones with Krylov mostly)
 # https://github.com/pfitzseb/ProfileCanvas.jl/issues/34
-if job_id in (
-    "flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff",
-    "flame_perf_target_frierson",
-)
+if job_id in ("flame_perf_target_frierson",)
     sampling_rate = 0.001
 end
 
diff --git a/post_processing/ci_plots.jl b/post_processing/ci_plots.jl
index 30f3ad8fd9..552d0bd7e9 100644
--- a/post_processing/ci_plots.jl
+++ b/post_processing/ci_plots.jl
@@ -692,24 +692,6 @@ function make_plots(
     make_plots_generic(output_paths, vars, z = 1500)
 end
 
-
-function make_plots(
-    ::Val{:sphere_baroclinic_wave_rhoe_equilmoist_expvdiff},
-    output_paths::Vector{<:AbstractString},
-)
-    simdirs = SimDir.(output_paths)
-    short_names, reduction = ["ta", "hus"], "average"
-    vars = map_comparison(simdirs, short_names) do simdir, short_name
-        get(simdir; short_name, reduction) |> ClimaAnalysis.average_lon
-    end
-    make_plots_generic(
-        output_paths,
-        vars,
-        time = LAST_SNAP,
-        more_kwargs = YLINEARSCALE,
-    )
-end
-
 LongMoistBaroWavePlots = Union{
     Val{:longrun_bw_rhoe_equil_highres},
     Val{:longrun_zalesak_tracer_energy_bw_rhoe_equil_highres},
@@ -762,7 +744,6 @@ function make_plots(
 end
 
 MoistHeldSuarezPlots = Union{
-    Val{:sphere_baroclinic_wave_rhoe_equilmoist_impvdiff},
     Val{:sphere_held_suarez_rhoe_equilmoist_hightop_sponge},
     Val{:longrun_hs_rhoe_equil_55km_nz63_0M},
     Val{:longrun_hs_rhoe_equil_55km_nz63_0M_deepatmos},
@@ -910,7 +891,7 @@ end
 
 AquaplanetPlots = Union{
     Val{:mpi_sphere_aquaplanet_rhoe_equilmoist_clearsky},
-    Val{:sphere_aquaplanet_rhoe_nonequilmoist_allsky_gw_res},
+    Val{:sphere_aquaplanet_rhoe_nonequilmoist_allsky},
     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},
diff --git a/regression_tests/ref_counter.jl b/regression_tests/ref_counter.jl
index b548cc9d89..f5e2f4df6f 100644
--- a/regression_tests/ref_counter.jl
+++ b/regression_tests/ref_counter.jl
@@ -1,4 +1,7 @@
-160
+161
+
+# 161: 
+# - Change domain top to 55 km in simulations with high top
 
 # 160: 
 # - Introduces initial conditions for the baroclinic-wave