Merge pull request #1930 from OceanParcels/1844-time-full

Remove Grid.time_full

Author: VeckoTheGecko

docs/examples/example_globcurrent.py

@@ -208,7 +208,7 @@ def test_globcurrent_time_extrapolation_error():
 
 
 @pytest.mark.v4alpha
-@pytest.mark.xfail(
+@pytest.mark.skip(
     reason="This was always broken when using eager loading `deferred_load=False` for the P field. Needs to be fixed."
 )
 @pytest.mark.parametrize("dt", [-300, 300])

parcels/application_kernels/advection.py

@@ -176,7 +176,7 @@ def AdvectionAnalytical(particle, fieldset, time):  # pragma: no cover
     I_s = 10  # number of intermediate time steps
     direction = 1.0 if particle.dt > 0 else -1.0
     withW = True if "W" in [f.name for f in fieldset.get_fields()] else False
-    withTime = True if len(fieldset.U.grid.time_full) > 1 else False
+    withTime = True if len(fieldset.U.grid.time) > 1 else False
     tau, zeta, eta, xsi, ti, zi, yi, xi = fieldset.U._search_indices(
         time, particle.depth, particle.lat, particle.lon, particle=particle
     )

parcels/field.py

@@ -812,7 +812,7 @@ def _check_grid_dimensions(grid1, grid2):
             np.allclose(grid1.lon, grid2.lon)
             and np.allclose(grid1.lat, grid2.lat)
             and np.allclose(grid1.depth, grid2.depth)
-            and np.allclose(grid1.time_full, grid2.time_full)
+            and np.allclose(grid1.time, grid2.time)
         )
 
     def c_grid_interpolation2D(self, time, z, y, x, particle=None, applyConversion=True):

parcels/grid.py

@@ -58,7 +58,6 @@ def __init__(
         self._lon = lon
         self._lat = lat
         self.time = time
-        self.time_full = self.time  # needed for deferred_loaded Fields
         self._time_origin = TimeConverter() if time_origin is None else time_origin
         assert isinstance(self.time_origin, TimeConverter), "time_origin needs to be a TimeConverter object"
         assert_valid_mesh(mesh)

parcels/particleset.py

@@ -164,7 +164,7 @@ def ArrayClass_init(self, *args, **kwargs):
         time = np.array([self.time_origin.reltime(t) if _convert_to_reltime(t) else t for t in time])
         assert lon.size == time.size, "time and positions (lon, lat, depth) do not have the same lengths."
         if isinstance(fieldset.U, Field) and (not fieldset.U.allow_time_extrapolation):
-            _warn_particle_times_outside_fieldset_time_bounds(time, fieldset.U.grid.time_full)
+            _warn_particle_times_outside_fieldset_time_bounds(time, fieldset.U.grid.time)
 
         if lonlatdepth_dtype is None:
             lonlatdepth_dtype = self.lonlatdepth_dtype_from_field_interp_method(fieldset.U)
@@ -962,7 +962,7 @@ def execute(
         if runtime is not None and endtime is not None:
             raise RuntimeError("Only one of (endtime, runtime) can be specified")
 
-        mintime, maxtime = self.fieldset.gridset.dimrange("time_full")
+        mintime, maxtime = self.fieldset.gridset.dimrange("time")
 
         default_release_time = mintime if dt >= 0 else maxtime
         if np.any(np.isnan(self.particledata.data["time"])):
@@ -980,7 +980,7 @@ def execute(
         if runtime is not None:
             endtime = starttime + runtime * np.sign(dt)
         elif endtime is None:
-            mintime, maxtime = self.fieldset.gridset.dimrange("time_full")
+            mintime, maxtime = self.fieldset.gridset.dimrange("time")
             endtime = maxtime if dt >= 0 else mintime
 
         if (abs(endtime - starttime) < 1e-5 or runtime == 0) and dt == 0:
@@ -1131,15 +1131,15 @@ def _warn_outputdt_release_desync(outputdt: float, starttime: float, release_tim
         )
 
 
-def _warn_particle_times_outside_fieldset_time_bounds(release_times: np.ndarray, time_full: np.ndarray):
+def _warn_particle_times_outside_fieldset_time_bounds(release_times: np.ndarray, time: np.ndarray):
     if np.any(release_times):
-        if np.any(release_times < time_full[0]):
+        if np.any(release_times < time[0]):
             warnings.warn(
                 "Some particles are set to be released before the fieldset's first time and allow_time_extrapolation is set to False.",
                 ParticleSetWarning,
                 stacklevel=2,
             )
-        if np.any(release_times > time_full[-1]):
+        if np.any(release_times > time[-1]):
             warnings.warn(
                 "Some particles are set to be released after the fieldset's last time and allow_time_extrapolation is set to False.",
                 ParticleSetWarning,