[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/parcels/_core/uxgrid.py

@@ -7,7 +7,7 @@
 
 from parcels._core.basegrid import BaseGrid
 from parcels._core.index_search import GRID_SEARCH_ERROR, _search_1d_array, uxgrid_point_in_cell
-from parcels._core.mesh import SphericalMesh, EARTH_RADIUS
+from parcels._core.mesh import EARTH_RADIUS, SphericalMesh
 from parcels._typing import assert_valid_mesh
 
 _UXGRID_AXES = Literal["Z", "FACE"]
@@ -82,7 +82,7 @@ def get_axis_dim(self, axis: _UXGRID_AXES) -> int:
     @property
     def deg2m(self) -> float:
         """Metres per arcdegree for this grid's mesh."""
-        if self._radius is None: # flat mesh; None causes crash in advection
+        if self._radius is None:  # flat mesh; None causes crash in advection
             return 1.0
         return self._radius * np.pi / 180.0
 

src/parcels/_core/xgrid.py

@@ -12,7 +12,7 @@
 import parcels._typing as ptyping
 from parcels._core.basegrid import BaseGrid
 from parcels._core.index_search import _search_1d_array, _search_indices_curvilinear_2d
-from parcels._core.mesh import SphericalMesh, EARTH_RADIUS
+from parcels._core.mesh import EARTH_RADIUS, SphericalMesh
 from parcels._sgrid.accessor import _get_dim_to_axis_mapping
 from parcels._sgrid.core import SGRID_PADDING_TO_XGCM_POSITION
 
@@ -258,7 +258,7 @@ def time(self):
     @property
     def deg2m(self) -> float:
         """Metres per degree of arc for this grid's mesh."""
-        if self._radius is None: # flat mesh; None causes crash in advection
+        if self._radius is None:  # flat mesh; None causes crash in advection
             return 1.0
         return self._radius * np.pi / 180.0
 

tests/test_mesh.py

@@ -8,12 +8,14 @@
 
 EARTH_DEG2M = EARTH_RADIUS * np.pi / 180
 
+
 def test_spherical_mesh_deg2m():
     assert SphericalMesh().radius == EARTH_RADIUS
     assert SphericalMesh().deg2m == EARTH_DEG2M
     r = 3389500.0  # Mars radius
     assert SphericalMesh(radius=r).deg2m == pytest.approx(r * np.pi / 180)
 
+
 @pytest.mark.parametrize(
     "mesh, exp_radius, exp_deg2m",
     [
@@ -28,14 +30,16 @@ def test_xgrid_radius_and_deg2m(mesh, exp_radius, exp_deg2m):
     assert grid._radius == exp_radius
     assert grid.deg2m == pytest.approx(exp_deg2m)
 
-@pytest.mark.parametrize("mesh, deg2m", 
-                         [
-                            (SphericalMesh(), EARTH_DEG2M), # No radius entered
-                            (SphericalMesh(radius=3389500.0), 3389500.0 * np.pi / 180), # Mars 
-                            (SphericalMesh(radius=6051800.0), 6051800.0 * np.pi / 180), # Venus
-                            (SphericalMesh(radius=EARTH_RADIUS), EARTH_DEG2M), # Explicit Earth
-                          ],
-                        ) 
+
+@pytest.mark.parametrize(
+    "mesh, deg2m",
+    [
+        (SphericalMesh(), EARTH_DEG2M),  # No radius entered
+        (SphericalMesh(radius=3389500.0), 3389500.0 * np.pi / 180),  # Mars
+        (SphericalMesh(radius=6051800.0), 6051800.0 * np.pi / 180),  # Venus
+        (SphericalMesh(radius=EARTH_RADIUS), EARTH_DEG2M),  # Explicit Earth
+    ],
+)
 def test_advection_uses_custom_radius(mesh, deg2m, npart=10):
     ds = simple_UV_dataset()
     ds["U"].data[:] = 1.0
@@ -51,26 +55,29 @@ def test_advection_uses_custom_radius(mesh, deg2m, npart=10):
     np.testing.assert_allclose(pset.x - startlon, expected_dlon, atol=1e-5)
     np.testing.assert_allclose(pset.y, startlat, atol=1e-5)
 
+
 def test_advection_flat_mesh(npart=10):
     ds = simple_UV_dataset(mesh="flat")
     ds["U"].data[:] = 1.0
     fieldset = FieldSet.from_sgrid_conventions(ds, mesh="flat")
-    
+
     runtime = 7200
     startlat = np.linspace(0, 80, npart)
     startlon = 20.0 + np.zeros(npart)
     pset = ParticleSet(fieldset, x=startlon, y=startlat)
     pset.execute(AdvectionRK4, runtime=runtime, dt=np.timedelta64(15, "m"))
 
-    assert fieldset.U.grid.deg2m == 1.0 # flat mesh deg2m
+    assert fieldset.U.grid.deg2m == 1.0  # flat mesh deg2m
     np.testing.assert_allclose(pset.x - startlon, runtime, atol=1e-5)
     np.testing.assert_allclose(pset.y, startlat, atol=1e-5)
 
+
 @pytest.mark.parametrize("bad_radius", ["6371000", [6371000], (1, 2), {}])
 def test_spherical_mesh_rejects_non_numeric_radius(bad_radius):
     with pytest.raises(TypeError):
         SphericalMesh(radius=bad_radius)
 
+
 @pytest.mark.parametrize("bad_radius", [0, -1.0, -6371000])
 def test_spherical_mesh_rejects_nonpos_radius(bad_radius):
     with pytest.raises(ValueError):