Skip to content

Fixing the default type of particle.time to also support np.timedelta64 #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
erikvansebille wants to merge 1 commit into from
Closed

Fixing the default type of particle.time to also support np.timedelta64 #2115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions parcels/particleset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def __init__(
assert lon.size == lat.size and lon.size == depth.size, "lon, lat, depth don't all have the same lenghts"

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


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