From 356f20b381cea2fbfaa4c29781c05b464445684f Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Tue, 2 Jan 2024 10:44:37 -0800 Subject: [PATCH] Remove save_restart, rename save_to_disk Without the diagnostics, save_to_disk and save_restart become identical. This commit removes save_restart and renames save_to_disk to a more descriptive and clear save_state_to_disk. This state is used for restarts or to inspect the content of the state --- config/default_configs/default_config.yml | 4 ++-- ...tral_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml | 2 +- config/gpu_configs/gpu_aquaplanet_dyamond.yml | 2 +- config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml | 2 +- .../gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml | 2 +- ...hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml | 2 +- config/longrun_configs/longrun_aquaplanet_amip.yml | 2 +- config/longrun_configs/longrun_aquaplanet_dyamond.yml | 2 +- ...longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml | 2 +- ...uaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml | 2 +- ...e_equilmoist_0M_clearsky_tvinsolation_slabocean.yml | 2 +- ...et_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml | 2 +- ...e_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml | 2 +- ...moist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml | 2 +- .../longrun_configs/longrun_bw_rhoe_equil_highres.yml | 2 +- .../longrun_bw_rhoe_equil_highres_topography_earth.yml | 2 +- config/longrun_configs/longrun_bw_rhoe_highres.yml | 2 +- .../longrun_hs_rhoe_dry_nz63_55km_rs35km.yml | 2 +- .../longrun_hs_rhoe_equil_highres_topography_earth.yml | 2 +- .../longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml | 2 +- .../longrun_sphere_hydrostatic_balance_rhoe.yml | 2 +- .../longrun_ssp_bw_rhoe_equil_highres.yml | 2 +- ...run_zalesak_tracer_energy_bw_rhoe_equil_highres.yml | 2 +- config/model_configs/box_density_current_test.yml | 2 +- config/model_configs/diagnostic_edmfx_aquaplanet.yml | 2 +- config/model_configs/diagnostic_edmfx_bomex_box.yml | 2 +- .../diagnostic_edmfx_bomex_stretched_box.yml | 2 +- .../model_configs/diagnostic_edmfx_dycoms_rf01_box.yml | 2 +- .../diagnostic_edmfx_dycoms_rf01_explicit_box.yml | 2 +- config/model_configs/diagnostic_edmfx_gabls_box.yml | 2 +- config/model_configs/diagnostic_edmfx_rico_box.yml | 2 +- config/model_configs/diagnostic_edmfx_test_box.yml | 2 +- config/model_configs/diagnostic_edmfx_trmm_box.yml | 2 +- .../diagnostic_edmfx_trmm_stretched_box.yml | 2 +- .../plane_agnesi_mountain_test_stretched.yml | 2 +- .../plane_agnesi_mountain_test_uniform.yml | 2 +- config/model_configs/plane_density_current_test.yml | 2 +- .../plane_schar_mountain_test_stretched.yml | 2 +- .../plane_schar_mountain_test_uniform.yml | 2 +- config/model_configs/prognostic_edmfx_adv_test_box.yml | 2 +- config/model_configs/prognostic_edmfx_aquaplanet.yml | 2 +- config/model_configs/prognostic_edmfx_bomex_box.yml | 2 +- .../prognostic_edmfx_bomex_fixtke_box.yml | 2 +- .../prognostic_edmfx_bomex_stretched_box.yml | 2 +- .../model_configs/prognostic_edmfx_bomex_tke_box.yml | 2 +- .../model_configs/prognostic_edmfx_dycoms_rf01_box.yml | 2 +- config/model_configs/prognostic_edmfx_gabls_box.yml | 2 +- config/model_configs/prognostic_edmfx_rico_column.yml | 2 +- config/model_configs/prognostic_edmfx_trmm_column.yml | 2 +- .../single_column_hydrostatic_balance_ft64.yml | 2 +- .../single_column_nonorographic_gravity_wave.yml | 2 +- .../model_configs/single_column_precipitation_test.yml | 2 +- ...n_radiative_equilibrium_allsky_idealized_clouds.yml | 2 +- .../single_column_radiative_equilibrium_clearsky.yml | 2 +- ...ve_equilibrium_clearsky_prognostic_surface_temp.yml | 2 +- .../single_column_radiative_equilibrium_gray.yml | 2 +- ...rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml | 2 +- ...sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml | 2 +- config/model_configs/sphere_baroclinic_wave_rhoe.yml | 2 +- .../sphere_baroclinic_wave_rhoe_equilmoist.yml | 2 +- ...roclinic_wave_rhoe_equilmoist_conservation_ft64.yml | 2 +- ...sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml | 2 +- ...sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml | 2 +- ...sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml | 2 +- ...here_held_suarez_rhoe_equilmoist_hightop_sponge.yml | 2 +- ...re_held_suarez_rhoe_equilmoist_topography_dcmip.yml | 2 +- .../model_configs/sphere_held_suarez_rhoe_hightop.yml | 2 +- .../sphere_held_suarez_rhoe_topography_dcmip.yml | 2 +- .../sphere_hydrostatic_balance_rhoe_ft64.yml | 2 +- ...re_ssp_baroclinic_wave_rhoe_equilmoist_dcmip200.yml | 2 +- ...phere_ssp_baroclinic_wave_rhoe_equilmoist_earth.yml | 2 +- ...acer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml | 2 +- config/model_configs/test_io.yml | 2 +- config/model_configs/test_mpi_io.yml | 2 +- config/mpi_configs/mpi_make_restart.yml | 2 +- config/mpi_configs/prep_remap.yml | 2 +- config/perf_configs/flame_perf_target_callbacks.yml | 2 +- .../flame_perf_target_diagnostic_edmfx.yml | 2 +- config/perf_configs/flame_perf_target_edmf.yml | 2 +- .../flame_perf_target_prognostic_edmfx_aquaplanet.yml | 2 +- ...sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml | 2 +- config/perf_configs/gpu_baroclinic_wave_rhoe.yml | 2 +- config/perf_configs/gpu_held_suarez_rhoe_hightop.yml | 2 +- .../perf_configs/gpu_implicit_barowave_wrt_h_elem.yml | 2 +- docs/src/config.md | 2 +- docs/src/radiative_equilibrium.md | 2 +- src/callbacks/callbacks.jl | 5 +---- src/solver/solve.jl | 5 ++--- src/solver/type_getters.jl | 10 ++++++---- test/parameter_tests.jl | 4 ++-- test/parameter_tests.toml | 4 ++-- 91 files changed, 100 insertions(+), 102 deletions(-) diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml index 450ea7a9bef..f610a847a0f 100644 --- a/config/default_configs/default_config.yml +++ b/config/default_configs/default_config.yml @@ -144,8 +144,8 @@ forcing: test_dycore_consistency: help: "Test dycore consistency [`false` (default), `true`]" value: false -dt_save_to_disk: - help: "Time between saving to disk. Examples: [`10secs`, `1hours`, `Inf` (do not save)]" +dt_save_state_to_disk: + help: "Time between saving the state to disk. Examples: [`10secs`, `1hours`, `Inf` (do not save)]" value: "Inf" dt_save_to_sol: help: "Time between saving solution. Examples: [`10days`, `1hours`, `Inf` (do not save)]" diff --git a/config/gpu_configs/central_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml b/config/gpu_configs/central_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml index 9c2a780f767..9c6da95599f 100644 --- a/config/gpu_configs/central_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml +++ b/config/gpu_configs/central_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "1days" +dt_save_state_to_disk: "1days" dt: "150secs" t_end: "2days" h_elem: 16 diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond.yml b/config/gpu_configs/gpu_aquaplanet_dyamond.yml index 4045854f0e0..f1ef5c3a9b6 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond.yml @@ -13,7 +13,7 @@ dt_rad: "1hours" vert_diff: "true" surface_setup: "DefaultMoninObukhov" rayleigh_sponge: true -dt_save_to_disk: "3hours" +dt_save_state_to_disk: "3hours" dt: "50secs" t_end: "1days" FLOAT_TYPE: "Float32" diff --git a/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml b/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml index b10022747e2..c7823dab4d0 100644 --- a/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml +++ b/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml @@ -13,5 +13,5 @@ moist: equil precip_model: 0M dt: 10secs t_end: 1hours -dt_save_to_disk: 600secs +dt_save_state_to_disk: 600secs toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml b/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml index 4efac62cd9b..ac744b1cfea 100644 --- a/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml +++ b/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "100secs" t_end: "1days" h_elem: 30 diff --git a/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml b/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml index 4efac62cd9b..ac744b1cfea 100644 --- a/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml +++ b/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "100secs" t_end: "1days" h_elem: 30 diff --git a/config/longrun_configs/longrun_aquaplanet_amip.yml b/config/longrun_configs/longrun_aquaplanet_amip.yml index 44ac659a4ab..33a27e9cbb6 100644 --- a/config/longrun_configs/longrun_aquaplanet_amip.yml +++ b/config/longrun_configs/longrun_aquaplanet_amip.yml @@ -21,7 +21,7 @@ edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true rayleigh_sponge: true -dt_save_to_disk: "3hours" +dt_save_state_to_disk: "3hours" dt: "5secs" t_end: "1days" FLOAT_TYPE: "Float32" diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml index b318c722b52..e1e8766da1e 100644 --- a/config/longrun_configs/longrun_aquaplanet_dyamond.yml +++ b/config/longrun_configs/longrun_aquaplanet_dyamond.yml @@ -13,7 +13,7 @@ dt_rad: "1hours" vert_diff: "true" surface_setup: "DefaultMoninObukhov" rayleigh_sponge: true -dt_save_to_disk: "3hours" +dt_save_state_to_disk: "3hours" dt: "50secs" t_end: "1days" FLOAT_TYPE: "Float32" diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml index 69a5335fda8..95c7db4cd7d 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "150secs" t_end: "300days" h_elem: 16 diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml index a20b20d0c1f..c2291b588c3 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml @@ -1,5 +1,5 @@ rad: "clearsky" -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" rayleigh_sponge: true topo_smoothing: true z_elem: 45 diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_0M_clearsky_tvinsolation_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_0M_clearsky_tvinsolation_slabocean.yml index 84be68333f1..136dad0af68 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_0M_clearsky_tvinsolation_slabocean.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_0M_clearsky_tvinsolation_slabocean.yml @@ -1,5 +1,5 @@ FLOAT_TYPE: "Float32" -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" t_end: "100days" moist: "equil" precip_model: "0M" diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml index aa3afaeced1..03e6ee4ad3a 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml @@ -1,5 +1,5 @@ FLOAT_TYPE: "Float32" -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "150secs" t_end: "300days" h_elem: 16 diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml index b45aa57b7fd..eefee9aeaba 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml @@ -1,5 +1,5 @@ FLOAT_TYPE: "Float32" -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "40secs" t_end: "200days" h_elem: 16 diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml index eede038ac91..7cfc59bf960 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml @@ -1,5 +1,5 @@ FLOAT_TYPE: "Float32" -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "150secs" t_end: "300days" h_elem: 16 diff --git a/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml index 3d3cc089057..27a679250c7 100644 --- a/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml +++ b/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" initial_condition: "MoistBaroclinicWave" z_elem: 45 dt: "300secs" diff --git a/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml b/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml index acad2532471..4456834e032 100644 --- a/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml +++ b/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" rayleigh_sponge: true topo_smoothing: true initial_condition: "MoistBaroclinicWave" diff --git a/config/longrun_configs/longrun_bw_rhoe_highres.yml b/config/longrun_configs/longrun_bw_rhoe_highres.yml index f5f942e9ea7..2171c466b79 100644 --- a/config/longrun_configs/longrun_bw_rhoe_highres.yml +++ b/config/longrun_configs/longrun_bw_rhoe_highres.yml @@ -1,5 +1,5 @@ dz_bottom: 30.0 -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" h_elem: 16 initial_condition: "DryBaroclinicWave" t_end: "100days" diff --git a/config/longrun_configs/longrun_hs_rhoe_dry_nz63_55km_rs35km.yml b/config/longrun_configs/longrun_hs_rhoe_dry_nz63_55km_rs35km.yml index 22a03d41453..34bae1c1e2b 100644 --- a/config/longrun_configs/longrun_hs_rhoe_dry_nz63_55km_rs35km.yml +++ b/config/longrun_configs/longrun_hs_rhoe_dry_nz63_55km_rs35km.yml @@ -1,6 +1,6 @@ dz_bottom: 30.0 dz_top: 3000.0 -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" t_end: "300days" h_elem: 16 z_elem: 63 diff --git a/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml b/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml index d8dfcbde580..76ce9826abd 100644 --- a/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml +++ b/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" rayleigh_sponge: true topo_smoothing: true z_elem: 45 diff --git a/config/longrun_configs/longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml b/config/longrun_configs/longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml index b4aad7bc0fb..880eec69f2d 100644 --- a/config/longrun_configs/longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml +++ b/config/longrun_configs/longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" dt: "150secs" t_end: "300days" h_elem: 16 diff --git a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml index e180d79354d..b438e748dc0 100644 --- a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml +++ b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml @@ -7,5 +7,5 @@ kappa_4_tracer: 1.0e16 perturb_initstate: false discrete_hydrostatic_balance: true t_end: "800days" -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" job_id: "longrun_sphere_hydrostatic_balance_rhoe" diff --git a/config/longrun_configs/longrun_ssp_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_ssp_bw_rhoe_equil_highres.yml index 2cc3d2f5652..5bed5820a96 100644 --- a/config/longrun_configs/longrun_ssp_bw_rhoe_equil_highres.yml +++ b/config/longrun_configs/longrun_ssp_bw_rhoe_equil_highres.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" initial_condition: "MoistBaroclinicWave" max_newton_iters_ode: 3 z_elem: 45 diff --git a/config/longrun_configs/longrun_zalesak_tracer_energy_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_zalesak_tracer_energy_bw_rhoe_equil_highres.yml index 90fbf0c2c97..9a00c5e243d 100644 --- a/config/longrun_configs/longrun_zalesak_tracer_energy_bw_rhoe_equil_highres.yml +++ b/config/longrun_configs/longrun_zalesak_tracer_energy_bw_rhoe_equil_highres.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10days" +dt_save_state_to_disk: "10days" initial_condition: "MoistBaroclinicWave" z_elem: 45 dt: "200secs" diff --git a/config/model_configs/box_density_current_test.yml b/config/model_configs/box_density_current_test.yml index 6f520d07746..132c769c54a 100644 --- a/config/model_configs/box_density_current_test.yml +++ b/config/model_configs/box_density_current_test.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10secs" +dt_save_state_to_disk: "10secs" initial_condition: "DryDensityCurrentProfile" x_max: 51200.0 z_elem: 45 diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml index 3fce1d9a6da..bd40b17f747 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml @@ -14,5 +14,5 @@ precip_model: 0M override_τ_precip: false dt: 50secs t_end: 1hours -dt_save_to_disk: 600secs +dt_save_state_to_disk: 600secs toml: [toml/diagnostic_edmfx_trmm_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml index 9c6ddcc2bd7..6d7736ea0ca 100644 --- a/config/model_configs/diagnostic_edmfx_bomex_box.yml +++ b/config/model_configs/diagnostic_edmfx_bomex_box.yml @@ -28,7 +28,7 @@ z_max: 3e3 z_stretch: false dt: "100secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/diagnostic_edmfx_box.toml] diagnostics: - short_name: ts diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml index 9b19d543109..0c4556f8262 100644 --- a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml @@ -29,5 +29,5 @@ dz_bottom: 50.0 dz_top: 200.0 dt: "200secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml index b426bb2965f..acf2a3e3eed 100644 --- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml +++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml @@ -28,5 +28,5 @@ z_max: 1500 z_stretch: false dt: 100secs t_end: 4hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml index 4687aae8ecf..752836d0732 100644 --- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml +++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml @@ -26,5 +26,5 @@ z_max: 1500 z_stretch: false dt: 20secs t_end: 4hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml index 9ccecd480d5..cf98d3d2a22 100644 --- a/config/model_configs/diagnostic_edmfx_gabls_box.yml +++ b/config/model_configs/diagnostic_edmfx_gabls_box.yml @@ -26,5 +26,5 @@ z_max: 400 z_stretch: false dt: 200secs t_end: 9hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml index 49025a6f8b3..74e18a21e1f 100644 --- a/config/model_configs/diagnostic_edmfx_rico_box.yml +++ b/config/model_configs/diagnostic_edmfx_rico_box.yml @@ -28,5 +28,5 @@ z_max: 4e3 z_stretch: false dt: 100secs t_end: 8hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins toml: [toml/diagnostic_edmfx_trmm_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_test_box.yml b/config/model_configs/diagnostic_edmfx_test_box.yml index 0611c140486..70dfee57512 100644 --- a/config/model_configs/diagnostic_edmfx_test_box.yml +++ b/config/model_configs/diagnostic_edmfx_test_box.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "10secs" +dt_save_state_to_disk: "10secs" x_max: 10000.0 hyperdiff: "true" z_elem: 45 diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml index 2e7b61b866d..af227db6e13 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box.yml @@ -29,6 +29,6 @@ z_max: 16400 z_stretch: false dt: 200secs t_end: 6hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" toml: [toml/diagnostic_edmfx_trmm_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml index 37b7cbb3500..7c655e101c8 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml @@ -32,6 +32,6 @@ dz_bottom: 50 dz_top: 2000 dt: 300secs t_end: 6hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" toml: [toml/diagnostic_edmfx_trmm_box.toml] diff --git a/config/model_configs/plane_agnesi_mountain_test_stretched.yml b/config/model_configs/plane_agnesi_mountain_test_stretched.yml index a9624052beb..ecab72e14bf 100644 --- a/config/model_configs/plane_agnesi_mountain_test_stretched.yml +++ b/config/model_configs/plane_agnesi_mountain_test_stretched.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "3600secs" +dt_save_state_to_disk: "3600secs" rayleigh_sponge: true initial_condition: "AgnesiHProfile" x_max: 240000.0 diff --git a/config/model_configs/plane_agnesi_mountain_test_uniform.yml b/config/model_configs/plane_agnesi_mountain_test_uniform.yml index 898ea034500..e82d36e77db 100644 --- a/config/model_configs/plane_agnesi_mountain_test_uniform.yml +++ b/config/model_configs/plane_agnesi_mountain_test_uniform.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "3600secs" +dt_save_state_to_disk: "3600secs" rayleigh_sponge: true initial_condition: "AgnesiHProfile" x_max: 240000.0 diff --git a/config/model_configs/plane_density_current_test.yml b/config/model_configs/plane_density_current_test.yml index ee7609afee8..abdc0392524 100644 --- a/config/model_configs/plane_density_current_test.yml +++ b/config/model_configs/plane_density_current_test.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "3600secs" +dt_save_state_to_disk: "3600secs" initial_condition: "DryDensityCurrentProfile" x_max: 51200.0 z_elem: 90 diff --git a/config/model_configs/plane_schar_mountain_test_stretched.yml b/config/model_configs/plane_schar_mountain_test_stretched.yml index b9df5165439..a7c4aa2635b 100644 --- a/config/model_configs/plane_schar_mountain_test_stretched.yml +++ b/config/model_configs/plane_schar_mountain_test_stretched.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "3600secs" +dt_save_state_to_disk: "3600secs" rayleigh_sponge: true initial_condition: "ScharProfile" x_max: 120000.0 diff --git a/config/model_configs/plane_schar_mountain_test_uniform.yml b/config/model_configs/plane_schar_mountain_test_uniform.yml index bcc24ec3f1b..d25148e88b2 100644 --- a/config/model_configs/plane_schar_mountain_test_uniform.yml +++ b/config/model_configs/plane_schar_mountain_test_uniform.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "3600secs" +dt_save_state_to_disk: "3600secs" rayleigh_sponge: true initial_condition: "ScharProfile" x_max: 120000.0 diff --git a/config/model_configs/prognostic_edmfx_adv_test_box.yml b/config/model_configs/prognostic_edmfx_adv_test_box.yml index b67729df1a6..1dcc213886b 100644 --- a/config/model_configs/prognostic_edmfx_adv_test_box.yml +++ b/config/model_configs/prognostic_edmfx_adv_test_box.yml @@ -19,6 +19,6 @@ dz_bottom: 30.0 dz_top: 3000.0 dt: "10secs" t_end: "3600secs" -dt_save_to_disk: "100secs" +dt_save_state_to_disk: "100secs" FLOAT_TYPE: "Float64" toml: [toml/prognostic_edmfx_box_advection.toml] diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml index 77029bf15a1..e0a276a1523 100644 --- a/config/model_configs/prognostic_edmfx_aquaplanet.yml +++ b/config/model_configs/prognostic_edmfx_aquaplanet.yml @@ -13,5 +13,5 @@ moist: equil precip_model: 0M dt: 10secs t_end: 1hours -dt_save_to_disk: 600secs +dt_save_state_to_disk: 600secs toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_box.yml b/config/model_configs/prognostic_edmfx_bomex_box.yml index aaafbddf680..f994a49ece9 100644 --- a/config/model_configs/prognostic_edmfx_bomex_box.yml +++ b/config/model_configs/prognostic_edmfx_bomex_box.yml @@ -27,5 +27,5 @@ z_stretch: false perturb_initstate: false dt: "10secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_bomex_box.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml b/config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml index 9aa9284f580..d8f6672a688 100644 --- a/config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml +++ b/config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml @@ -27,5 +27,5 @@ z_stretch: false perturb_initstate: false dt: "5secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml b/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml index 9b6106a5f88..d5756d805d0 100644 --- a/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml +++ b/config/model_configs/prognostic_edmfx_bomex_stretched_box.yml @@ -28,5 +28,5 @@ dz_top: 200.0 perturb_initstate: false dt: "10secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_bomex_box.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_tke_box.yml b/config/model_configs/prognostic_edmfx_bomex_tke_box.yml index 61e1a6ce9a1..ff2b287a0c4 100644 --- a/config/model_configs/prognostic_edmfx_bomex_tke_box.yml +++ b/config/model_configs/prognostic_edmfx_bomex_tke_box.yml @@ -27,5 +27,5 @@ z_stretch: false perturb_initstate: false dt: "5secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_bomex_box.toml] diff --git a/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml index 29d9b943255..5a3f8b9c98b 100644 --- a/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml +++ b/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml @@ -27,5 +27,5 @@ z_elem: 30 z_stretch: false dt: 10secs t_end: 4hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins toml: [toml/prognostic_edmfx_dycoms_rf01_box.toml] diff --git a/config/model_configs/prognostic_edmfx_gabls_box.yml b/config/model_configs/prognostic_edmfx_gabls_box.yml index 2b79793b7a0..3a136c7817f 100644 --- a/config/model_configs/prognostic_edmfx_gabls_box.yml +++ b/config/model_configs/prognostic_edmfx_gabls_box.yml @@ -24,6 +24,6 @@ z_elem: 8 z_stretch: false dt: "5secs" t_end: "9hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" perturb_initstate: false toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_rico_column.yml b/config/model_configs/prognostic_edmfx_rico_column.yml index 615bde96dad..379f39ca577 100644 --- a/config/model_configs/prognostic_edmfx_rico_column.yml +++ b/config/model_configs/prognostic_edmfx_rico_column.yml @@ -22,5 +22,5 @@ z_stretch: false perturb_initstate: false dt: "5secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_trmm_column.yml b/config/model_configs/prognostic_edmfx_trmm_column.yml index 2664810c7c7..3d2f53aa43f 100644 --- a/config/model_configs/prognostic_edmfx_trmm_column.yml +++ b/config/model_configs/prognostic_edmfx_trmm_column.yml @@ -21,6 +21,6 @@ z_elem: 82 z_stretch: false dt: 5secs t_end: 6hours -dt_save_to_disk: 10mins +dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/single_column_hydrostatic_balance_ft64.yml b/config/model_configs/single_column_hydrostatic_balance_ft64.yml index 171bd133e6d..734e79dfc75 100644 --- a/config/model_configs/single_column_hydrostatic_balance_ft64.yml +++ b/config/model_configs/single_column_hydrostatic_balance_ft64.yml @@ -1,5 +1,5 @@ dz_bottom: 30.0 -dt_save_to_disk: "5days" +dt_save_state_to_disk: "5days" initial_condition: "IsothermalProfile" config: "column" hyperdiff: "false" diff --git a/config/model_configs/single_column_nonorographic_gravity_wave.yml b/config/model_configs/single_column_nonorographic_gravity_wave.yml index 098a508f36f..f5ee0702af1 100644 --- a/config/model_configs/single_column_nonorographic_gravity_wave.yml +++ b/config/model_configs/single_column_nonorographic_gravity_wave.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "400secs" +dt_save_state_to_disk: "400secs" initial_condition: "IsothermalProfile" t_end: "1500secs" config: "column" diff --git a/config/model_configs/single_column_precipitation_test.yml b/config/model_configs/single_column_precipitation_test.yml index 0fb29e279be..080a01052b6 100644 --- a/config/model_configs/single_column_precipitation_test.yml +++ b/config/model_configs/single_column_precipitation_test.yml @@ -6,7 +6,7 @@ z_max: 10000.0 z_stretch: false dt: "10secs" t_end: "1500secs" -dt_save_to_disk: "500secs" +dt_save_state_to_disk: "500secs" dt_cloud_fraction: "60secs" moist: "nonequil" precip_model: "1M" diff --git a/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml b/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml index cc0d910e658..d009d3c5bb1 100644 --- a/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml +++ b/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "100days" +dt_save_state_to_disk: "100days" initial_condition: "IsothermalProfile" hyperdiff: "false" z_elem: 70 diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky.yml index a26a305c4fb..7317635fa9a 100644 --- a/config/model_configs/single_column_radiative_equilibrium_clearsky.yml +++ b/config/model_configs/single_column_radiative_equilibrium_clearsky.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "100days" +dt_save_state_to_disk: "100days" initial_condition: "IsothermalProfile" hyperdiff: "false" z_elem: 70 diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml index e802af0f0d5..e0723672eb9 100644 --- a/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml +++ b/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml @@ -11,7 +11,7 @@ dz_top: 10000 t_end: "654days" dt: "3hours" dt_save_to_sol: "30hours" -dt_save_to_disk: "100days" +dt_save_state_to_disk: "100days" prognostic_surface: "true" surface_setup: DefaultExchangeCoefficients toml: [toml/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.toml] diff --git a/config/model_configs/single_column_radiative_equilibrium_gray.yml b/config/model_configs/single_column_radiative_equilibrium_gray.yml index 1713623621c..1e895508aec 100644 --- a/config/model_configs/single_column_radiative_equilibrium_gray.yml +++ b/config/model_configs/single_column_radiative_equilibrium_gray.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "100days" +dt_save_state_to_disk: "100days" initial_condition: "IsothermalProfile" hyperdiff: "false" z_elem: 70 diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml index 4206e28774d..9b251c1819b 100644 --- a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml +++ b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml @@ -1,5 +1,5 @@ rad: "allskywithclear" -dt_save_to_disk: "1days" +dt_save_state_to_disk: "1days" rayleigh_sponge: true orographic_gravity_wave: "raw_topo" z_elem: 25 diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml index 7bc13d8d983..c49610b2885 100644 --- a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml +++ b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml @@ -3,7 +3,7 @@ z_max: 45000.0 dz_bottom: 300.0 dt: "400secs" t_end: "24hours" -dt_save_to_disk: "24hours" +dt_save_state_to_disk: "24hours" vert_diff: "true" moist: "equil" precip_model: "1M" diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe.yml b/config/model_configs/sphere_baroclinic_wave_rhoe.yml index 18e81fe0e0e..510c3321a8c 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "2days" +dt_save_state_to_disk: "2days" initial_condition: "DryBaroclinicWave" dt: "400secs" t_end: "10days" diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml index 28d9c222f07..07ca6c7487d 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist.yml @@ -1,5 +1,5 @@ precip_model: "0M" -dt_save_to_disk: "2days" +dt_save_state_to_disk: "2days" regression_test: true initial_condition: "MoistBaroclinicWave" dt: "450secs" diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64.yml index c8a1ebef0a4..3be24dedbd8 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64.yml @@ -1,5 +1,5 @@ moist: "equil" -dt_save_to_disk: "5days" +dt_save_state_to_disk: "5days" check_conservation: true initial_condition: "MoistBaroclinicWave" t_end: "5days" diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml index 745f51fbae8..c329f529c4f 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml @@ -2,7 +2,7 @@ precip_model: "0M" vert_diff: "true" z_elem: 20 dz_bottom: 100 -dt_save_to_disk: "6hours" +dt_save_state_to_disk: "6hours" initial_condition: "MoistBaroclinicWave" dt: "20secs" t_end: "6hours" diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml index ecc0cae153f..c8f2b1f7347 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_impvdiff.yml @@ -2,7 +2,7 @@ precip_model: "0M" vert_diff: "true" z_elem: 20 dz_bottom: 100 -dt_save_to_disk: "6days" +dt_save_state_to_disk: "6days" initial_condition: "MoistBaroclinicWave" implicit_diffusion: true max_newton_iters_ode: 2 diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml index 4a114f6f4d3..0d9e3d7609d 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml @@ -1,5 +1,5 @@ topography: "DCMIP200" -dt_save_to_disk: "6days" +dt_save_state_to_disk: "6days" rayleigh_sponge: true topo_smoothing: true initial_condition: "DryBaroclinicWave" diff --git a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml index 38613016a97..e6b79210ec0 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "4days" +dt_save_state_to_disk: "4days" rayleigh_sponge: true dt: "450secs" z_elem: 25 diff --git a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_topography_dcmip.yml b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_topography_dcmip.yml index 0624405caa7..8fdb8bfeaeb 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_topography_dcmip.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_topography_dcmip.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "2days" +dt_save_state_to_disk: "2days" rayleigh_sponge: true topo_smoothing: true dt: "200secs" diff --git a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml index 5924785c111..9a37a0f8d44 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml @@ -1,5 +1,5 @@ dz_bottom: 300.0 -dt_save_to_disk: "4days" +dt_save_state_to_disk: "4days" t_end: "8days" forcing: "held_suarez" dt: "400secs" diff --git a/config/model_configs/sphere_held_suarez_rhoe_topography_dcmip.yml b/config/model_configs/sphere_held_suarez_rhoe_topography_dcmip.yml index 7bad1062730..0180ce9eef9 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_topography_dcmip.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_topography_dcmip.yml @@ -1,5 +1,5 @@ topography: "DCMIP200" -dt_save_to_disk: "3days" +dt_save_state_to_disk: "3days" rayleigh_sponge: true topo_smoothing: true use_reference_state: false diff --git a/config/model_configs/sphere_hydrostatic_balance_rhoe_ft64.yml b/config/model_configs/sphere_hydrostatic_balance_rhoe_ft64.yml index cae4d673275..ee108f64dd5 100644 --- a/config/model_configs/sphere_hydrostatic_balance_rhoe_ft64.yml +++ b/config/model_configs/sphere_hydrostatic_balance_rhoe_ft64.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "8days" +dt_save_state_to_disk: "8days" use_reference_state: false t_end: "8days" discrete_hydrostatic_balance: true diff --git a/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_dcmip200.yml b/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_dcmip200.yml index 7424daa998d..128b7694dcc 100644 --- a/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_dcmip200.yml +++ b/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_dcmip200.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "1days" +dt_save_state_to_disk: "1days" rayleigh_sponge: true topo_smoothing: true initial_condition: "MoistBaroclinicWave" diff --git a/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth.yml b/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth.yml index 5308dec01e6..ea030bff4df 100644 --- a/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth.yml +++ b/config/model_configs/sphere_ssp_baroclinic_wave_rhoe_equilmoist_earth.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "1days" +dt_save_state_to_disk: "1days" rayleigh_sponge: true topo_smoothing: true initial_condition: "MoistBaroclinicWave" diff --git a/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml b/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml index 79468ee5864..9355d13cca6 100644 --- a/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml +++ b/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "5days" +dt_save_state_to_disk: "5days" initial_condition: "MoistBaroclinicWave" max_newton_iters_ode: 4 dt: "400secs" diff --git a/config/model_configs/test_io.yml b/config/model_configs/test_io.yml index 84c6d53757b..0117aeb33f6 100644 --- a/config/model_configs/test_io.yml +++ b/config/model_configs/test_io.yml @@ -6,5 +6,5 @@ rad: "clearsky" t_end: "2hours" job_id: "test_io" dt_save_to_sol: "1hours" -dt_save_to_disk: "1hours" +dt_save_state_to_disk: "1hours" post_process: false \ No newline at end of file diff --git a/config/model_configs/test_mpi_io.yml b/config/model_configs/test_mpi_io.yml index bf34c968c5b..a6b12805c89 100644 --- a/config/model_configs/test_mpi_io.yml +++ b/config/model_configs/test_mpi_io.yml @@ -1,5 +1,5 @@ job_id: "test_mpi_io" t_end: "2hours" dt_save_to_sol: "1hours" -dt_save_to_disk: "1hours" +dt_save_state_to_disk: "1hours" post_process: false diff --git a/config/mpi_configs/mpi_make_restart.yml b/config/mpi_configs/mpi_make_restart.yml index 08fa54f21c3..d4d37055977 100644 --- a/config/mpi_configs/mpi_make_restart.yml +++ b/config/mpi_configs/mpi_make_restart.yml @@ -1,3 +1,3 @@ job_id: "mpi_make_restart" -dt_save_to_disk: "5days" +dt_save_state_to_disk: "5days" initial_condition: "DryBaroclinicWave" diff --git a/config/mpi_configs/prep_remap.yml b/config/mpi_configs/prep_remap.yml index 1a67a631f5c..36c7b03ff2c 100644 --- a/config/mpi_configs/prep_remap.yml +++ b/config/mpi_configs/prep_remap.yml @@ -1,2 +1,2 @@ job_id: "prep_remap" -dt_save_to_disk: "5days" +dt_save_state_to_disk: "5days" diff --git a/config/perf_configs/flame_perf_target_callbacks.yml b/config/perf_configs/flame_perf_target_callbacks.yml index 50764104b45..4edb3e8138b 100644 --- a/config/perf_configs/flame_perf_target_callbacks.yml +++ b/config/perf_configs/flame_perf_target_callbacks.yml @@ -1,3 +1,3 @@ -dt_save_to_disk: "1secs" +dt_save_state_to_disk: "1secs" dt_rad: "1secs" job_id: "flame_perf_target_callbacks" diff --git a/config/perf_configs/flame_perf_target_diagnostic_edmfx.yml b/config/perf_configs/flame_perf_target_diagnostic_edmfx.yml index 267290125c0..3df11b624ec 100644 --- a/config/perf_configs/flame_perf_target_diagnostic_edmfx.yml +++ b/config/perf_configs/flame_perf_target_diagnostic_edmfx.yml @@ -1,4 +1,4 @@ -dt_save_to_disk: "600secs" +dt_save_state_to_disk: "600secs" vert_diff: "false" turbconv: "diagnostic_edmfx" edmfx_entr_model: "Generalized" diff --git a/config/perf_configs/flame_perf_target_edmf.yml b/config/perf_configs/flame_perf_target_edmf.yml index ac15113d070..fb38e903d1b 100644 --- a/config/perf_configs/flame_perf_target_edmf.yml +++ b/config/perf_configs/flame_perf_target_edmf.yml @@ -1,6 +1,6 @@ rad: ~ apply_limiter: false -dt_save_to_disk: "10secs" +dt_save_state_to_disk: "10secs" precip_model: ~ turbconv: "edmf" post_process: false diff --git a/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml b/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml index c650a8dff88..06cfebdc5a8 100644 --- a/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml +++ b/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml @@ -14,5 +14,5 @@ moist: equil precip_model: 0M dt: 10secs t_end: 1hours -dt_save_to_disk: 600secs +dt_save_state_to_disk: 600secs toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/perf_configs/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml b/config/perf_configs/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml index 051eb4eca07..65a8fe3866f 100644 --- a/config/perf_configs/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml +++ b/config/perf_configs/flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff.yml @@ -6,7 +6,7 @@ precip_model: "0M" vert_diff: "true" z_elem: 20 dz_bottom: 100 -dt_save_to_disk: "12hours" +dt_save_state_to_disk: "12hours" initial_condition: "MoistBaroclinicWave" dt: "40secs" t_end: "12hours" diff --git a/config/perf_configs/gpu_baroclinic_wave_rhoe.yml b/config/perf_configs/gpu_baroclinic_wave_rhoe.yml index 99349ca7bb8..9f4e4107c9d 100644 --- a/config/perf_configs/gpu_baroclinic_wave_rhoe.yml +++ b/config/perf_configs/gpu_baroclinic_wave_rhoe.yml @@ -1,6 +1,6 @@ job_id: "gpu_baroclinic_wave_rhoe" dt: "400secs" t_end: "10days" -dt_save_to_disk: "2days" +dt_save_state_to_disk: "2days" initial_condition: "DryBaroclinicWave" dt_save_to_sol: "Inf" diff --git a/config/perf_configs/gpu_held_suarez_rhoe_hightop.yml b/config/perf_configs/gpu_held_suarez_rhoe_hightop.yml index b785b5d01fd..4279fcc90c5 100644 --- a/config/perf_configs/gpu_held_suarez_rhoe_hightop.yml +++ b/config/perf_configs/gpu_held_suarez_rhoe_hightop.yml @@ -5,4 +5,4 @@ forcing: "held_suarez" job_id: "gpu_held_suarez_rhoe_hightop" dt: "400secs" t_end: "8days" -dt_save_to_disk: "4days" +dt_save_state_to_disk: "4days" diff --git a/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml b/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml index b498842ab86..481fc62890c 100644 --- a/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml +++ b/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml @@ -5,4 +5,4 @@ initial_condition: DryBaroclinicWave t_end: 1mins dt: 1secs dt_save_to_sol: Inf -dt_save_to_disk: Inf +dt_save_state_to_disk: Inf diff --git a/docs/src/config.md b/docs/src/config.md index 5b1c1b1358c..32c122eb4d2 100644 --- a/docs/src/config.md +++ b/docs/src/config.md @@ -41,7 +41,7 @@ z_stretch: false perturb_initstate: false dt: "5secs" t_end: "6hours" -dt_save_to_disk: "10mins" +dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_box.toml] ``` diff --git a/docs/src/radiative_equilibrium.md b/docs/src/radiative_equilibrium.md index 04bb10d4f81..8e664f7228a 100644 --- a/docs/src/radiative_equilibrium.md +++ b/docs/src/radiative_equilibrium.md @@ -23,7 +23,7 @@ dz_top: 10000 t_end: "654days" dt: "3hours" dt_save_to_sol: "30hours" -dt_save_to_disk: "100days" +dt_save_state_to_disk: "100days" prognostic_surface: "true" job_id: "single_column_radiative_equilibrium_clearsky_prognostic_surface_temp" ``` diff --git a/src/callbacks/callbacks.jl b/src/callbacks/callbacks.jl index cde234bebda..1b67696503a 100644 --- a/src/callbacks/callbacks.jl +++ b/src/callbacks/callbacks.jl @@ -177,7 +177,7 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator) return nothing end -function save_to_disk_func(integrator, output_dir) +function save_state_to_disk_func(integrator, output_dir) (; t, u, p) = integrator Y = u @@ -193,9 +193,6 @@ function save_to_disk_func(integrator, output_dir) return nothing end -save_restart_func(integrator, output_dir) = - save_to_disk_func(integrator, joinpath(output_dir, "restart")) - Base.@kwdef mutable struct WallTimeEstimate """Number of calls to the callback""" n_calls::Int = 0 diff --git a/src/solver/solve.jl b/src/solver/solve.jl index ea84ce9cf71..d3e4a31c1e0 100644 --- a/src/solver/solve.jl +++ b/src/solver/solve.jl @@ -70,10 +70,9 @@ function solve_atmos!(simulation) catch ret_code if !CA.is_distributed(comms_ctx) # We can only save when not distributed because we don't have a way to sync the - # MPI processes (maybe just one MPI rank crashes, leading to a hanginging + # MPI processes (maybe just one MPI rank crashes, leading to a hanging # simulation) - CA.save_restart_func(integrator, simulation.output_dir) - CA.save_to_disk_func(integrator, simulation.output_dir) + CA.save_state_to_disk_func(integrator, simulation.output_dir) end @error "ClimaAtmos simulation crashed. Stacktrace for failed simulation" exception = (ret_code, catch_backtrace()) diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl index 434639f5352..3947dd98327 100644 --- a/src/solver/type_getters.jl +++ b/src/solver/type_getters.jl @@ -465,13 +465,15 @@ function get_callbacks(parsed_args, sim_info, atmos, params, comms_ctx) ), ) end - dt_save_to_disk = time_to_seconds(parsed_args["dt_save_to_disk"]) - if !(dt_save_to_disk == Inf) + dt_save_state_to_disk = + time_to_seconds(parsed_args["dt_save_state_to_disk"]) + if !(dt_save_state_to_disk == Inf) callbacks = ( callbacks..., call_every_dt( - (integrator) -> save_to_disk_func(integrator, output_dir), - dt_save_to_disk; + (integrator) -> + save_state_to_disk_func(integrator, output_dir), + dt_save_state_to_disk; skip_first = sim_info.restart, ), ) diff --git a/test/parameter_tests.jl b/test/parameter_tests.jl index 0a0d53d77fe..e347361db80 100644 --- a/test/parameter_tests.jl +++ b/test/parameter_tests.jl @@ -13,7 +13,7 @@ default_args = CA.cli_defaults(CA.argparse_settings()) "newton_rtol" => Float32(1), "max_newton_iters_ode" => Int64(1), "nh_poly" => Int32(1), - "dt_save_to_disk" => "str", + "dt_save_state_to_disk" => "str", "bubble" => true, ) parsed_args = CA.AtmosConfig(config_dict).parsed_args @@ -21,7 +21,7 @@ default_args = CA.cli_defaults(CA.argparse_settings()) @test parsed_args["newton_rtol"] isa FT @test parsed_args["max_newton_iters_ode"] isa Int @test parsed_args["nh_poly"] isa Int - @test parsed_args["dt_save_to_disk"] isa String + @test parsed_args["dt_save_state_to_disk"] isa String @test parsed_args["bubble"] isa Bool end diff --git a/test/parameter_tests.toml b/test/parameter_tests.toml index f3843011814..963ac93f76e 100644 --- a/test/parameter_tests.toml +++ b/test/parameter_tests.toml @@ -13,10 +13,10 @@ value = 0 type = "float" alias = "y_elem" -[dt_save_to_disk] +[dt_save_state_to_disk] value = "5mins" type = "string" -alias = "dt_save_to_disk" +alias = "dt_save_state_to_disk" [dt] value = "10secs"