Fix some deprecation warnings (#2240)

Author: VeckoTheGecko

parcels/fieldset.py

@@ -15,7 +15,7 @@
 from parcels.field import Field, VectorField
 from parcels.tools.converters import Geographic, GeographicPolar
 from parcels.tools.loggers import logger
-from parcels.xgrid import XGrid
+from parcels.xgrid import _DEFAULT_XGCM_KWARGS, XGrid
 
 if TYPE_CHECKING:
     from parcels._typing import TimeLike
@@ -134,7 +134,7 @@ def add_constant_field(self, name: str, value, mesh: Mesh = "flat"):
             2. flat: No conversion, lat/lon are assumed to be in m.
         """
         ds = xr.Dataset({name: (["time", "lat", "lon", "depth"], np.full((1, 1, 1, 1), value))})
-        grid = XGrid(xgcm.Grid(ds))
+        grid = XGrid(xgcm.Grid(ds, **_DEFAULT_XGCM_KWARGS))
         self.add_field(
             Field(
                 name,
@@ -226,6 +226,7 @@ def from_copernicusmarine(ds: xr.Dataset):
                     },
                 },
                 autoparse_metadata=False,
+                **_DEFAULT_XGCM_KWARGS,
             )
         )
 

tests/v4/test_datasets.py

@@ -1,12 +1,13 @@
 import xgcm
 
 from parcels._datasets.structured.generic import datasets
+from parcels.xgrid import _DEFAULT_XGCM_KWARGS
 
 
 def test_left_indexed_dataset():
     """Checks that 'ds_2d_left' is right indexed on all variables."""
     ds = datasets["ds_2d_left"]
-    grid = xgcm.Grid(ds)
+    grid = xgcm.Grid(ds, **_DEFAULT_XGCM_KWARGS)
 
     for _axis_name, axis in grid.axes.items():
         for pos, _dim_name in axis.coords.items():
@@ -16,7 +17,7 @@ def test_left_indexed_dataset():
 def test_right_indexed_dataset():
     """Checks that 'ds_2d_right' is right indexed on all variables."""
     ds = datasets["ds_2d_right"]
-    grid = xgcm.Grid(ds)
+    grid = xgcm.Grid(ds, **_DEFAULT_XGCM_KWARGS)
     for _axis_name, axis in grid.axes.items():
         for pos, _dim_name in axis.coords.items():
             assert pos in ["center", "right"]

tests/v4/test_particleset.py

@@ -178,7 +178,7 @@ def test_pset_remove_index(fieldset, npart=100):
     indices_to_remove = [0, 10, 20]
     pset.remove_indices(indices_to_remove)
     assert pset.size == 97
-    assert not np.any(np.in1d(pset.trajectory, indices_to_remove))
+    assert not np.any(np.isin(pset.trajectory, indices_to_remove))
 
 
 def test_pset_iterator(fieldset):

tests/v4/test_particleset_execute.py

@@ -38,7 +38,7 @@ def fieldset() -> FieldSet:
 @pytest.fixture
 def fieldset_no_time_interval() -> FieldSet:
     # i.e., no time variation
-    ds = datasets_structured["ds_2d_left"].isel(time=0).drop("time")
+    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)