From 6cc3cf9004ef63f9fd9061c4f1b2fa280b63de60 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Tue, 19 Nov 2024 14:31:09 -0800 Subject: [PATCH] use time format convention for dt_cpl --- config/amip_configs/amip.yml | 2 +- config/benchmark_configs/amip_diagedmf.yml | 2 +- config/benchmark_configs/amip_diagedmf_io.yml | 2 +- config/ci_configs/amip_albedo_function.yml | 2 +- config/ci_configs/amip_albedo_temporal_map.yml | 2 +- config/ci_configs/amip_albedo_temporal_map_1M.yml | 2 +- config/ci_configs/amip_coarse_ft32.yml | 2 -- config/ci_configs/amip_coarse_ft64_hourly_checkpoints.yml | 2 -- .../amip_coarse_ft64_hourly_checkpoints_restart.yml | 2 -- config/ci_configs/amip_coarse_mpi.yml | 2 -- config/ci_configs/amip_component_dts.yml | 2 +- config/ci_configs/amip_default.yml | 2 +- config/ci_configs/amip_n1_shortrun.yml | 2 +- config/ci_configs/amip_target_topo_diagedmf_shortrun.yml | 2 +- config/ci_configs/interactive_debug.yml | 2 +- config/ci_configs/slabplanet_albedo_function.yml | 2 +- config/ci_configs/slabplanet_albedo_temporal_map.yml | 2 +- config/ci_configs/slabplanet_atmos_diags.yml | 2 +- config/ci_configs/slabplanet_default.yml | 2 +- config/ci_configs/slabplanet_dry_norad.yml | 2 +- config/ci_configs/slabplanet_eisenman.yml | 2 +- config/ci_configs/slabplanet_ft32.yml | 2 +- config/ci_configs/slabplanet_nonmono.yml | 2 +- config/ci_configs/slabplanet_partitioned_fluxes.yml | 2 +- config/ci_configs/slabplanet_realinsol_rayleigh.yml | 2 +- config/longrun_configs/amip_target.yml | 2 +- config/longrun_configs/amip_target_topo.yml | 2 +- config/longrun_configs/amip_target_topo_diagedmf_cpu.yml | 2 +- config/longrun_configs/amip_target_topo_diagedmf_gpu.yml | 2 +- config/longrun_configs/longrun_amip_dyamond.yml | 2 +- config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml | 2 +- config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml | 2 +- config/longrun_configs/slabplanet_aqua_coupler_sf.yml | 2 +- .../longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml | 2 +- config/longrun_configs/slabplanet_aqua_target.yml | 2 +- config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml | 2 +- config/longrun_configs/slabplanet_aqua_target_nocouple.yml | 2 +- config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml | 2 +- config/longrun_configs/slabplanet_target.yml | 2 +- config/longrun_configs/slabplanet_target_evolve_ocn.yml | 2 +- config/longrun_configs/slabplanet_terra.yml | 2 +- config/nightly_configs/amip_coarse.yml | 2 +- config/nightly_configs/amip_coarse_random.yml | 2 +- experiments/ClimaEarth/cli_options.jl | 4 ++-- experiments/ClimaEarth/test/amip_test.yml | 2 +- experiments/ClimaEarth/user_io/arg_parsing.jl | 4 ++-- 46 files changed, 44 insertions(+), 52 deletions(-) diff --git a/config/amip_configs/amip.yml b/config/amip_configs/amip.yml index 3bfbf92d7e..2648ea5d43 100644 --- a/config/amip_configs/amip.yml +++ b/config/amip_configs/amip.yml @@ -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 diff --git a/config/benchmark_configs/amip_diagedmf.yml b/config/benchmark_configs/amip_diagedmf.yml index e9aff1243d..13535b9b22 100644 --- a/config/benchmark_configs/amip_diagedmf.yml +++ b/config/benchmark_configs/amip_diagedmf.yml @@ -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 diff --git a/config/benchmark_configs/amip_diagedmf_io.yml b/config/benchmark_configs/amip_diagedmf_io.yml index b776fdaa8a..61040582d0 100644 --- a/config/benchmark_configs/amip_diagedmf_io.yml +++ b/config/benchmark_configs/amip_diagedmf_io.yml @@ -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 diff --git a/config/ci_configs/amip_albedo_function.yml b/config/ci_configs/amip_albedo_function.yml index 8fb7219f7e..bf32083c70 100644 --- a/config/ci_configs/amip_albedo_function.yml +++ b/config/ci_configs/amip_albedo_function.yml @@ -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 diff --git a/config/ci_configs/amip_albedo_temporal_map.yml b/config/ci_configs/amip_albedo_temporal_map.yml index 928acb1933..f481bc7763 100644 --- a/config/ci_configs/amip_albedo_temporal_map.yml +++ b/config/ci_configs/amip_albedo_temporal_map.yml @@ -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 diff --git a/config/ci_configs/amip_albedo_temporal_map_1M.yml b/config/ci_configs/amip_albedo_temporal_map_1M.yml index 5353a753b9..fc424f4287 100644 --- a/config/ci_configs/amip_albedo_temporal_map_1M.yml +++ b/config/ci_configs/amip_albedo_temporal_map_1M.yml @@ -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 diff --git a/config/ci_configs/amip_coarse_ft32.yml b/config/ci_configs/amip_coarse_ft32.yml index b7fa9d1120..283fdd80ea 100644 --- a/config/ci_configs/amip_coarse_ft32.yml +++ b/config/ci_configs/amip_coarse_ft32.yml @@ -1,7 +1,5 @@ FLOAT_TYPE: "Float32" apply_limiter: false -dt: "400secs" -dt_cpl: 400 dt_save_to_sol: "100days" energy_check: false h_elem: 6 diff --git a/config/ci_configs/amip_coarse_ft64_hourly_checkpoints.yml b/config/ci_configs/amip_coarse_ft64_hourly_checkpoints.yml index 26e1ab41ee..e1f5cd8c6a 100644 --- a/config/ci_configs/amip_coarse_ft64_hourly_checkpoints.yml +++ b/config/ci_configs/amip_coarse_ft64_hourly_checkpoints.yml @@ -1,6 +1,4 @@ apply_limiter: false -dt: "400secs" -dt_cpl: 400 dt_save_to_sol: "1days" energy_check: false h_elem: 6 diff --git a/config/ci_configs/amip_coarse_ft64_hourly_checkpoints_restart.yml b/config/ci_configs/amip_coarse_ft64_hourly_checkpoints_restart.yml index 0fc0a6b844..03367c0b21 100644 --- a/config/ci_configs/amip_coarse_ft64_hourly_checkpoints_restart.yml +++ b/config/ci_configs/amip_coarse_ft64_hourly_checkpoints_restart.yml @@ -1,6 +1,4 @@ apply_limiter: false -dt: "400secs" -dt_cpl: 400 dt_save_restart: "10days" dt_save_to_sol: "1days" energy_check: false diff --git a/config/ci_configs/amip_coarse_mpi.yml b/config/ci_configs/amip_coarse_mpi.yml index c5fea07a2e..5894fc1fe4 100644 --- a/config/ci_configs/amip_coarse_mpi.yml +++ b/config/ci_configs/amip_coarse_mpi.yml @@ -1,6 +1,4 @@ apply_limiter: false -dt: "400secs" -dt_cpl: 400 dt_save_to_sol: "1days" energy_check: false h_elem: 6 diff --git a/config/ci_configs/amip_component_dts.yml b/config/ci_configs/amip_component_dts.yml index 01725c31bd..ea0c3d5052 100644 --- a/config/ci_configs/amip_component_dts.yml +++ b/config/ci_configs/amip_component_dts.yml @@ -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 diff --git a/config/ci_configs/amip_default.yml b/config/ci_configs/amip_default.yml index f88629ea37..9369e9e02a 100644 --- a/config/ci_configs/amip_default.yml +++ b/config/ci_configs/amip_default.yml @@ -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 diff --git a/config/ci_configs/amip_n1_shortrun.yml b/config/ci_configs/amip_n1_shortrun.yml index 6595005e04..dc09486662 100644 --- a/config/ci_configs/amip_n1_shortrun.yml +++ b/config/ci_configs/amip_n1_shortrun.yml @@ -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 diff --git a/config/ci_configs/amip_target_topo_diagedmf_shortrun.yml b/config/ci_configs/amip_target_topo_diagedmf_shortrun.yml index d01d2025c0..e73477831f 100644 --- a/config/ci_configs/amip_target_topo_diagedmf_shortrun.yml +++ b/config/ci_configs/amip_target_topo_diagedmf_shortrun.yml @@ -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" diff --git a/config/ci_configs/interactive_debug.yml b/config/ci_configs/interactive_debug.yml index 70abc041f9..460823a040 100644 --- a/config/ci_configs/interactive_debug.yml +++ b/config/ci_configs/interactive_debug.yml @@ -1,7 +1,7 @@ apply_limiter: false coupler_output_dir: "experiments/ClimaEarth/output" dt: "200secs" -dt_cpl: 200 +dt_cpl: "200secs" dt_save_to_sol: "10days" energy_check: true evolving_ocean: true diff --git a/config/ci_configs/slabplanet_albedo_function.yml b/config/ci_configs/slabplanet_albedo_function.yml index 7b499e1002..8a4c096653 100644 --- a/config/ci_configs/slabplanet_albedo_function.yml +++ b/config/ci_configs/slabplanet_albedo_function.yml @@ -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 diff --git a/config/ci_configs/slabplanet_albedo_temporal_map.yml b/config/ci_configs/slabplanet_albedo_temporal_map.yml index 96ea2d5c43..f7fe507e86 100644 --- a/config/ci_configs/slabplanet_albedo_temporal_map.yml +++ b/config/ci_configs/slabplanet_albedo_temporal_map.yml @@ -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 diff --git a/config/ci_configs/slabplanet_atmos_diags.yml b/config/ci_configs/slabplanet_atmos_diags.yml index 2a6e83e3b9..d8a6d4e00b 100644 --- a/config/ci_configs/slabplanet_atmos_diags.yml +++ b/config/ci_configs/slabplanet_atmos_diags.yml @@ -1,7 +1,7 @@ apply_limiter: false ci_plots: true dt: "200secs" -dt_cpl: 200 +dt_cpl: "200secs" dt_save_to_sol: "9days" energy_check: true h_elem: 4 diff --git a/config/ci_configs/slabplanet_default.yml b/config/ci_configs/slabplanet_default.yml index 19aea4a20f..c0a0977c82 100644 --- a/config/ci_configs/slabplanet_default.yml +++ b/config/ci_configs/slabplanet_default.yml @@ -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 diff --git a/config/ci_configs/slabplanet_dry_norad.yml b/config/ci_configs/slabplanet_dry_norad.yml index 63ab9b298a..7658748e2f 100644 --- a/config/ci_configs/slabplanet_dry_norad.yml +++ b/config/ci_configs/slabplanet_dry_norad.yml @@ -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 diff --git a/config/ci_configs/slabplanet_eisenman.yml b/config/ci_configs/slabplanet_eisenman.yml index 049a455d20..c277beed05 100644 --- a/config/ci_configs/slabplanet_eisenman.yml +++ b/config/ci_configs/slabplanet_eisenman.yml @@ -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 diff --git a/config/ci_configs/slabplanet_ft32.yml b/config/ci_configs/slabplanet_ft32.yml index 264c95c506..810c70fde7 100644 --- a/config/ci_configs/slabplanet_ft32.yml +++ b/config/ci_configs/slabplanet_ft32.yml @@ -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 diff --git a/config/ci_configs/slabplanet_nonmono.yml b/config/ci_configs/slabplanet_nonmono.yml index 8cbb9b2a5b..56f522126f 100644 --- a/config/ci_configs/slabplanet_nonmono.yml +++ b/config/ci_configs/slabplanet_nonmono.yml @@ -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 diff --git a/config/ci_configs/slabplanet_partitioned_fluxes.yml b/config/ci_configs/slabplanet_partitioned_fluxes.yml index 4978872107..c6e8b9cd06 100644 --- a/config/ci_configs/slabplanet_partitioned_fluxes.yml +++ b/config/ci_configs/slabplanet_partitioned_fluxes.yml @@ -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 diff --git a/config/ci_configs/slabplanet_realinsol_rayleigh.yml b/config/ci_configs/slabplanet_realinsol_rayleigh.yml index 836dca4296..72eb630c54 100644 --- a/config/ci_configs/slabplanet_realinsol_rayleigh.yml +++ b/config/ci_configs/slabplanet_realinsol_rayleigh.yml @@ -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 diff --git a/config/longrun_configs/amip_target.yml b/config/longrun_configs/amip_target.yml index 898a0e44e8..2c22691535 100644 --- a/config/longrun_configs/amip_target.yml +++ b/config/longrun_configs/amip_target.yml @@ -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 diff --git a/config/longrun_configs/amip_target_topo.yml b/config/longrun_configs/amip_target_topo.yml index 5e01bc6632..1081e82788 100644 --- a/config/longrun_configs/amip_target_topo.yml +++ b/config/longrun_configs/amip_target_topo.yml @@ -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 diff --git a/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml b/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml index f8c827515a..bca89d6cfa 100644 --- a/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml +++ b/config/longrun_configs/amip_target_topo_diagedmf_cpu.yml @@ -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 diff --git a/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml b/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml index cdf0b8f8c8..439fe0ebbc 100644 --- a/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml +++ b/config/longrun_configs/amip_target_topo_diagedmf_gpu.yml @@ -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 diff --git a/config/longrun_configs/longrun_amip_dyamond.yml b/config/longrun_configs/longrun_amip_dyamond.yml index b23c0f2216..68cd8e940e 100644 --- a/config/longrun_configs/longrun_amip_dyamond.yml +++ b/config/longrun_configs/longrun_amip_dyamond.yml @@ -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 diff --git a/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml b/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml index 31d0f5d9cb..7493bbd6db 100644 --- a/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml +++ b/config/longrun_configs/slabplanet_aqua_atmos_sf_couple.yml @@ -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 diff --git a/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml b/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml index 4bec7a7b2a..764274d669 100644 --- a/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml +++ b/config/longrun_configs/slabplanet_aqua_atmos_sf_nocouple.yml @@ -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 diff --git a/config/longrun_configs/slabplanet_aqua_coupler_sf.yml b/config/longrun_configs/slabplanet_aqua_coupler_sf.yml index 2ce52bb35f..ae5bcf64cf 100644 --- a/config/longrun_configs/slabplanet_aqua_coupler_sf.yml +++ b/config/longrun_configs/slabplanet_aqua_coupler_sf.yml @@ -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 diff --git a/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml b/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml index a94fd257ba..4aca82c82f 100644 --- a/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml +++ b/config/longrun_configs/slabplanet_aqua_coupler_sf_evolve_ocn.yml @@ -1,5 +1,5 @@ dt: "200secs" -dt_cpl: 200 +dt_cpl: "200secs" dt_save_to_sol: "10days" energy_check: true evolving_ocean: true diff --git a/config/longrun_configs/slabplanet_aqua_target.yml b/config/longrun_configs/slabplanet_aqua_target.yml index 3598204e93..59eb173088 100644 --- a/config/longrun_configs/slabplanet_aqua_target.yml +++ b/config/longrun_configs/slabplanet_aqua_target.yml @@ -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" diff --git a/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml b/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml index 2e7394dfb0..62a9bbcee4 100644 --- a/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml +++ b/config/longrun_configs/slabplanet_aqua_target_evolve_ocn.yml @@ -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" diff --git a/config/longrun_configs/slabplanet_aqua_target_nocouple.yml b/config/longrun_configs/slabplanet_aqua_target_nocouple.yml index 46e658604f..4caa587aca 100644 --- a/config/longrun_configs/slabplanet_aqua_target_nocouple.yml +++ b/config/longrun_configs/slabplanet_aqua_target_nocouple.yml @@ -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" diff --git a/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml b/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml index 501b5071a9..a8aafa2cec 100644 --- a/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml +++ b/config/longrun_configs/slabplanet_coupler_sf_evolve_ocn.yml @@ -1,5 +1,5 @@ dt: "200secs" -dt_cpl: 200 +dt_cpl: "200secs" dt_save_to_sol: "10days" energy_check: true evolving_ocean: true diff --git a/config/longrun_configs/slabplanet_target.yml b/config/longrun_configs/slabplanet_target.yml index fb428e0fed..dee938f45d 100644 --- a/config/longrun_configs/slabplanet_target.yml +++ b/config/longrun_configs/slabplanet_target.yml @@ -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" diff --git a/config/longrun_configs/slabplanet_target_evolve_ocn.yml b/config/longrun_configs/slabplanet_target_evolve_ocn.yml index bcf8f4cf3e..bdb88b729e 100644 --- a/config/longrun_configs/slabplanet_target_evolve_ocn.yml +++ b/config/longrun_configs/slabplanet_target_evolve_ocn.yml @@ -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" diff --git a/config/longrun_configs/slabplanet_terra.yml b/config/longrun_configs/slabplanet_terra.yml index 49036dd264..9db3573a9b 100644 --- a/config/longrun_configs/slabplanet_terra.yml +++ b/config/longrun_configs/slabplanet_terra.yml @@ -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 diff --git a/config/nightly_configs/amip_coarse.yml b/config/nightly_configs/amip_coarse.yml index 8dd3910a0c..e15d9e24ae 100644 --- a/config/nightly_configs/amip_coarse.yml +++ b/config/nightly_configs/amip_coarse.yml @@ -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 diff --git a/config/nightly_configs/amip_coarse_random.yml b/config/nightly_configs/amip_coarse_random.yml index 5259572ea3..2a7f772d27 100644 --- a/config/nightly_configs/amip_coarse_random.yml +++ b/config/nightly_configs/amip_coarse_random.yml @@ -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 diff --git a/experiments/ClimaEarth/cli_options.jl b/experiments/ClimaEarth/cli_options.jl index 25ca619e9a..34086cc3f4 100644 --- a/experiments/ClimaEarth/cli_options.jl +++ b/experiments/ClimaEarth/cli_options.jl @@ -48,9 +48,9 @@ function argparse_settings() arg_type = String default = "20000101" "--dt_cpl" - help = "Coupling time step in seconds [400 (default)]" + help = "Coupling time step in seconds [400 (default); allowed formats: \"Nsecs\", \"Nmins\", \"Nhours\", \"Ndays\", \"Inf\"]" arg_type = Int - default = 400 + default = "400secs" "--dt" help = "Component model time step [allowed formats: \"Nsecs\", \"Nmins\", \"Nhours\", \"Ndays\", \"Inf\"]" arg_type = String diff --git a/experiments/ClimaEarth/test/amip_test.yml b/experiments/ClimaEarth/test/amip_test.yml index 101a17368d..71dbbc265e 100644 --- a/experiments/ClimaEarth/test/amip_test.yml +++ b/experiments/ClimaEarth/test/amip_test.yml @@ -3,7 +3,7 @@ albedo_model: "CouplerAlbedo" atmos_config_file: "config/longrun_configs/amip_target_diagedmf.yml" coupler_toml_file: "toml/amip.toml" dt: "180secs" -dt_cpl: 180 +dt_cpl: "180secs" dt_save_state_to_disk: "30days" dt_save_to_sol: "30days" dz_bottom: 100.0 diff --git a/experiments/ClimaEarth/user_io/arg_parsing.jl b/experiments/ClimaEarth/user_io/arg_parsing.jl index c5f7adc42f..12702a5578 100644 --- a/experiments/ClimaEarth/user_io/arg_parsing.jl +++ b/experiments/ClimaEarth/user_io/arg_parsing.jl @@ -57,7 +57,7 @@ function get_coupler_args(config_dict::Dict) t_end = Float64(Utilities.time_to_seconds(config_dict["t_end"])) t_start = Float64(Utilities.time_to_seconds(config_dict["t_start"])) date0 = date = Dates.DateTime(config_dict["start_date"], Dates.dateformat"yyyymmdd") - Δt_cpl = Float64(config_dict["dt_cpl"]) + Δt_cpl = Float64(Utilities.time_to_seconds(config_dict["dt_cpl"])) component_dt_dict = parse_component_dts(config_dict) saveat = Float64(Utilities.time_to_seconds(config_dict["dt_save_to_sol"])) @@ -215,7 +215,7 @@ Otherwise, use the generic component timestep `dt` specified in the config file. """ function parse_component_dts(config_dict) # Retrieve coupling timestep - Δt_cpl = Float64(config_dict["dt_cpl"]) + Δt_cpl = Float64(Utilities.time_to_seconds(config_dict["dt_cpl"])) # Specify component model names component_dt_names = ["dt_atmos", "dt_land", "dt_ocean", "dt_seaice"]