From 9566cdab56adf1569d7ad7cf157f62943e5d1ef9 Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:37:45 -0800
Subject: [PATCH] clean up longruns

---
 .buildkite/longruns/pipeline.yml              | 66 +++++++++----------
 ...aplanet_rhoe_equil_highres_allsky_ft32.yml | 17 -----
 ...quilmoist_nz63_0M_55km_rs35km_clearsky.yml | 20 ++++++
 ...st_nz63_0M_55km_rs35km_clearsky_earth.yml} |  7 +-
 ...ongrun_sphere_hydrostatic_balance_rhoe.yml |  9 ++-
 5 files changed, 60 insertions(+), 59 deletions(-)
 delete mode 100644 config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft32.yml
 create mode 100644 config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml
 rename config/longrun_configs/{longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation_earth.yml => longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml} (83%)

diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index 6fc22bbfff6..9daa729b2a3 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -49,6 +49,18 @@ steps:
 
     steps:
 
+      - label: ":computer: hydrostatic balance (ρe_tot)"
+        command:
+          - julia --color=yes --project=examples --threads=8 examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+          - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl --data_dir $$JOB_NAME --out_dir $$JOB_NAME
+          - julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir $$JOB_NAME --fig_dir $$JOB_NAME --case_name dry_held_suarez
+        artifact_paths: "$$JOB_NAME/*"
+        agents:
+          slurm_cpus_per_task: 32
+          slurm_time: 24:00:00
+        env:
+          JOB_NAME: "longrun_sphere_hydrostatic_balance_rhoe"
+
       - label: ":computer: lim ARS zalesak baroclinic wave (ρe_tot) equilmoist high resolution"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
@@ -88,7 +100,19 @@ steps:
           slurm_mem_per_cpu: 16GB
           slurm_time: 24:00:00
 
-      - label: ":computer: aquaplanet (ρe_tot) equilmoist clearsky high resolution (nz63) hightop (55km) rayleigh sponge(35e3, 10) Float32 (time-varying insolation)"
+      - label: ":computer: aquaplanet (ρe_tot) equilmoist clearsky high resolution (nz63) hightop (55km) rayleigh sponge(35e3, 10)"
+        command:
+          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+          - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl --data_dir $$JOB_NAME --out_dir $$JOB_NAME
+          - julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir $$JOB_NAME --fig_dir $$JOB_NAME --case_name aquaplanet
+        artifact_paths: "$$JOB_NAME/*"
+        agents:
+          slurm_ntasks: 64
+          slurm_time: 24:00:00
+        env:
+          JOB_NAME: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky"
+
+      - label: ":computer: aquaplanet (ρe_tot) equilmoist clearsky high resolution (nz63) hightop (55km) rayleigh sponge(35e3, 10) + time-varying insolation"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
           - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl --data_dir $$JOB_NAME --out_dir $$JOB_NAME
@@ -100,7 +124,7 @@ steps:
         env:
           JOB_NAME: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation"
 
-      - label: ":computer: aquaplanet (ρe_tot) equilmoist clearsky high resolution (nz63) hightop (55km) rayleigh sponge(35e3, 10) Float32 (time-varying insolation) + earth topography"
+      - label: ":computer: aquaplanet (ρe_tot) equilmoist clearsky high resolution (nz63) hightop (55km) rayleigh sponge(35e3, 10) + earth topography"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
           - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl --data_dir $$JOB_NAME --out_dir $$JOB_NAME
@@ -110,7 +134,11 @@ steps:
           slurm_ntasks: 64
           slurm_time: 24:00:00
         env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation_earth"
+          JOB_NAME: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth"
+
+  - group: "Experimental Long runs"
+
+    steps:
 
       - label: ":computer: baroclinic wave (ρe_tot) equilmoist high resolution topography (earth)"
         command:
@@ -149,38 +177,6 @@ steps:
         env:
           JOB_NAME: "longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth"
 
-  - group: "Low resolution long runs"
-
-    steps:
-
-      - label: ":computer: hydrostatic balance (ρe_tot)"
-        command:
-          - julia --color=yes --project=examples --threads=8 examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-          - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl --data_dir $$JOB_NAME --out_dir $$JOB_NAME
-          - julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir $$JOB_NAME --fig_dir $$JOB_NAME --case_name dry_held_suarez
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_cpus_per_task: 8
-          slurm_time: 24:00:00
-        env:
-          JOB_NAME: "longrun_sphere_hydrostatic_balance_rhoe"
-
-
-  - group: "Experimental Long runs"
-
-    steps:
-
-      - label: ":computer: aquaplanet (ρe_tot) equilmoist high resolution allsky radiation float64"
-        command:
-          - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
-          - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl --data_dir $$JOB_NAME --out_dir $$JOB_NAME
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_ntasks: 32
-          slurm_time: 24:00:00
-        env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_highres_allsky_ft32"
-
   - group: "DYAMOND"
 
     steps:
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft32.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft32.yml
deleted file mode 100644
index 4bff4a3fdde..00000000000
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft32.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-rad: "allskywithclear"
-dt_save_to_disk: "10days"
-rayleigh_sponge: true
-dt_rad: "1hours"
-z_elem: 45
-dt: "150secs"
-surface_setup: "DefaultMoninObukhov"
-t_end: "100days"
-dz_bottom: 30.0
-vert_diff: "true"
-h_elem: 16
-kappa_4: 1.0e16
-idealized_insolation: false
-FLOAT_TYPE: "Float32"
-precip_model: "0M"
-job_id: "longrun_aquaplanet_rhoe_equil_highres_allsky_ft32"
-moist: "equil"
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml
new file mode 100644
index 00000000000..5852e2edf8d
--- /dev/null
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml
@@ -0,0 +1,20 @@
+FLOAT_TYPE: "Float32"
+dt_save_to_disk: "10days"
+dt: "150secs"
+t_end: "300days"
+h_elem: 16
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+z_max: 55000.0
+rayleigh_sponge: true
+kappa_4: 1.0e16
+moist: "equil"
+precip_model: "0M"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "true"
+rad: "clearsky"
+dt_rad: "6hours"
+job_id: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky"
+toml: [toml/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.toml]
+
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml
similarity index 83%
rename from config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation_earth.yml
rename to config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml
index 3dfee4bbb09..2ffaa98b94a 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation_earth.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml
@@ -10,13 +10,12 @@ z_max: 55000.0
 rayleigh_sponge: true
 topography: "Earth"
 topo_smoothing: true
-kappa_4: 4.0e16
+kappa_4: 1.0e16
 moist: "equil"
 precip_model: "0M"
 surface_setup: "DefaultMoninObukhov"
 vert_diff: "true"
 rad: "clearsky"
-idealized_insolation: false
-dt_rad: "1hours"
-job_id: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation_earth"
+dt_rad: "6hours"
+job_id: "longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth"
 toml: [toml/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.toml]
diff --git a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
index 8bc097b7a60..c8e791416be 100644
--- a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
+++ b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
@@ -1,7 +1,10 @@
+h_elem: 16
+z_elem: 45
+dz_bottom: 30.0
+dt: "400secs"
+kappa_4: 1.0e16
 perturb_initstate: false 
 discrete_hydrostatic_balance: true 
-t_end: "2000days" 
-dt_save_to_sol: "10days" 
+t_end: "800days" 
 dt_save_to_disk: "10days" 
-fps: 30 
 job_id: "longrun_sphere_hydrostatic_balance_rhoe"