Merge pull request #3266 from CliMA/gb/aerosol_benchmark

Add aerosols to benchmark and consolidate configs
CliMA · Aug 26, 2024 · d442b28 · d442b28
2 parents 2f7b33a + b75cc7e
commit d442b28
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 47 deletions.
diff --git a/.buildkite/gpu_pipeline/pipeline.yml b/.buildkite/gpu_pipeline/pipeline.yml
@@ -150,7 +150,7 @@ steps:
             srun --cpu-bind=threads --cpus-per-task=4
             nsys profile --trace=nvtx,mpi,cuda,osrt --output=gpu_aquaplanet_dyamond_ss_1process/output_active/report
             julia --threads=3 --color=yes --project=examples examples/hybrid/driver.jl
-            --config_file ${GPU_CONFIG_PATH}gpu_aquaplanet_dyamond_ss_1process.yml
+            --config_file ${GPU_CONFIG_PATH}gpu_aquaplanet_dyamond_ss.yml
             --job_id gpu_aquaplanet_dyamond_ss_1process
         artifact_paths: "gpu_aquaplanet_dyamond_ss_1process/output_active/*"
         env:
@@ -170,7 +170,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}gpu_aquaplanet_dyamond_ss_2process.yml
+            --config_file ${GPU_CONFIG_PATH}gpu_aquaplanet_dyamond_ss.yml
             --job_id gpu_aquaplanet_dyamond_ss_2process
         artifact_paths: "gpu_aquaplanet_dyamond_ss_2process/output_active/*"
         env:
@@ -190,7 +190,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}gpu_aquaplanet_dyamond_ss_4process.yml
+            --config_file ${GPU_CONFIG_PATH}gpu_aquaplanet_dyamond_ss.yml
             --job_id gpu_aquaplanet_dyamond_ss_4process
         artifact_paths: "gpu_aquaplanet_dyamond_ss_4process/output_active/*"
         env:

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml
@@ -23,3 +23,6 @@ output_default_diagnostics: false
 diagnostics:
   - short_name: ["pfull", "wa", "va", "rv", "ke"]
     period: "12hours"
+prescribe_ozone: true
+aerosol_radiation: true
+prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
diff --git a/...gs/gpu_aquaplanet_dyamond_ss_2process.yml → ...gpu_configs/gpu_aquaplanet_dyamond_ss.yml b/...gs/gpu_aquaplanet_dyamond_ss_2process.yml → ...gpu_configs/gpu_aquaplanet_dyamond_ss.yml
@@ -20,3 +20,6 @@ rayleigh_sponge: true
 dt: "90secs"
 t_end: "1days"
 toml: [toml/longrun_aquaplanet.toml]
+prescribe_ozone: true
+aerosol_radiation: true
+prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml
@@ -20,3 +20,6 @@ rayleigh_sponge: true
 dt: "90secs"
 t_end: "1days"
 toml: [toml/longrun_aquaplanet.toml]
+prescribe_ozone: true
+aerosol_radiation: true
+prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml
@@ -20,3 +20,6 @@ rayleigh_sponge: true
 dt: "90secs"
 t_end: "1days"
 toml: [toml/longrun_aquaplanet.toml]
+prescribe_ozone: true
+aerosol_radiation: true
+prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml
@@ -20,3 +20,6 @@ rayleigh_sponge: true
 dt: "90secs"
 t_end: "1days"
 toml: [toml/longrun_aquaplanet.toml]
+prescribe_ozone: true
+aerosol_radiation: true
+prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]