remove the duplicate call for face_edges_cartesian calculation

Author: hongyuchen1030

test/test_geometry.py

@@ -12,7 +12,7 @@
 from uxarray.grid.coordinates import _populate_node_latlon, _lonlat_rad_to_xyz, _normalize_xyz, _xyz_to_lonlat_rad, \
     _xyz_to_lonlat_deg, _xyz_to_lonlat_rad_scalar
 from uxarray.grid.arcs import extreme_gca_latitude, extreme_gca_z
-from uxarray.grid.utils import _get_cartesian_face_edge_nodes, _get_lonlat_rad_face_edge_nodes
+from uxarray.grid.utils import _get_cartesian_faces_edge_nodes, _get_lonlat_rad_faces_edge_nodes
 
 from uxarray.grid.geometry import _populate_face_latlon_bound, _populate_bounds, _pole_point_inside_polygon_cartesian, \
     stereographic_projection, inverse_stereographic_projection, point_in_face, haversine_distance
@@ -1184,14 +1184,9 @@ def test_point_inside():
     grid = ux.open_grid(grid_mpas_2)
 
     # Get the face edges of all faces in the grid
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     # Loop through each face
     for i in range(grid.n_face):
@@ -1209,14 +1204,9 @@ def test_point_outside():
     grid = ux.open_grid(grid_mpas_2)
 
     # Get the face edges of all faces in the grid
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     # Set the point as the face center of a different face than the face tested
     point_xyz = np.array([grid.face_x[1].values, grid.face_y[1].values, grid.face_z[1].values])
@@ -1232,14 +1222,9 @@ def test_point_on_node():
     grid = ux.open_grid(grid_mpas_2)
 
     # Get the face edges of all faces in the grid
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     # Set the point as a node
     point_xyz = np.array([*faces_edges_cartesian[0][0][0]])
@@ -1263,14 +1248,9 @@ def test_point_inside_close():
 
     # Create the grid and face edges
     grid = ux.Grid.from_face_vertices(vertices_lonlat, latlon=True)
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     # Use point in face to determine if the point is inside or out of the face
     assert point_in_face(faces_edges_cartesian[0], point_xyz=point, inclusive=False)
@@ -1288,14 +1268,9 @@ def test_point_outside_close():
 
     # Create the grid and face edges
     grid = ux.Grid.from_face_vertices(vertices_lonlat, latlon=True)
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     # Use point in face to determine if the point is inside or out of the face
     assert not point_in_face(faces_edges_cartesian[0], point_xyz=point, inclusive=False)
@@ -1312,14 +1287,9 @@ def test_face_at_pole():
 
     # Create the grid and face edges
     grid = ux.Grid.from_face_vertices(vertices_lonlat, latlon=True)
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     assert point_in_face(faces_edges_cartesian[0], point_xyz=point, inclusive=True)
 
@@ -1334,14 +1304,9 @@ def test_face_at_antimeridian():
 
     # Create the grid and face edges
     grid = ux.Grid.from_face_vertices(vertices_lonlat, latlon=True)
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     assert point_in_face(faces_edges_cartesian[0], point_xyz=point, inclusive=True)
 
@@ -1357,14 +1322,9 @@ def test_face_normal_face():
 
     # Create the grid and face edges
     grid = ux.Grid.from_face_vertices(vertices_lonlat, latlon=True)
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     assert point_in_face(faces_edges_cartesian[0], point_xyz=point, inclusive=True)
 

test/test_helpers.py

@@ -11,7 +11,7 @@
 from uxarray.constants import INT_DTYPE, INT_FILL_VALUE
 from uxarray.grid.coordinates import _lonlat_rad_to_xyz, _normalize_xyz, _xyz_to_lonlat_rad
 from uxarray.grid.arcs import point_within_gca, _angle_of_2_vectors, in_between
-from uxarray.grid.utils import _get_cartesian_face_edge_nodes, _get_lonlat_rad_face_edge_nodes
+from uxarray.grid.utils import _get_cartesian_faces_edge_nodes, _get_lonlat_rad_faces_edge_nodes
 from uxarray.grid.geometry import pole_point_inside_polygon, _pole_point_inside_polygon_cartesian
 
 try:
@@ -273,9 +273,8 @@ def test_get_cartesian_face_edge_nodes_pipeline():
     node_y = grid.node_y.values
     node_z = grid.node_z.values
 
