Merge pull request #3275 from CliMA/zs/cleanup_ci

clean up ci configs
CliMA · Aug 30, 2024 · a72783f · a72783f
2 parents 92da199 + 6d7064b
commit a72783f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 67 deletions.
diff --git 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
diff --git 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/...nfigs/gpu_diagnostic_edmfx_aquaplanet.yml → ...nfigs/diagnostic_edmfx_aquaplanet_gpu.yml b/...nfigs/gpu_diagnostic_edmfx_aquaplanet.yml → ...nfigs/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
diff --git a/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
diff --git 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