Skip to content

Commit 1f187b3

Browse files
authored
Merge pull request #1411 from CliMA/js/aquaplanets
some longrun fixes
2 parents 5d319b9 + 21eada3 commit 1f187b3

File tree

6 files changed

+74
-20
lines changed

6 files changed

+74
-20
lines changed

.buildkite/longruns/pipeline.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
SLURM_KILL_BAD_EXIT: 1
1414
CONFIG_PATH: "config/longrun_configs"
1515

16-
timeout_in_minutes: 1440
16+
timeout_in_minutes: 1440 # 24 hours
1717

1818
steps:
1919
- label: "init :computer:"
@@ -55,14 +55,7 @@ steps:
5555
- group: "Coupler integration and conservation tests"
5656

5757
steps:
58-
- label: "ClimaAtmos standalone: aquaplanet, allsky rad, TV insol, 0M"
59-
key: "longrun_aquaplanet_allsky_tvinsol_0M_slabocean" # tests atmosphere driver, can compare to ClimaAtmos.jl longruns
60-
command: "julia --project=experiments/ClimaEarth/ experiments/ClimaEarth/test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $CONFIG_PATH/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml --job_id longrun_aquaplanet_allsky_tvinsol_0M_slabocean"
61-
artifact_paths: "experiments/ClimaEarth/output/longrun_aquaplanet_allsky_tvinsol_0M_slabocean/artifacts/*"
62-
agents:
63-
slurm_mem: 20GB
64-
65-
- label: "Slabplanet aqua: evolving slab ocean"
58+
- label: "Aquaplanet: evolving slab ocean"
6659
key: "slabplanet_aqua_evolve_ocean"
6760
command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_aqua_evolve_ocean.yml --job_id slabplanet_aqua_evolve_ocean"
6861
artifact_paths: "experiments/ClimaEarth/output/slabplanet_aqua_evolve_ocean/artifacts/*"
@@ -83,6 +76,30 @@ steps:
8376
agents:
8477
slurm_mem: 32GB
8578

79+
- label: "GPU Aquaplanet: ED only atmosphere + slab ocean"
80+
key: "aquaplanet_edonly"
81+
command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/aquaplanet_edonly.yml --job_id aquaplanet_edonly"
82+
artifact_paths: "experiments/ClimaEarth/output/aquaplanet_edonly/artifacts/*"
83+
env:
84+
CLIMACOMMS_DEVICE: "CUDA"
85+
CLIMACOMMS_CONTEXT: "SINGLETON"
86+
agents:
87+
queue: clima
88+
slurm_mem: 32GB
89+
slurm_gpus: 1
90+
91+
- label: "GPU Aquaplanet: diag. EDMF atmosphere + slab ocean"
92+
key: "aquaplanet_diagedmf"
93+
command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/aquaplanet_diagedmf.yml --job_id aquaplanet_diagedmf"
94+
artifact_paths: "experiments/ClimaEarth/output/aquaplanet_diagedmf/artifacts/*"
95+
env:
96+
CLIMACOMMS_DEVICE: "CUDA"
97+
CLIMACOMMS_CONTEXT: "SINGLETON"
98+
agents:
99+
queue: clima
100+
slurm_mem: 32GB
101+
slurm_gpus: 1
102+
86103
- group: "AMIP simulations"
87104

88105
steps:

NEWS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ClimaCoupler.jl Release Notes
66

77
### ClimaCoupler features
88

9+
#### Add aquaplanets; longrun fixes PR[#1411](https://github.com/CliMA/ClimaCoupler.jl/pull/1411)
10+
11+
Add 2 aquaplanet longruns using slab ocean and atmosphere with ED only and diag.
12+
EDMF respectively. Also removes the atmos standalone longrun, and increases
13+
the conservation RSE threshold.
14+
915
#### Remove intermediate checkpoints PR[#1397](https://github.com/CliMA/ClimaCoupler.jl/pull/1397)
1016

1117
Throughout the simulation, the previous checkpoint is now deleted whenever a new
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FLOAT_TYPE: "Float32"
2+
aerosol_radiation: true
3+
albedo_model: "CouplerAlbedo"
4+
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
5+
checkpoint_dt: "93days"
6+
coupler_toml: ["toml/amip_target_topo_diagedmf.toml"]
7+
dt: "120secs"
8+
dt_cloud_fraction: "1hours"
9+
dt_cpl: "120secs"
10+
dt_rad: "1hours"
11+
insolation: "timevarying"
12+
mode_name: "slabplanet_aqua"
13+
netcdf_output_at_levels: true
14+
output_default_diagnostics: true
15+
prescribe_ozone: true
16+
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
17+
start_date: "20100101"
18+
surface_setup: "PrescribedSurface"
19+
t_end: "366days"
20+
topo_smoothing: true
21+
topography: "Earth"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FLOAT_TYPE: "Float32"
2+
aerosol_radiation: true
3+
albedo_model: "CouplerAlbedo"
4+
atmos_config_file: "config/longrun_configs/amip_target_edonly.yml"
5+
checkpoint_dt: "93days"
6+
co2_model: "maunaloa"
7+
dt: "120secs"
8+
dt_cloud_fraction: "1hours"
9+
dt_cpl: "120secs"
10+
dt_rad: "1hours"
11+
insolation: "timevarying"
12+
mode_name: "slabplanet_aqua"
13+
netcdf_interpolate_z_over_msl: true
14+
prescribe_ozone: true
15+
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
16+
start_date: "20100101"
17+
surface_setup: "PrescribedSurface"
18+
t_end: "366days"
19+
topo_smoothing: true
20+
topography: "Earth"

config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

experiments/ClimaEarth/user_io/debug_plots.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function plot_global_conservation(
7575
if !softfail
7676
@info typeof(cc)
7777
@info rse[end]
78-
@assert rse[end] < 0.0065
78+
@assert rse[end] < 0.035
7979
end
8080
end
8181

0 commit comments

Comments
 (0)