From 6d7064b37bf5c0f0a3a68c334530c504428b695e Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Fri, 30 Aug 2024 11:08:22 -0700
Subject: [PATCH] clean up ci configs

---
 .buildkite/pipeline.yml                       | 30 +++++++++----------
 ..._gpu_implicit_baroclinic_wave_4process.yml | 10 -------
 .../diagnostic_edmfx_aquaplanet.yml           |  5 ++--
 ...ml => diagnostic_edmfx_aquaplanet_gpu.yml} |  6 ++--
 .../gpu_baroclinic_wave_rhoe.yml              |  5 ----
 .../gpu_prognostic_edmfx_aquaplanet.yml       | 30 -------------------
 .../prognostic_edmfx_aquaplanet.yml           |  2 +-
 7 files changed, 21 insertions(+), 67 deletions(-)
 delete mode 100644 config/gpu_configs/target_gpu_implicit_baroclinic_wave_4process.yml
 rename config/model_configs/{gpu_diagnostic_edmfx_aquaplanet.yml => diagnostic_edmfx_aquaplanet_gpu.yml} (84%)
 delete mode 100644 config/model_configs/gpu_baroclinic_wave_rhoe.yml
 delete mode 100644 config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f0540cbcdf..e0d0ceac9b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -762,12 +762,12 @@ steps:
     steps:
 
       - label: "GPU: baroclinic wave"
-        key: "gpu_baroclinic_wave_rhoe"
+        key: "sphere_baroclinic_wave_rhoe_gpu"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/gpu_baroclinic_wave_rhoe.yml
-          --job_id gpu_baroclinic_wave_rhoe
-        artifact_paths: "gpu_implicit_barowave_ref/output_active/*"
+          --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe.yml
+          --job_id sphere_baroclinic_wave_rhoe_gpu
+        artifact_paths: "sphere_baroclinic_wave_rhoe_gpu/output_active/*"
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         agents:
@@ -778,15 +778,15 @@ steps:
         command: >
           tar xvf sphere_baroclinic_wave_rhoe/output_active/hdf5_files.tar -C sphere_baroclinic_wave_rhoe
 
-          tar xvf gpu_baroclinic_wave_rhoe/output_active/hdf5_files.tar -C gpu_baroclinic_wave_rhoe
+          tar xvf sphere_baroclinic_wave_rhoe_gpu/output_active/hdf5_files.tar -C sphere_baroclinic_wave_rhoe_gpu
 
           julia --color=yes --project=examples post_processing/compare_outputs.jl
           --output_folder_1 sphere_baroclinic_wave_rhoe
-          --output_folder_2 gpu_baroclinic_wave_rhoe --t_end 10days
+          --output_folder_2 sphere_baroclinic_wave_rhoe_gpu --t_end 10days
           --compare_state false
         depends_on:
           - "sphere_baroclinic_wave_rhoe"
-          - "gpu_baroclinic_wave_rhoe"
+          - "sphere_baroclinic_wave_rhoe_gpu"
 
       - label: "GPU: GPU dry baroclinic wave"
         key: "target_gpu_implicit_baroclinic_wave"
@@ -812,7 +812,7 @@ steps:
           - >
             srun --cpu-bind=threads --cpus-per-task=4
             julia --threads=3 --color=yes --project=examples examples/hybrid/driver.jl
-            --config_file ${GPU_CONFIG_PATH}/target_gpu_implicit_baroclinic_wave_4process.yml
+            --config_file ${GPU_CONFIG_PATH}/target_gpu_implicit_baroclinic_wave.yml
             --job_id target_gpu_implicit_baroclinic_wave_4process
         artifact_paths: "target_gpu_implicit_baroclinic_wave_4process/output_active/*"
         env:
@@ -867,12 +867,12 @@ steps:
           slurm_gpus: 1
 
       - label: "GPU: Diagnostic EDMFX aquaplanet"
-        key: "gpu_diagnostic_edmfx_aquaplanet"
+        key: "diagnostic_edmfx_aquaplanet_gpu"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/gpu_diagnostic_edmfx_aquaplanet.yml
-          --job_id gpu_diagnostic_edmfx_aquaplanet
-        artifact_paths: "gpu_diagnostic_edmfx_aquaplanet/output_active/*"
+          --config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet_gpu.yml
+          --job_id diagnostic_edmfx_aquaplanet_gpu
+        artifact_paths: "diagnostic_edmfx_aquaplanet_gpu/output_active/*"
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         agents:
@@ -882,9 +882,9 @@ steps:
       - label: "GPU: Prognostic EDMFX aquaplanet"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/gpu_prognostic_edmfx_aquaplanet.yml
