Testing the removal of applyConversion in VectorField API

Author: erikvansebille

parcels/_core/field.py

@@ -318,7 +318,13 @@ def eval(self, time: datetime, z, y, x, particles=None, applyConversion=True):
                 v = self.V.units.to_target(v, z, y, x)
 
         else:
-            (u, v, w) = self._vector_interp_method(self, ti, position, tau, time, z, y, x, applyConversion)
+            (u, v, w) = self._vector_interp_method(self, ti, position, tau, time, z, y, x)
+            if applyConversion and self.grid._mesh == "spherical":
+                deg2m = 1852 * 60.0
+                meshJac = deg2m * deg2m * np.cos(np.deg2rad(y))
+                u = u / meshJac
+                v = v / meshJac
+                print(u, v)
 
         for vel in (u, v, w):
             _update_particle_states_interp_value(particles, vel)

parcels/interpolators.py

@@ -52,7 +52,6 @@ def ZeroInterpolator_Vector(
     z: np.float32 | np.float64,
     y: np.float32 | np.float64,
     x: np.float32 | np.float64,
-    applyConversion: bool,
 ) -> np.float32 | np.float64:
     """Template function used for the signature check of the interpolation methods for velocity fields."""
     return 0.0
@@ -158,7 +157,6 @@ def CGrid_Velocity(
     z: np.float32 | np.float64,
     y: np.float32 | np.float64,
     x: np.float32 | np.float64,
-    applyConversion: bool,
 ):
     """
     Interpolation kernel for velocity fields on a C-Grid.
@@ -277,10 +275,7 @@ def CGrid_Velocity(
     V = (1 - eta) * V0 + eta * V1
 
     deg2m = 1852 * 60.0
-    if applyConversion:
-        meshJac = (deg2m * deg2m * np.cos(np.deg2rad(y))) if grid._mesh == "spherical" else 1
-    else:
-        meshJac = deg2m if grid._mesh == "spherical" else 1
+    meshJac = deg2m if grid._mesh == "spherical" else 1
 
     jac = i_u._compute_jacobian_determinant(py, px, eta, xsi) * meshJac
 
@@ -533,7 +528,6 @@ def XFreeslip(
     z: np.float32 | np.float64,
     y: np.float32 | np.float64,
     x: np.float32 | np.float64,
-    applyConversion: bool,
 ):
     """Free-slip boundary condition interpolation for velocity fields."""
     return _Spatialslip(vectorfield, ti, position, tau, t, z, y, x, a=1.0, b=0.0)
@@ -548,7 +542,6 @@ def XPartialslip(
     z: np.float32 | np.float64,
     y: np.float32 | np.float64,
     x: np.float32 | np.float64,
-    applyConversion: bool,
 ):
     """Partial-slip boundary condition interpolation for velocity fields."""
     return _Spatialslip(vectorfield, ti, position, tau, t, z, y, x, a=0.5, b=0.5)

tests/test_field.py

@@ -129,7 +129,7 @@ def test_vectorfield_invalid_interpolator():
     ds = datasets_structured["ds_2d_left"]
     grid = XGrid.from_dataset(ds)
 
-    def invalid_interpolator_wrong_signature(self, ti, position, tau, t, z, y, applyConversion, invalid):
+    def invalid_interpolator_wrong_signature(self, ti, position, tau, t, z, y, invalid):
         return 0.0
 
     # Create component fields