Map query point to cartesian x,y,z when mesh type is spherical

Author: fluidnumericsJoe

parcels/_index_search.py

@@ -154,10 +154,10 @@ def uxgrid_point_in_cell(grid, y: np.ndarray, x: np.ndarray, yi: np.ndarray, xi:
         Barycentric coordinates of the points within their respective cells.
     """
     if grid._mesh == "spherical":
-        # lon_rad = np.deg2rad(grid.lon.values)
-        # lat_rad = np.deg2rad(grid.lat.values)
-        # x_cart, y_cart, z_cart = _latlon_rad_to_xyz(lat_rad, lon_rad)
-        # points = np.column_stack((x_cart.flatten(), y_cart.flatten(), z_cart.flatten()))
+        lon_rad = np.deg2rad(x)
+        lat_rad = np.deg2rad(y)
+        x_cart, y_cart, z_cart = _latlon_rad_to_xyz(lat_rad, lon_rad)
+        points = np.column_stack((x_cart.flatten(), y_cart.flatten(), z_cart.flatten()))
 
         # Get the vertex indices for each face
         nids = grid.uxgrid.face_node_connectivity[yi].values
@@ -178,7 +178,7 @@ def uxgrid_point_in_cell(grid, y: np.ndarray, x: np.ndarray, yi: np.ndarray, xi:
             ),
             axis=-1,
         )
-    points = np.stack((x, y))
+        points = np.stack((x, y))
 
     M = len(points)
 

tests/v4/test_particleset_execute.py

@@ -400,8 +400,8 @@ def test_uxstommelgyre_pset_execute():
         dt=np.timedelta64(60, "s"),
         pyfunc=AdvectionEE,
     )
-    assert utils.round_and_hash_float_array([p.lon for p in pset]) == 1165397121
-    assert utils.round_and_hash_float_array([p.lat for p in pset]) == 1142123780
+    assert utils.round_and_hash_float_array([p.lon for p in pset]) == 1165396086
+    assert utils.round_and_hash_float_array([p.lat for p in pset]) == 1142124776
 
 
 @pytest.mark.xfail(reason="Output file not implemented yet")