Merge branch 'main' into zedwick/bilinear-remapping

Author: rajeeja

.github/workflows/ci.yml

@@ -75,7 +75,7 @@ jobs:
 
       - name: Upload code coverage to Codecov
         if: github.repository == 'UXARRAY/uxarray'
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v5.4.2
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.11.5
+  rev: v0.11.6
   hooks:
     - id: ruff
       name: lint with ruff

docs/examples/visualization/mpas_topology.ipynb

@@ -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_face_edge_nodes_array, _get_lonlat_rad_face_edge_nodes_array
 from uxarray.grid.geometry import pole_point_inside_polygon, _pole_point_inside_polygon_cartesian
 
 try:
@@ -41,7 +41,7 @@ def test_face_area_coords():
     face_dimension = np.array([3], dtype=INT_DTYPE)
 
     area, _ = ux.grid.area.get_all_face_area_from_coords(
-        x, y, z, face_nodes, face_dimension, 3, coords_type="cartesian")
+        x, y, z, face_nodes, face_dimension)
     nt.assert_almost_equal(area, constants.TRI_AREA, decimal=5)
 
 
@@ -54,12 +54,12 @@ def test_calculate_face_area():
     z = np.array([0.66674712, 0.43462917, 0.66674712])
 
     area, _ = ux.grid.area.calculate_face_area(
-        x, y, z, "gaussian", 5, "cartesian", latitude_adjusted_area=False)
+        x, y, z, "gaussian", 5, latitude_adjusted_area=False)
 
     nt.assert_almost_equal(area, constants.TRI_AREA, decimal=5)
 
     area_corrected, _ = ux.grid.area.calculate_face_area(
-        x, y, z, "gaussian", 5, "cartesian", latitude_adjusted_area=True)
+        x, y, z, "gaussian", 5, latitude_adjusted_area=True)
 
     nt.assert_almost_equal(area_corrected, constants.CORRECTED_TRI_AREA, decimal=5)
 
@@ -273,7 +273,7 @@ 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_edges_connectivity_cartesian = _get_cartesian_face_edge_nodes_array(
         face_node_conn, n_face, n_max_face_edges, node_x, node_y, node_z
     )
 
@@ -298,7 +298,7 @@ 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_edges_connectivity_cartesian = _get_cartesian_face_edge_nodes_array(
         face_node_conn, n_face, n_max_face_edges, node_x, node_y, node_z
     )
 
@@ -335,7 +335,7 @@ 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_edges_connectivity_cartesian = _get_cartesian_face_edge_nodes_array(
         face_node_conn, n_face, n_max_face_edges, node_x, node_y, node_z
     )
 
@@ -368,7 +368,7 @@ 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_edges_connectivity_lonlat = _get_lonlat_rad_face_edge_nodes_array(
         face_node_conn, n_face, n_max_face_edges, node_lon, node_lat
     )
 
@@ -398,7 +398,7 @@ 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_edges_connectivity_lonlat = _get_lonlat_rad_face_edge_nodes_array(
         face_node_conn, n_face, n_max_face_edges, node_lon, node_lat
     )
 
@@ -434,7 +434,7 @@ 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_edges_connectivity_lonlat = _get_lonlat_rad_face_edge_nodes_array(
         face_node_conn, n_face, n_max_face_edges, node_lon, node_lat
     )
 

docs/user-guide/area_calc.ipynb

@@ -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_face_edge_nodes_array
 
 current_path = Path(os.path.dirname(os.path.realpath(__file__)))
 
