From b91b005c31d07726304ca24e3184fd271ba4448d Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Mon, 26 Aug 2024 10:15:47 -0700 Subject: [PATCH 1/2] Remove redundant configurations --- .buildkite/gpu_pipeline/pipeline.yml | 6 ++--- .../gpu_aquaplanet_dyamond_ss_1process.yml | 22 ------------------- .../gpu_aquaplanet_dyamond_ss_2process.yml | 22 ------------------- .../gpu_aquaplanet_dyamond_ss_4process.yml | 22 ------------------- 4 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml delete mode 100644 config/gpu_configs/gpu_aquaplanet_dyamond_ss_2process.yml delete mode 100644 config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml diff --git a/.buildkite/gpu_pipeline/pipeline.yml b/.buildkite/gpu_pipeline/pipeline.yml index 40bcdf1860..8d00851b4e 100644 --- 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_ss_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml deleted file mode 100644 index a55c72ce5d..0000000000 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_1process.yml +++ /dev/null @@ -1,22 +0,0 @@ -dt_save_state_to_disk: Inf -dt_save_to_sol: Inf -output_default_diagnostics: false -h_elem: 30 -z_max: 55000.0 -z_elem: 63 -dz_bottom: 30.0 -dz_top: 3000.0 -moist: equil -precip_model: 1M -rad: allskywithclear -insolation: "timevarying" -dt_rad: 1hours -vert_diff: FriersonDiffusion -implicit_diffusion: true -approximate_linear_solve_iters: 2 -dt_cloud_fraction: 1hours -surface_setup: DefaultMoninObukhov -rayleigh_sponge: true -dt: "90secs" -t_end: 1days -toml: [toml/longrun_aquaplanet.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_2process.yml deleted file mode 100644 index a6ccab56be..0000000000 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_2process.yml +++ /dev/null @@ -1,22 +0,0 @@ -dt_save_state_to_disk: "Inf" -dt_save_to_sol: "Inf" -output_default_diagnostics: false -h_elem: 30 -z_max: 55000.0 -z_elem: 63 -dz_bottom: 30.0 -dz_top: 3000.0 -moist: "equil" -precip_model: "1M" -rad: "allskywithclear" -insolation: "timevarying" -dt_rad: "1hours" -dt_cloud_fraction: "1hours" -vert_diff: "FriersonDiffusion" -implicit_diffusion: true -approximate_linear_solve_iters: 2 -surface_setup: "DefaultMoninObukhov" -rayleigh_sponge: true -dt: "90secs" -t_end: "1days" -toml: [toml/longrun_aquaplanet.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml deleted file mode 100644 index a6ccab56be..0000000000 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ss_4process.yml +++ /dev/null @@ -1,22 +0,0 @@ -dt_save_state_to_disk: "Inf" -dt_save_to_sol: "Inf" -output_default_diagnostics: false -h_elem: 30 -z_max: 55000.0 -z_elem: 63 -dz_bottom: 30.0 -dz_top: 3000.0 -moist: "equil" -precip_model: "1M" -rad: "allskywithclear" -insolation: "timevarying" -dt_rad: "1hours" -dt_cloud_fraction: "1hours" -vert_diff: "FriersonDiffusion" -implicit_diffusion: true -approximate_linear_solve_iters: 2 -surface_setup: "DefaultMoninObukhov" -rayleigh_sponge: true -dt: "90secs" -t_end: "1days" -toml: [toml/longrun_aquaplanet.toml] From b75cc7ea5f49ed857c5d58ec352318125ed83d9a Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Mon, 26 Aug 2024 10:16:59 -0700 Subject: [PATCH 2/2] Add some aereosols to benchmark --- .../gpu_aquaplanet_dyamond_diag_1process.yml | 3 +++ .../gpu_configs/gpu_aquaplanet_dyamond_ss.yml | 25 +++++++++++++++++++ .../gpu_aquaplanet_dyamond_ws_1process.yml | 3 +++ .../gpu_aquaplanet_dyamond_ws_2process.yml | 3 +++ .../gpu_aquaplanet_dyamond_ws_4process.yml | 3 +++ 5 files changed, 37 insertions(+) create mode 100644 config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml index b9e6b2560b..0135a1d7b4 100644 --- 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/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml new file mode 100644 index 0000000000..5318a0ad1c --- /dev/null +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml @@ -0,0 +1,25 @@ +dt_save_state_to_disk: "Inf" +dt_save_to_sol: "Inf" +output_default_diagnostics: false +h_elem: 30 +z_max: 55000.0 +z_elem: 63 +dz_bottom: 30.0 +dz_top: 3000.0 +moist: "equil" +precip_model: "1M" +rad: "allskywithclear" +insolation: "timevarying" +dt_rad: "1hours" +dt_cloud_fraction: "1hours" +vert_diff: "FriersonDiffusion" +implicit_diffusion: true +approximate_linear_solve_iters: 2 +surface_setup: "DefaultMoninObukhov" +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_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml index a6ccab56be..5318a0ad1c 100644 --- 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 index 2b995a6fcf..748d4a0870 100644 --- 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 index 428a58c09e..624045f2d9 100644 --- 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"]