Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Isolate config and argument parsing #1086

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+512 −321
Open

Isolate config and argument parsing #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
290f927
add functions for config/arg parsing
juliasloan25 Nov 16, 2024
9710d83
don't modify coupler config in get_atmos_config_dict
juliasloan25 Nov 19, 2024
25c0220
make t_start optional argument
juliasloan25 Nov 19, 2024
f664acc
unify arg_parsing and cli_options
juliasloan25 Nov 19, 2024
f8ce4b9
use nothing for restart_dir default
juliasloan25 Nov 19, 2024
415cd77
use time format convention for dt_cpl
juliasloan25 Nov 19, 2024
a6c5f71
rename diagnostics -> extra_atmos_diagnostics
juliasloan25 Nov 19, 2024
570dbbf
rename CI plots -> diagnostics plots
juliasloan25 Nov 25, 2024
90d1c2a
add config_file, job_id defaults
juliasloan25 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/amip_configs/amip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo"
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
coupler_toml_file: "toml/amip.toml"
dt: "120secs"
dt_cpl: 120
dt_cpl: "120secs"
dt_save_state_to_disk: "30days"
dt_save_to_sol: "30days"
dz_bottom: 30.0
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/amip_diagedmf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FLOAT_TYPE: "Float32"
atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf.yml"
atmos_config_repo: "ClimaCoupler"
dt: "120secs"
dt_cpl: 120
dt_cpl: "120secs"
dt_save_state_to_disk: "Inf"
dt_save_to_sol: "Inf"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/amip_diagedmf_io.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FLOAT_TYPE: "Float32"
atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf_io.yml"
atmos_config_repo: "ClimaCoupler"
dt: "120secs"
dt_cpl: 120
dt_cpl: "120secs"
dt_save_state_to_disk: "12hours"
dt_save_to_sol: "12hours"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/benchmark_configs/climaatmos_diagedmf_io.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ output_default_diagnostics: false
prescribe_ozone: true
aerosol_radiation: true
prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
diagnostics:
extra_atmos_diagnostics:
- short_name: [pfull, rsut, rlut, pr, hus, rv]
period: 10hours
2 changes: 1 addition & 1 deletion config/ci_configs/amip_albedo_function.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "150secs"
dt_cpl: 150
dt_cpl: "150secs"
dt_rad: "1hours"
dt_save_to_sol: "1days"
dz_bottom: 30
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/amip_albedo_temporal_map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "150secs"
dt_cpl: 150
dt_cpl: "150secs"
dt_rad: "1hours"
dt_save_to_sol: "1days"
dz_bottom: 30
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/amip_albedo_temporal_map_1M.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "150secs"
dt_cpl: 150
dt_cpl: "150secs"
dt_rad: "1hours"
dt_save_to_sol: "1days"
dz_bottom: 30
Expand Down
2 changes: 0 additions & 2 deletions config/ci_configs/amip_coarse_ft32.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FLOAT_TYPE: "Float32"
apply_limiter: false
dt: "400secs"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed because 400secs is the default for dt and dt_cpl

