Skip to content

Commit

Permalink
Remove save_restart, rename save_to_disk
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Sbozzolo committed Jan 3, 2024
1 parent 18fb402 commit 5c57f5f
Show file tree
Hide file tree
Showing 91 changed files with 100 additions and 102 deletions.
4 changes: 2 additions & 2 deletions config/default_configs/default_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)]"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "1days"
dt_save_state_to_disk: "1days"
dt: "150secs"
t_end: "2days"
h_elem: 16
Expand Down
2 changes: 1 addition & 1 deletion config/gpu_configs/gpu_aquaplanet_dyamond.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
dt: "100secs"
t_end: "1days"
h_elem: 30
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
dt: "100secs"
t_end: "1days"
h_elem: 30
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_aquaplanet_amip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_aquaplanet_dyamond.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
dt: "150secs"
t_end: "300days"
h_elem: 16
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_bw_rhoe_equil_highres.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
initial_condition: "MoistBaroclinicWave"
z_elem: 45
dt: "300secs"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
rayleigh_sponge: true
topo_smoothing: true
initial_condition: "MoistBaroclinicWave"
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_bw_rhoe_highres.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
rayleigh_sponge: true
topo_smoothing: true
z_elem: 45
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
dt: "150secs"
t_end: "300days"
h_elem: 16
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10days"
dt_save_state_to_disk: "10days"
initial_condition: "MoistBaroclinicWave"
z_elem: 45
dt: "200secs"
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/box_density_current_test.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_bomex_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_gabls_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_rico_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_test_box.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "10secs"
dt_save_state_to_disk: "10secs"
x_max: 10000.0
hyperdiff: "true"
z_elem: 45
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_trmm_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/plane_density_current_test.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/plane_schar_mountain_test_uniform.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_adv_test_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_bomex_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_bomex_tke_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_gabls_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_rico_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_trmm_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "400secs"
dt_save_state_to_disk: "400secs"
initial_condition: "IsothermalProfile"
t_end: "1500secs"
config: "column"
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/single_column_precipitation_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "100days"
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: "false"
z_elem: 70
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "100days"
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: "false"
z_elem: 70
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dt_save_to_disk: "100days"
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: "false"
z_elem: 70
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit 5c57f5f

Please sign in to comment.