Skip to content

Commit ee6344f

Browse files
Merge branch 'support_not_seeting_time_timedelta' into adding_unit_tests
2 parents 69b1806 + e38b201 commit ee6344f

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

parcels/particleset.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def __init__(
109109
assert lon.size == lat.size and lon.size == depth.size, "lon, lat, depth don't all have the same lenghts"
110110

111111
if time is None or len(time) == 0:
112-
time = np.datetime64("NaT", "ns") # do not set a time yet (because sign_dt not known)
112+
time = type(fieldset.time_interval.left)("NaT", "ns") # do not set a time yet (because sign_dt not known)
113113
elif type(time[0]) in [np.datetime64, np.timedelta64]:
114114
pass # already in the right format
115115
else:
@@ -843,7 +843,9 @@ def _warn_outputdt_release_desync(outputdt: float, starttime: float, release_tim
843843

844844

845845
def _warn_particle_times_outside_fieldset_time_bounds(release_times: np.ndarray, time: TimeInterval):
846-
if np.any(release_times):
846+
if any(not np.isnat(t) for t in release_times):
847+
if isinstance(time.left, np.datetime64) and isinstance(release_times[0], np.timedelta64):
848+
release_times = np.array([t + time.left for t in release_times])
847849
if np.any(release_times < time.left):
848850
warnings.warn(
849851
"Some particles are set to be released outside the FieldSet's executable time domain.",

0 commit comments

Comments
 (0)