Update variable naming in tests

Author: VeckoTheGecko

parcels/xgrid.py

@@ -40,7 +40,7 @@ def __init__(self, grid: xgcm.Grid, mesh="flat"):
         self.xgcm_grid = grid
         self.mesh = mesh
 
-        # ! Not ideal... Triggers computation on a throwaway item. If adapter is still needed in codebase, and this is prohibitively expensive, perhaps store GridAdapter on Field object instead of Grid
+        # ! Not ideal... Triggers computation on a throwaway item. Keeping for now for v3 compat, will be removed in v4.
         self.lonlat_minmax = np.array(
             [
                 np.nanmin(self.xgcm_grid._ds["lon"]),

tests/v4/test_xgrid.py

@@ -39,8 +39,8 @@ def assert_equal(actual, expected):
 
 @pytest.mark.parametrize("ds, attr, expected", test_cases)
 def test_xgrid_properties_ground_truth(ds, attr, expected):
-    adapter = XGrid(xgcm.Grid(ds, periodic=False))
-    actual = getattr(adapter, attr)
+    grid = XGrid(xgcm.Grid(ds, periodic=False))
+    actual = getattr(grid, attr)
     assert_equal(actual, expected)
 
 
@@ -61,16 +61,16 @@ def test_xgrid_properties_ground_truth(ds, attr, expected):
 )
 @pytest.mark.parametrize("ds", datasets.values())
 def test_xgrid_against_old(ds, attr):
-    adapter = XGrid(xgcm.Grid(ds, periodic=False))
+    grid = XGrid(xgcm.Grid(ds, periodic=False))
 
-    grid = OldGrid.create_grid(
+    old_grid = OldGrid.create_grid(
         lon=ds.lon.values,
         lat=ds.lat.values,
         depth=ds.depth.values,
         time=ds.time.values.astype("float64") / 1e9,
         time_origin=TimeConverter(ds.time.values[0]),
         mesh="spherical",
     )
-    actual = getattr(adapter, attr)
-    expected = getattr(grid, attr)
+    actual = getattr(grid, attr)
+    expected = getattr(old_grid, attr)
     assert_equal(actual, expected)