Add test_fieldset_time_interval() and add time dim to example datasets

Author: VeckoTheGecko

parcels/_datasets/structured/generic.py

@@ -22,12 +22,12 @@ def _rotated_curvilinear_grid():
 
     return xr.Dataset(
         {
-            "data_g": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "data_c": (["ZC", "YC", "XC"], np.random.rand(3 * N, 2 * N, N)),
-            "U (A grid)": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "V (A grid)": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "U (C grid)": (["ZG", "YC", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "V (C grid)": (["ZG", "YG", "XC"], np.random.rand(3 * N, 2 * N, N)),
+            "data_g": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "data_c": (["time", "ZC", "YC", "XC"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "U (A grid)": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "V (A grid)": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "U (C grid)": (["time", "ZG", "YC", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "V (C grid)": (["time", "ZG", "YG", "XC"], np.random.rand(T, 3 * N, 2 * N, N)),
         },
         coords={
             "XG": (["XG"], XG, {"axis": "X", "c_grid_axis_shift": -0.5}),
@@ -97,12 +97,12 @@ def _unrolled_cone_curvilinear_grid():
 
     return xr.Dataset(
         {
-            "data_g": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "data_c": (["ZC", "YC", "XC"], np.random.rand(3 * N, 2 * N, N)),
-            "U (A grid)": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "V (A grid)": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "U (C grid)": (["ZG", "YC", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "V (C grid)": (["ZG", "YG", "XC"], np.random.rand(3 * N, 2 * N, N)),
+            "data_g": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "data_c": (["time", "ZC", "YC", "XC"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "U (A grid)": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "V (A grid)": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "U (C grid)": (["time", "ZG", "YC", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "V (C grid)": (["time", "ZG", "YG", "XC"], np.random.rand(T, 3 * N, 2 * N, N)),
         },
         coords={
             "XG": (["XG"], XG, {"axis": "X", "c_grid_axis_shift": -0.5}),
@@ -141,10 +141,10 @@ def _unrolled_cone_curvilinear_grid():
         {
             "data_g": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
             "data_c": (["time", "ZC", "YC", "XC"], np.random.rand(T, 3 * N, 2 * N, N)),
-            "U (A grid)": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "V (A grid)": (["ZG", "YG", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "U (C grid)": (["ZG", "YC", "XG"], np.random.rand(3 * N, 2 * N, N)),
-            "V (C grid)": (["ZG", "YG", "XC"], np.random.rand(3 * N, 2 * N, N)),
+            "U (A grid)": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "V (A grid)": (["time", "ZG", "YG", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "U (C grid)": (["time", "ZG", "YC", "XG"], np.random.rand(T, 3 * N, 2 * N, N)),
+            "V (C grid)": (["time", "ZG", "YG", "XC"], np.random.rand(T, 3 * N, 2 * N, N)),
         },
         coords={
             "XG": (

tests/v4/test_fieldset.py

@@ -1,3 +1,6 @@
+from datetime import timedelta
+
+import numpy as np
 import pytest
 
 from parcels._datasets.structured.generic import datasets as datasets_structured
@@ -70,4 +73,17 @@ def test_fieldset_gridset_size(fieldset):
     assert fieldset.gridset_size == 1
 
 
-def test_fieldset_executable_domain(): ...
+def test_fieldset_time_interval():
+    grid1 = Grid(ds)
+    field1 = Field("field1", ds["U (A grid)"], grid1, mesh_type="flat")
+
+    ds2 = ds.copy()
+    ds2["time"] = ds2["time"] + np.timedelta64(timedelta(days=1))
+    grid2 = Grid(ds2)
+    field2 = Field("field2", ds2["U (A grid)"], grid2, mesh_type="flat")
+
+    fieldset = FieldSet([field1, field2])
+    fieldset.add_constant_field("constant_field", 1.0)
+
+    assert fieldset.time_interval.left == np.datetime64("2000-01-02")
+    assert fieldset.time_interval.right == np.datetime64("2001-01-01")