Merge branch 'v4-dev' into interpolation_tutorial_v4

Author: reint-fischer

src/parcels/_core/particlefile.py

@@ -158,7 +158,10 @@ def write(self, pset: ParticleSet, time, indices=None):
         pclass = pset._ptype
         time_interval = pset.fieldset.time_interval
         particle_data = pset._data
-        time = timedelta_to_float(time - time_interval.left)
+        if time_interval is None:
+            time = timedelta_to_float(time)
+        else:
+            time = timedelta_to_float(time - time_interval.left)
         particle_data = _convert_particle_data_time_to_float_seconds(particle_data, time_interval)
 
         self._write_particle_data(
@@ -309,7 +312,12 @@ def _convert_particle_data_time_to_float_seconds(particle_data, time_interval):
     #! Important that this is a shallow copy, so that updates to this propogate back to the original data
     particle_data = particle_data.copy()
 
-    particle_data["time"] = ((particle_data["time"] - time_interval.left) / np.timedelta64(1, "s")).astype(np.float64)
+    if time_interval is None:
+        particle_data["time"] = (particle_data["time"] / np.timedelta64(1, "s")).astype(np.float64)
+    else:
+        particle_data["time"] = ((particle_data["time"] - time_interval.left) / np.timedelta64(1, "s")).astype(
+            np.float64
+        )
     particle_data["dt"] = (particle_data["dt"] / np.timedelta64(1, "s")).astype(np.float64)
     return particle_data
 
@@ -326,10 +334,11 @@ def _maybe_convert_time_dtype(dtype: np.dtype | _SAME_AS_FIELDSET_TIME_INTERVAL)
 def _get_calendar_and_units(time_interval: TimeInterval) -> dict[str, str]:
     calendar = None
     units = "seconds"
-    if isinstance(time_interval.left, (np.datetime64, datetime)):
-        calendar = "standard"
-    elif isinstance(time_interval.left, cftime.datetime):
-        calendar = time_interval.left.calendar
+    if time_interval:
+        if isinstance(time_interval.left, (np.datetime64, datetime)):
+            calendar = "standard"
+        elif isinstance(time_interval.left, cftime.datetime):
+            calendar = time_interval.left.calendar
 
     if calendar is not None:
         units += f" since {time_interval.left}"

src/parcels/_core/particleset.py

@@ -548,7 +548,7 @@ def execute(
 
             self._kernel.execute(self, endtime=next_time, dt=dt)
 
-            if next_output:
+            if next_output is not None:
                 if np.abs(next_time - next_output) < np.timedelta64(1000, "ns"):
                     if output_file:
                         output_file.write(self, next_output)

tests/test_particlefile.py

@@ -21,6 +21,7 @@
 )
 from parcels._core.particle import Particle, create_particle_data, get_default_particle
 from parcels._core.utils.time import TimeInterval
+from parcels._datasets.structured.generated import peninsula_dataset
 from parcels._datasets.structured.generic import datasets
 from parcels.interpolators import XLinear
 from parcels.kernels import AdvectionRK4
@@ -69,6 +70,21 @@ def test_pfile_array_write_zarr_memorystore(fieldset):
     assert ds.sizes["trajectory"] == npart
 
 
+def test_write_fieldset_without_time(tmp_zarrfile):
+    ds = peninsula_dataset()  # DataSet without time
+    assert "time" not in ds.dims
+    grid = XGrid.from_dataset(ds)
+    fieldset = FieldSet([Field("U", ds["U"], grid, XLinear)])
+
+    pset = ParticleSet(fieldset, pclass=Particle, lon=0, lat=0)
+
+    ofile = ParticleFile(tmp_zarrfile, outputdt=np.timedelta64(1, "s"))
+    pset.execute(DoNothing, runtime=np.timedelta64(1, "s"), dt=np.timedelta64(1, "s"), output_file=ofile)
+
+    ds = xr.open_zarr(tmp_zarrfile)
+    assert ds.time.values[0, 1] == np.timedelta64(1, "s")
+
+
 def test_pfile_array_remove_particles(fieldset, tmp_zarrfile):
     npart = 10
     pset = ParticleSet(