dt_cpl: 400
dt_save_to_sol: "100days"
energy_check: false
h_elem: 6
Expand Down
2 changes: 0 additions & 2 deletions config/ci_configs/amip_coarse_ft64_hourly_checkpoints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply_limiter: false
dt: "400secs"
dt_cpl: 400
dt_save_to_sol: "1days"
energy_check: false
h_elem: 6
Expand Down
2 changes: 0 additions & 2 deletions config/ci_configs/amip_coarse_ft64_hourly_checkpoints_restart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply_limiter: false
dt: "400secs"
dt_cpl: 400
dt_save_restart: "10days"
dt_save_to_sol: "1days"
energy_check: false
Expand Down
2 changes: 0 additions & 2 deletions config/ci_configs/amip_coarse_mpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply_limiter: false
dt: "400secs"
dt_cpl: 400
dt_save_to_sol: "1days"
energy_check: false
h_elem: 6
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/amip_component_dts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dt_atmos: "150secs"
dt_land: "50secs"
dt_ocean: "30secs"
dt_seaice: "75secs"
dt_cpl: 150
dt_cpl: "150secs"
dt_rad: "1hours"
dt_save_to_sol: "1days"
dz_bottom: 30
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/amip_default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "150secs"
dt_cpl: 150
dt_cpl: "150secs"
dt_rad: "1hours"
dt_save_to_sol: "1days"
dz_bottom: 30
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/amip_n1_shortrun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "150secs"
dt_cpl: 150
dt_cpl: "150secs"
dt_rad: "1hours"
dt_save_to_sol: "1days"
dz_bottom: 30
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/amip_target_topo_diagedmf_shortrun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply_limiter: false
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
dt: "100secs"
dt_cloud_fraction: "1hours"
dt_cpl: 100
dt_cpl: "100secs"
dt_rad: "1hours"
dt_save_state_to_disk: "1days"
dt_save_to_sol: "1days"
Expand Down
19 changes: 0 additions & 19 deletions config/ci_configs/interactive_debug.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_albedo_function.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "3600secs"
energy_check: true
h_elem: 4
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_albedo_temporal_map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "3600secs"
energy_check: true
h_elem: 4
Expand Down
6 changes: 3 additions & 3 deletions config/ci_configs/slabplanet_atmos_diags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply_limiter: false
ci_plots: true
plot_diagnostics: true
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 4
Expand All @@ -12,7 +12,7 @@ precip_model: "0M"
rad: "gray"
t_end: "10days"
vert_diff: "true"
diagnostics:
extra_atmos_diagnostics:
- short_name: [mse, lr, edt, evu, ts, mass_strf, stab, vt, egr, toa_fluxes_net]
reduction_time: average
period: 1days
4 changes: 2 additions & 2 deletions config/ci_configs/slabplanet_default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 4
Expand All @@ -12,6 +12,6 @@ rad: "gray"
t_end: "10days"
vert_diff: "true"
output_default_diagnostics: false
diagnostics:
extra_atmos_diagnostics:
- short_name: [mse, lr, edt, evu, hfes, evspsbl, ts]
period: 1days
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_dry_norad.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply_limiter: false
conservation_softfail: true
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 4
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_eisenman.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply_limiter: false
conservation_softfail: true
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 6
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_ft32.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FLOAT_TYPE: "Float32"
apply_limiter: false
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 4
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_nonmono.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 4
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_partitioned_fluxes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply_limiter: false
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "9days"
energy_check: true
h_elem: 4
Expand Down
2 changes: 1 addition & 1 deletion config/ci_configs/slabplanet_realinsol_rayleigh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply_limiter: false
conservation_softfail: true
dt: "200secs"
dt_cpl: 3600
dt_cpl: "3600secs"
dt_rad: "6hours"
dt_save_to_sol: "3600secs"
energy_check: true
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FLOAT_TYPE: "Float32"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target_topo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target_topo_diagedmf_cpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/amip_target_topo_diagedmf_gpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo"
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_amip_dyamond.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_dyamond.yml"
dt: "30secs"
dt_cpl: 30
dt_cpl: "30secs"
dt_save_state_to_disk: "0.5days"
dt_save_to_sol: "0.5days"
energy_check: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
conservation_softfail: true
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "10days"
energy_check: true
evolving_ocean: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
conservation_softfail: true
dt: "200secs"
dt_cpl: 1728000
dt_cpl: "1728000secs"
dt_save_to_sol: "10days"
energy_check: true
evolving_ocean: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_coupler_sf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
conservation_softfail: true
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "10days"
energy_check: true
evolving_ocean: false
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "10days"
energy_check: true
evolving_ocean: true
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_aqua_target_nocouple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 10368000
dt_cpl: "10368000secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "10days"
energy_check: true
evolving_ocean: true
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_target_evolve_ocn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atmos_config_file: "config/longrun_configs/longrun_aquaplanet_allsky_0M.yml"
dt: "120secs"
dt_cloud_fraction: "1hours"
dt_cpl: 120
dt_cpl: "120secs"
dt_rad: "1hours"
dt_save_state_to_disk: "20days"
dt_save_to_sol: "10days"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/slabplanet_terra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
conservation_softfail: true
dt: "200secs"
dt_cpl: 200
dt_cpl: "200secs"
dt_save_to_sol: "10days"
energy_check: true
h_elem: 4
Expand Down
2 changes: 1 addition & 1 deletion config/nightly_configs/amip_coarse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo"
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
coupler_toml_file: "toml/amip.toml"
dt: "240secs"
dt_cpl: 240
dt_cpl: "240secs"
dt_save_state_to_disk: "30days"
dt_save_to_sol: "30days"
dz_bottom: 100.0
Expand Down
2 changes: 1 addition & 1 deletion config/nightly_configs/amip_coarse_random.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo"
atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml"
coupler_toml_file: "toml/amip.toml"
dt: "240secs"
dt_cpl: 240
dt_cpl: "240secs"
dt_save_state_to_disk: "30days"
dt_save_to_sol: "30days"
dz_bottom: 100.0
Expand Down
Loading