Fix remaining tests

Author: VeckoTheGecko

tests/test_index_search.py

@@ -3,23 +3,17 @@
 import xgcm
 
 import parcels.tutorial
-from parcels import Field, XGrid
+from parcels import XGrid
+from parcels._core.fieldset import FieldSet
 from parcels._core.index_search import _latlon_rad_to_xyz, _search_indices_curvilinear_2d
 from parcels._datasets.structured.generic import datasets
-from parcels.interpolators import XLinear
 
 
 @pytest.fixture
 def field_cone():
     ds = datasets["2d_left_unrolled_cone"]
-    grid = XGrid.from_dataset(ds, mesh="flat")
-    field = Field(
-        name="test_field",
-        data=ds["data_g"],
-        grid=grid,
-        interp_method=XLinear,
-    )
-    return field
+    fieldset = FieldSet.from_sgrid_conventions(ds, mesh="flat")
+    return fieldset.data_g
 
 
 def test_grid_indexing_fpoints(field_cone):

tests/test_particleset_execute.py

@@ -17,7 +17,6 @@
     UxGrid,
     Variable,
     VectorField,
-    XGrid,
 )
 from parcels._core.utils.time import timedelta_to_float
 from parcels._datasets.structured.generated import simple_UV_dataset
@@ -27,8 +26,6 @@
     Ux_Velocity,
     UxConstantFaceConstantZC,
     UxLinearNodeLinearZF,
-    XLinear,
-    XLinear_Velocity,
 )
 from parcels.kernels import AdvectionEE, AdvectionRK2, AdvectionRK4, AdvectionRK4_3D, AdvectionRK45
 from tests.common_kernels import DoNothing
@@ -40,11 +37,13 @@ def fieldset_no_time_interval() -> FieldSet:
     # i.e., no time variation
     ds = datasets_structured["ds_2d_left"].isel(time=0).drop_vars("time")
 
-    grid = XGrid.from_dataset(ds, mesh="flat")
-    U = Field("U", ds["U_A_grid"], grid, interp_method=XLinear)
-    V = Field("V", ds["V_A_grid"], grid, interp_method=XLinear)
-    UV = VectorField("UV", U, V, vector_interp_method=XLinear_Velocity)
-    return FieldSet([U, V, UV])
+    ds = ds[["U_A_grid", "V_A_grid", "grid"]].rename(
+        {
+            "U_A_grid": "U",
+            "V_A_grid": "V",
+        }
+    )
+    return FieldSet.from_sgrid_conventions(ds, mesh="flat")
 
 
 @pytest.fixture