-          --job_id gpu_prognostic_edmfx_aquaplanet
-        artifact_paths: "gpu_prognostic_edmfx_aquaplanet/output_active/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_aquaplanet.yml
+          --job_id prognostic_edmfx_aquaplanet_gpu
+        artifact_paths: "prognostic_edmfx_aquaplanet_gpu/output_active/*"
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         agents:
diff --git a/config/gpu_configs/target_gpu_implicit_baroclinic_wave_4process.yml b/config/gpu_configs/target_gpu_implicit_baroclinic_wave_4process.yml
deleted file mode 100644
index 1a47e486d5..0000000000
--- a/config/gpu_configs/target_gpu_implicit_baroclinic_wave_4process.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-dt_save_state_to_disk: "Inf"
-dt_save_to_sol: "Inf"
-output_default_diagnostics: false
-h_elem: 30
-initial_condition: "DryBaroclinicWave"
-t_end: "1days"
-z_elem: 63
-dz_bottom: 30.0
-dz_top: 3000.0
-dt: "90secs"
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
index c231631d47..bbfb7c149a 100644
--- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml
+++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -12,11 +12,10 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: 0M
-override_τ_precip: false
+precip_model: 1M
 dt: 100secs
 t_end: 12hours
 dt_save_state_to_disk: 12hours
 regression_test: true
-toml: [toml/diagnostic_edmfx_0M.toml]
+toml: [toml/diagnostic_edmfx.toml]
 ode_algo: ARS343
diff --git a/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml
similarity index 84%
rename from config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml
rename to config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml
index 889020b0c3..f311520ea3 100644
--- a/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml
+++ b/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml
@@ -1,5 +1,3 @@
-dt_save_state_to_disk: "3hours"
-dt_save_to_sol: "Inf"
 surface_setup: DefaultMoninObukhov
 rad: clearsky
 turbconv: diagnostic_edmfx
@@ -13,8 +11,10 @@ edmfx_nh_pressure: true
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
+cloud_model: "quadrature_sgs"
 precip_model: 1M
 dt: 100secs
-t_end: 6hours
+t_end: 12hours
+dt_save_state_to_disk: 12hours
 toml: [toml/diagnostic_edmfx.toml]
 ode_algo: ARS343
diff --git a/config/model_configs/gpu_baroclinic_wave_rhoe.yml b/config/model_configs/gpu_baroclinic_wave_rhoe.yml
deleted file mode 100644
index f3e5ae3d8d..0000000000
--- a/config/model_configs/gpu_baroclinic_wave_rhoe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-dt: "400secs"
-t_end: "10days" 
-dt_save_state_to_disk: "2days" 
-initial_condition: "DryBaroclinicWave" 
-dt_save_to_sol: "Inf"
diff --git a/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
deleted file mode 100644
index c7358f657f..0000000000
--- a/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-surface_setup: DefaultMoninObukhov
-rad: clearsky
-turbconv: prognostic_edmfx
-prognostic_tke: true
-implicit_diffusion: true
-implicit_sgs_advection: true
-approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
-edmfx_upwinding: first_order
-edmfx_entr_model: "Generalized"
-edmfx_detr_model: "Generalized"
-edmfx_nh_pressure: true
-edmfx_filter: true
-edmfx_sgs_mass_flux: true
-edmfx_sgs_diffusive_flux: true
-moist: equil
-precip_model: 1M
-dt: 10secs
-t_end: 1hours
-dt_save_state_to_disk: 600secs
-toml: [toml/prognostic_edmfx.toml]
-output_default_diagnostics: false
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu]
-    reduction_time: average
-    period: 1hours
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
-    reduction_time: average
-    period: 1hours
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml
index 60049c1435..5526883302 100644
--- a/config/model_configs/prognostic_edmfx_aquaplanet.yml
+++ b/config/model_configs/prognostic_edmfx_aquaplanet.yml
@@ -11,7 +11,7 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 moist: equil
 cloud_model: "quadrature_sgs"
-precip_model: 0M
+precip_model: 1M
 dt: 10secs
 t_end: 1hours
 dt_save_state_to_disk: 600secs