Merge pull request #1500 from OceanParcels/fixing_cgrid_eval_without_conversion

Bugfix for cgrid eval without applyConversion

Author: erikvansebille

docs/examples/tutorial_nemo_curvilinear.ipynb

@@ -247,13 +247,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "WARNING: Sampling of velocities should normally be done using fieldset.UV or fieldset.UVW object; thread carefully\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "WARNING: Sampling of velocities should normally be done using fieldset.UV or fieldset.UVW object; tread carefully\n",
       "0it [00:00, ?it/s]\n"
      ]
     }

docs/examples/tutorial_sampling.ipynb

@@ -1194,7 +1194,7 @@ def time_index(self, time):
 
     def _check_velocitysampling(self):
         if self.name in ['U', 'V', 'W']:
-            logger.warning_once("Sampling of velocities should normally be done using fieldset.UV or fieldset.UVW object; thread carefully")
+            logger.warning_once("Sampling of velocities should normally be done using fieldset.UV or fieldset.UVW object; tread carefully")
 
     def __getitem__(self, key):
         self._check_velocitysampling()
@@ -1596,7 +1596,11 @@ def spatial_c_grid_interpolation2D(self, ti, z, y, x, time, particle=None, apply
         V = (1-eta) * V0 + eta * V1
         rad = np.pi/180.
         deg2m = 1852 * 60.
-        meshJac = (deg2m * deg2m * math.cos(rad * y)) if grid.mesh == 'spherical' else 1
+        if applyConversion:
+            meshJac = (deg2m * deg2m * math.cos(rad * y)) if grid.mesh == 'spherical' else 1
+        else:
+            meshJac = deg2m if grid.mesh == 'spherical' else 1
+
         jac = self.jacobian(xsi, eta, px, py) * meshJac
 
         u = ((-(1-eta) * U - (1-xsi) * V) * px[0]

parcels/field.py

@@ -838,7 +838,7 @@ def from_mom5(cls, filenames, variables, dimensions, indices=None, mesh='spheric
             This flag overrides the allow_time_extrapolation and sets it to False
         tracer_interp_method : str
             Method for interpolation of tracer fields. It is recommended to use 'bgrid_tracer' (default)
-            Note that in the case of from_mom5() and from_bgrid(), the velocity fields are default to 'bgrid_velocity'
+            Note that in the case of from_mom5() and from_b_grid_dataset(), the velocity fields are default to 'bgrid_velocity'
         chunksize :
             size of the chunks in dask loading (Default value = None)
         **kwargs :
@@ -918,7 +918,7 @@ def from_b_grid_dataset(cls, filenames, variables, dimensions, indices=None, mes
             This flag overrides the allow_time_extrapolation and sets it to False
         tracer_interp_method : str
             Method for interpolation of tracer fields. It is recommended to use 'bgrid_tracer' (default)
-            Note that in the case of from_pop() and from_bgrid(), the velocity fields are default to 'bgrid_velocity'
+            Note that in the case of from_pop() and from_b_grid_dataset(), the velocity fields are default to 'bgrid_velocity'
         chunksize :
             size of the chunks in dask loading (Default value = None)
         **kwargs :