@@ -1037,7 +1037,7 @@ 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(
+        face_edge_nodes_xyz =  _get_cartesian_face_edge_nodes_array(
                 uxgrid.face_node_connectivity.values,
                 uxgrid.n_face,
                 uxgrid.n_max_face_edges,

test/test_geometry.py

@@ -161,14 +161,14 @@ 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_face_edge_nodes_array
 
     # 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(
+    face_edge_nodes_cartesian = _get_cartesian_face_edge_nodes_array(
         grid.face_node_connectivity.values,
         grid.n_face,
         grid.n_max_face_edges,

test/test_helpers.py

@@ -2,7 +2,7 @@
 import numpy as np
 
 from uxarray.grid.integrate import _zonal_face_weights, _zonal_face_weights_robust
-from uxarray.grid.utils import _get_cartesian_face_edge_nodes
+from uxarray.grid.utils import _get_cartesian_face_edge_nodes_array
 
 
 def _compute_non_conservative_zonal_mean(uxda, latitudes, use_robust_weights=False):
@@ -17,7 +17,7 @@ def _compute_non_conservative_zonal_mean(uxda, latitudes, use_robust_weights=Fal
         # Create a NumPy array for storing results
         result = np.zeros(shape, dtype=uxda.dtype)
 
-    faces_edge_nodes_xyz = _get_cartesian_face_edge_nodes(
+    faces_edge_nodes_xyz = _get_cartesian_face_edge_nodes_array(
         uxgrid.face_node_connectivity.values,
         uxgrid.n_face,
         uxgrid.n_max_face_nodes,

test/test_integrate.py

@@ -2,7 +2,6 @@
 from numba import njit
 
 from uxarray.constants import ERROR_TOLERANCE
-from uxarray.grid.coordinates import _lonlat_rad_to_xyz
 
 
 @njit(cache=True)
@@ -12,7 +11,6 @@ def calculate_face_area(
     z,
     quadrature_rule="gaussian",
     order=4,
-    coords_type="spherical",
     latitude_adjusted_area=False,
 ):
     """Calculate area of a face on sphere.
@@ -38,9 +36,6 @@ def calculate_face_area(
             - Gaussian Quadrature: 1 to 10
             - Triangular: 1, 4, 8, 10 and 12
 
-    coords_type : str, optional
-        coordinate type, default is spherical, can be cartesian also.
-
     latitude_adjusted_area : bool, optional
         If True, performs the check if any face consists of an edge that has constant latitude, modifies the area of that face by applying the correction term due to that edge. Default is False.
 
@@ -64,24 +59,6 @@ def calculate_face_area(
 
     # num triangles is two less than the total number of nodes
     num_triangles = num_nodes - 2
-
-    # TODO: Remove/clarify option for spherical coordinates
-    if coords_type == "spherical":
-        # Preallocate arrays for Cartesian coordinates
-        n_points = len(x)
-        x_cartesian = np.empty(n_points)
-        y_cartesian = np.empty(n_points)
-        z_cartesian = np.empty(n_points)
-
-        # Convert all points to Cartesian coordinates using an explicit loop
-        for i in range(n_points):
-            lon_rad = np.deg2rad(x[i])
-            lat_rad = np.deg2rad(y[i])
-            cartesian = _lonlat_rad_to_xyz(lon_rad, lat_rad)
-            x_cartesian[i], y_cartesian[i], z_cartesian[i] = cartesian
-
-        x, y, z = x_cartesian, y_cartesian, z_cartesian
-
     # Using tempestremap GridElements: https://github.com/ClimateGlobalChange/tempestremap/blob/master/src/GridElements.cpp
     # loop through all sub-triangles of face
     total_correction = 0.0
@@ -198,10 +175,8 @@ def get_all_face_area_from_coords(
     z,
     face_nodes,
     face_geometry,
-    dim,
     quadrature_rule="triangular",
     order=4,
-    coords_type="spherical",
     latitude_adjusted_area=False,
 ):
     """Given coords, connectivity and other area calculation params, this
@@ -222,18 +197,12 @@ def get_all_face_area_from_coords(
     face_nodes : 2D ndarray, required
          node ids of each face
 
-    dim : int, required
-         dimension
-
     quadrature_rule : str, optional
         "triangular" or "gaussian". Defaults to triangular
 
     order : int, optional
         count or order for Gaussian or spherical resp. Defaults to 4 for spherical.
 
-    coords_type : str, optional
-        coordinate type, default is spherical, can be cartesian also.
-
     latitude_adjusted_area : bool, optional
         If True, performs the check if any face consists of an edge that has constant latitude, modifies the area of that face by applying the correction term due to that edge. Default is False.
 
@@ -255,13 +224,7 @@ def get_all_face_area_from_coords(
     for face_idx, max_nodes in enumerate(face_geometry):
         face_x = x[face_nodes[face_idx, 0:max_nodes]]
         face_y = y[face_nodes[face_idx, 0:max_nodes]]
-
-        # check if z dimension
-
-        if dim > 2:
-            face_z = z[face_nodes[face_idx, 0:max_nodes]]
-        else:
-            face_z = face_x * 0.0
+        face_z = z[face_nodes[face_idx, 0:max_nodes]]
 
         # After getting all the nodes of a face assembled call the  cal. face area routine
         face_area, face_jacobian = calculate_face_area(
@@ -270,7 +233,6 @@ def get_all_face_area_from_coords(
             face_z,
             quadrature_rule,
             order,
-            coords_type,
             latitude_adjusted_area,
         )
         # store current face area