-    face_edges_connectivity_cartesian = _get_cartesian_face_edge_nodes(
-        face_node_conn, n_face, n_max_face_edges, node_x, node_y, node_z
-    )
+    face_edges_connectivity_cartesian = _get_cartesian_faces_edge_nodes(face_node_conn, n_face, n_max_face_edges,
+                                                                        node_x, node_y, node_z)
 
     result = _pole_point_inside_polygon_cartesian(
         'North', face_edges_connectivity_cartesian[0]
@@ -298,9 +297,8 @@ def test_get_cartesian_face_edge_nodes_filled_value():
     node_y = grid.node_y.values
     node_z = grid.node_z.values
 
-    face_edges_connectivity_cartesian = _get_cartesian_face_edge_nodes(
-        face_node_conn, n_face, n_max_face_edges, node_x, node_y, node_z
-    )
+    face_edges_connectivity_cartesian = _get_cartesian_faces_edge_nodes(face_node_conn, n_face, n_max_face_edges,
+                                                                        node_x, node_y, node_z)
 
     result = _pole_point_inside_polygon_cartesian(
         'North', face_edges_connectivity_cartesian[0]
@@ -335,9 +333,8 @@ def test_get_cartesian_face_edge_nodes_filled_value2():
     node_y = np.array([v0_cart[1],v1_cart[1],v2_cart[1],v3_cart[1],v4_cart[1]])
     node_z = np.array([v0_cart[2],v1_cart[2],v2_cart[2],v3_cart[2],v4_cart[2]])
 
-    face_edges_connectivity_cartesian = _get_cartesian_face_edge_nodes(
-        face_node_conn, n_face, n_max_face_edges, node_x, node_y, node_z
-    )
+    face_edges_connectivity_cartesian = _get_cartesian_faces_edge_nodes(face_node_conn, n_face, n_max_face_edges,
+                                                                        node_x, node_y, node_z)
 
     correct_result = np.array([
         [
@@ -368,9 +365,8 @@ def test_get_lonlat_face_edge_nodes_pipeline():
     node_lon = grid.node_lon.values
     node_lat = grid.node_lat.values
 
-    face_edges_connectivity_lonlat = _get_lonlat_rad_face_edge_nodes(
-        face_node_conn, n_face, n_max_face_edges, node_lon, node_lat
-    )
+    face_edges_connectivity_lonlat = _get_lonlat_rad_faces_edge_nodes(face_node_conn, n_face, n_max_face_edges,
+                                                                      node_lon, node_lat)
 
     face_edges_connectivity_lonlat = face_edges_connectivity_lonlat[0]
     face_edges_connectivity_cartesian = []
@@ -398,9 +394,8 @@ def test_get_lonlat_face_edge_nodes_filled_value():
     node_lon = grid.node_lon.values
     node_lat = grid.node_lat.values
 
-    face_edges_connectivity_lonlat = _get_lonlat_rad_face_edge_nodes(
-        face_node_conn, n_face, n_max_face_edges, node_lon, node_lat
-    )
+    face_edges_connectivity_lonlat = _get_lonlat_rad_faces_edge_nodes(face_node_conn, n_face, n_max_face_edges,
+                                                                      node_lon, node_lat)
 
     face_edges_connectivity_lonlat = face_edges_connectivity_lonlat[0]
     face_edges_connectivity_cartesian = []
@@ -434,9 +429,8 @@ def test_get_lonlat_face_edge_nodes_filled_value2():
     node_lon = np.array([v0_rad[0],v1_rad[0],v2_rad[0],v3_rad[0],v4_rad[0]])
     node_lat = np.array([v0_rad[1],v1_rad[1],v2_rad[1],v3_rad[1],v4_rad[1]])
 
-    face_edges_connectivity_lonlat = _get_lonlat_rad_face_edge_nodes(
-        face_node_conn, n_face, n_max_face_edges, node_lon, node_lat
-    )
+    face_edges_connectivity_lonlat = _get_lonlat_rad_faces_edge_nodes(face_node_conn, n_face, n_max_face_edges,
+                                                                      node_lon, node_lat)
 
     correct_result = np.array([
         [

test/test_integrate.py

@@ -19,7 +19,7 @@
     _get_faces_constLat_intersection_info, _zonal_face_weights, \
     _zonal_face_weights_robust
 
-from uxarray.grid.utils import _get_cartesian_face_edge_nodes
+from uxarray.grid.utils import _get_cartesian_faces_edge_nodes
 
 current_path = Path(os.path.dirname(os.path.realpath(__file__)))
 
@@ -1037,14 +1037,9 @@ def test_compare_zonal_weights():
     for gridfile in gridfiles:
         uxgrid = ux.open_grid(gridfile)
         n_nodes_per_face = uxgrid.n_nodes_per_face.values
-        face_edge_nodes_xyz =  _get_cartesian_face_edge_nodes(
-                uxgrid.face_node_connectivity.values,
-                uxgrid.n_face,
-                uxgrid.n_max_face_edges,
-                uxgrid.node_x.values,
-                uxgrid.node_y.values,
-                uxgrid.node_z.values,
-            )
+        face_edge_nodes_xyz = _get_cartesian_faces_edge_nodes(uxgrid.face_node_connectivity.values, uxgrid.n_face,
+                                                              uxgrid.n_max_face_edges, uxgrid.node_x.values,
+                                                              uxgrid.node_y.values, uxgrid.node_z.values)
         bounds = uxgrid.bounds.values
 
         for i, lat in enumerate(latitudes):

test/test_intersections.py

@@ -161,20 +161,16 @@ def test_GCA_GCA_north_pole_angled():
 
 def test_GCA_edge_intersection_count():
 
-    from uxarray.grid.utils import _get_cartesian_face_edge_nodes
+    from uxarray.grid.utils import _get_cartesian_faces_edge_nodes
 
     # Generate a normal face that is not crossing the antimeridian or the poles
     vertices_lonlat = [[29.5, 11.0], [29.5, 10.0], [30.5, 10.0], [30.5, 11.0]]
     vertices_lonlat = np.array(vertices_lonlat)
 
     grid = ux.Grid.from_face_vertices(vertices_lonlat, latlon=True)
-    face_edge_nodes_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values)
+    face_edge_nodes_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                                grid.n_max_face_edges, grid.node_x.values,
+                                                                grid.node_y.values, grid.node_z.values)
 
     face_center_xyz = np.array([grid.face_x.values[0], grid.face_y.values[0], grid.face_z.values[0]], dtype=np.float64)
     north_pole_xyz = np.array([0.0, 0.0, 1.0], dtype=np.float64)

uxarray/core/zonal.py

@@ -19,7 +19,7 @@ def _compute_non_conservative_zonal_mean(uxda, latitudes, use_robust_weights=Fal
         result = np.zeros(shape, dtype=uxda.dtype)
 
     bounds = uxgrid.bounds.values
-    faces_edges_cartesian = uxgrid.face_edges_cartesian.values
+    faces_edges_cartesian = uxgrid.faces_edges_cartesian.values
 
     for i, lat in enumerate(latitudes):
         face_indices = uxda.uxgrid.get_faces_at_constant_latitude(lat)

uxarray/grid/geometry.py

@@ -29,8 +29,8 @@
     gca_gca_intersection,
 )
 from uxarray.grid.utils import (
-    _get_cartesian_face_edge_nodes,
-    _get_lonlat_rad_face_edge_nodes,
+    _get_cartesian_faces_edge_nodes,
+    _get_lonlat_rad_faces_edge_nodes,
 )
 from uxarray.utils.computing import allclose, isclose
 
@@ -1346,42 +1346,10 @@ def compute_temp_latlon_array(
     return temp_latlon_array
 
 
-def _populate_face_edges_cartesian(grid, return_array=False):
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
-
-    faces_edges_cartesian_xarray = xr.DataArray(
-        faces_edges_cartesian,
-        dims=["n_face", "n_max_face_edges", "two", "three"],
-        attrs={
-            "cf_role": "face_edges_cartesian",
-            "_FillValue": INT_FILL_VALUE,
-            "long_name": "Provide the Cartesian coordinates of the edge for each face",
-            "start_index": INT_DTYPE(0)
-        },
-    )
-
-    if return_array:
-        return faces_edges_cartesian_xarray
-    else:
-        grid._ds["face_edges_cartesian"] = faces_edges_cartesian_xarray
-
-
 def _populate_faces_edges_cartesian(grid, return_array=False):
-    faces_edges_cartesian = _get_cartesian_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_x.values,
-        grid.node_y.values,
-        grid.node_z.values,
-    )
+    faces_edges_cartesian = _get_cartesian_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                            grid.n_max_face_edges, grid.node_x.values,
+                                                            grid.node_y.values, grid.node_z.values)
 
     faces_edges_cartesian_xarray = xr.DataArray(
         faces_edges_cartesian,
@@ -1401,13 +1369,9 @@ def _populate_faces_edges_cartesian(grid, return_array=False):
 
 
 def _populate_faces_edges_spherical(grid, return_array=False):
-    faces_edges_lonlat_rad = _get_lonlat_rad_face_edge_nodes(
-        grid.face_node_connectivity.values,
-        grid.n_face,
-        grid.n_max_face_edges,
-        grid.node_lon.values,
-        grid.node_lat.values,
-    )
+    faces_edges_lonlat_rad = _get_lonlat_rad_faces_edge_nodes(grid.face_node_connectivity.values, grid.n_face,
+                                                              grid.n_max_face_edges, grid.node_lon.values,
+                                                              grid.node_lat.values)
 
     faces_edges_lonlat_rad_xarray = xr.DataArray(
         faces_edges_lonlat_rad,

uxarray/grid/grid.py

@@ -14,7 +14,7 @@
     Tuple,
 )
 
-from uxarray.grid.utils import _get_cartesian_face_edge_nodes
+from uxarray.grid.utils import _get_cartesian_faces_edge_nodes
 
 # reader and writer imports
 from uxarray.io._exodus import _read_exodus, _encode_exodus
@@ -2664,14 +2664,10 @@ def get_faces_containing_point(
             return np.empty(0, dtype=np.int64)
 
         # Get the faces in terms of their edges
-        face_edge_nodes_xyz = _get_cartesian_face_edge_nodes(
-            subset.face_node_connectivity.values,
-            subset.n_face,
-            subset.n_max_face_nodes,
-            subset.node_x.values,
-            subset.node_y.values,
-            subset.node_z.values,
-        )
+        # Since this is a new subset, the cartesian_faces_edge_nodes need to be recalculated anyway
+        face_edge_nodes_xyz = _get_cartesian_faces_edge_nodes(subset.face_node_connectivity.values, subset.n_face,
+                                                              subset.n_max_face_nodes, subset.node_x.values,
+                                                              subset.node_y.values, subset.node_z.values)
 
         # Get the original face indices from the subset
         inverse_indices = subset.inverse_indices.face.values