Review edits

Author: VeckoTheGecko

tests/test_interpolation.py

@@ -3,7 +3,7 @@
 import xarray as xr
 
 import parcels._interpolation as interpolation
-from parcels import AdvectionRK4_3D, JITParticle, ParticleSet, ScipyParticle
+from parcels import AdvectionRK4_3D, FieldSet, JITParticle, ParticleSet, ScipyParticle
 from tests.utils import create_fieldset_zeros_3d
 
 
@@ -50,6 +50,29 @@ def create_interpolation_data():
     return xr.DataArray([spatial_data, spatial_data, spatial_data], dims=("time", "depth", "lat", "lon"))
 
 
+def create_interpolation_data_with_land():
+    tdim, zdim, ydim, xdim = 20, 5, 10, 10
+    ds = xr.Dataset(
+        {
+            "U": (("time", "depth", "lat", "lon"), np.random.random((tdim, zdim, ydim, xdim))),
+            "V": (("time", "depth", "lat", "lon"), np.random.random((tdim, zdim, ydim, xdim))),
+            "W": (("time", "depth", "lat", "lon"), np.random.random((tdim, zdim, ydim, xdim))),
+        },
+        coords={
+            "time": np.linspace(0, tdim - 1, tdim),
+            "depth": np.linspace(0, 1, zdim),
+            "lat": np.linspace(0, 1, ydim),
+            "lon": np.linspace(0, 1, xdim),
+        },
+    )
+    # Set a land point (for testing freeslip)
+    ds["U"][:, :, 2, 5] = 0.0
+    ds["V"][:, :, 2, 5] = 0.0
+    ds["W"][:, :, 2, 5] = 0.0
+
+    return ds
+
+
 @pytest.fixture
 def data_2d():
     """2D slice of the reference data at depth=0."""
@@ -131,12 +154,11 @@ def test_interpolator2(ctx: interpolation.InterpolationContext3D):
 @pytest.mark.parametrize("interp_method", ["linear", "freeslip", "nearest", "cgrid_velocity"])
 def test_scipy_vs_jit(interp_method):
     """Test that the scipy and JIT versions of the interpolation are the same."""
-    fieldset = create_fieldset_zeros_3d()
-    # Randomize the field data and set the interpolation method
-    rng = np.random.default_rng(1636)
-    for field in [fieldset.U, fieldset.V, fieldset.W]:
-        field.data = rng.random(fieldset.U.data.shape, dtype=np.float32)
-        field.data[:, 3, 2, 5] = 0.0  # Set a land point (for testing freeslip)
+    variables = {"U": "U", "V": "V", "W": "W"}
+    dimensions = {"time": "time", "lon": "lon", "lat": "lat", "depth": "depth"}
+    fieldset = FieldSet.from_xarray_dataset(create_interpolation_data_with_land(), variables, dimensions, mesh="flat")
+
+    for field in [fieldset.U, fieldset.V, fieldset.W]:  # Set a land point (for testing freeslip)
         field.interp_method = interp_method
 
     x, y, z = np.meshgrid(np.linspace(0, 1, 7), np.linspace(0, 1, 13), np.linspace(0, 1, 5))