Updating pragmatic loadtimechunk

Author: erikvansebille

parcels/_index_search.py

@@ -38,35 +38,8 @@ def _search_time_index(field: Field, time: datetime):
     Note that we normalize to either the first or the last index
     if the sampled value is outside the time value range.
     """
-    if field.time_interval is None:
-        return 0, 0
-
-    if time not in field.time_interval:
-        _raise_time_extrapolation_error(time, field=None)
-
-    time_index = field.data.time.data <= time
-
-    if time_index.all():
-        # If given time > last known field time, use
-        # the last field frame without interpolation
-        ti = len(field.data.time.data) - 1
-    elif np.logical_not(time_index).all():
-        # If given time < any time in the field, use
-        # the first field frame without interpolation
-        ti = 0
-    else:
-        ti = int(time_index.argmin() - 1) if time_index.any() else 0
-
-    if len(field.data.time.data) == 1:
-        tau = 0
-    elif ti == len(field.data.time.data) - 1:
-        tau = 1
-    else:
-        tau = (
-            (time - field.data.time.data[ti]) / (field.data.time.data[ti + 1] - field.data.time.data[ti])
-            if field.data.time.data[ti] != field.data.time.data[ti + 1]
-            else 0
-        )
+    ti = np.argmin(field._time_float <= time) - 1
+    tau = (time - field._time_float[ti]) / (field._time_float[ti + 1] - field._time_float[ti])
     return tau, ti
 
 

parcels/application_kernels/advection.py

@@ -97,7 +97,7 @@ def AdvectionRK4_3D_CROCO(particle, fieldset, time):  # pragma: no cover
 
 def AdvectionEE(particle, fieldset, time):  # pragma: no cover
     """Advection of particles using Explicit Euler (aka Euler Forward) integration."""
-    dt = particle.dt / np.timedelta64(1, "s")  # noqa TODO improve API for converting dt to seconds
+    dt = particle.dt
     (u1, v1) = fieldset.UV[particle]
     particle_dlon += u1 * dt  # noqa
     particle_dlat += v1 * dt  # noqa

parcels/particleset.py

@@ -812,10 +812,14 @@ def execute(
         next_output = outputdt if output_file else None
 
         time = start_time
+
+        for fld in [self.fieldset.U, self.fieldset.V]:  # TODO generalise to all fields and move to better place
+            fld._time_float = (fld.data_full.time.data - fld.time_interval.left)/ np.timedelta64(1, "s")
+
         while sign_dt * (time - end_time) < 0:
 
             for fld in [self.fieldset.U, self.fieldset.V]:  # TODO generalise to all fields
-                ti = np.argmin(fld.data_full.time.data <= self._data["time_nextloop"][0]) - 1  # TODO also implement dt < 0
+                ti = np.argmin(fld._time_float <= self._data["time_nextloop"][0]) - 1  # TODO also implement dt < 0
                 if not hasattr(fld, "data") or fld.data_full.time.data[ti] != fld.data.time.data[0]:
                     fld.data = fld.data_full.isel({"time": slice(ti, ti + 2)}).load()