Skip to content

Commit 969653e

Browse files
authored
Merge pull request #1208 from CliMA/kp/itime-bug
Fix ITime issue with saveat
2 parents 8ee21dc + fee0e6b commit 969653e

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

config/ci_configs/amip_coarse_ft32.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FLOAT_TYPE: "Float32"
22
apply_limiter: false
33
co2: "maunaloa"
4-
dt_save_to_sol: "100days"
4+
dt_save_state_to_disk: "Inf"
5+
dt_save_to_sol: "Inf"
56
energy_check: false
67
h_elem: 6
78
mode_name: "amip"

experiments/ClimaEarth/user_io/arg_parsing.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,24 @@ function get_coupler_args(config_dict::Dict)
6161
date0 = date = Dates.DateTime(config_dict["start_date"], Dates.dateformat"yyyymmdd")
6262
Δt_cpl = Float64(Utilities.time_to_seconds(config_dict["dt_cpl"]))
6363
saveat = Float64(Utilities.time_to_seconds(config_dict["dt_save_to_sol"]))
64-
saveat = promote(t_start:saveat:t_end..., t_end)
6564
if use_itime
6665
t_end = ITime(t_end, epoch = date0)
6766
t_start = ITime(t_start, epoch = date0)
6867
Δt_cpl = ITime(Δt_cpl, epoch = date0)
6968
times = promote(t_end, t_start, Δt_cpl, ITime.(values(config_dict["component_dt_dict"]))...)
7069
t_end, t_start, Δt_cpl = (times[1], times[2], times[3])
71-
saveat = ITime(Float64(Utilities.time_to_seconds(config_dict["dt_save_to_sol"])))
72-
saveat = [promote([t_start:saveat:t_end..., t_end]...)...]
7370
component_dt_dict =
7471
Dict(component => first(promote(ITime(dt), t_end)) for (component, dt) in config_dict["component_dt_dict"])
7572
else
7673
component_dt_dict = config_dict["component_dt_dict"]
7774
end
75+
if saveat != Inf
76+
use_itime && (saveat = ITime(saveat))
77+
saveat = [promote([t_start:saveat:t_end..., t_end]...)...]
78+
else
79+
saveat = typeof(t_start)[]
80+
end
81+
7882
# Checkpointing information
7983
checkpoint_dt = config_dict["checkpoint_dt"]
8084

0 commit comments

Comments
 (0)