Skip to content

Commit

Permalink
CI debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronzedwick committed Jan 15, 2025
1 parent f1caa3f commit bfa621b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions test/test_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
gridfile_CSne30 = current_path / "meshfiles" / "ugrid" / "outCSne30" / "outCSne30.ug"
gridfile_fesom = current_path / "meshfiles" / "ugrid" / "fesom" / "fesom.mesh.diag.nc"
gridfile_geoflow = current_path / "meshfiles" / "ugrid" / "geoflow-small" / "grid.nc"
gridfile_mpas = current_path / 'meshfiles' / "mpas" / "QU" / 'mesh.QU.1920km.151026.nc'
gridfile_mpas_two = current_path / 'meshfiles' / "mpas" / "QU" / 'oQU480.231010.nc'
gridfile_geos = current_path / 'meshfiles' / "geos-cs" / "c12" / 'test-c12.native.nc4'
gridfile_mpas_holes = current_path / 'meshfiles' / "mpas" / "QU" / 'oQU480.231010.nc'

Expand Down Expand Up @@ -77,6 +75,7 @@

gridfile_ugrid = current_path / "meshfiles" / "ugrid" / "geoflow-small" / "grid.nc"
gridfile_mpas = current_path / "meshfiles" / "mpas" / "QU" / "mesh.QU.1920km.151026.nc"
gridfile_mpas_two = current_path / 'meshfiles' / "mpas" / "QU" / 'oQU480.231010.nc'
gridfile_exodus = current_path / "meshfiles" / "exodus" / "outCSne8" / "outCSne8.g"
gridfile_scrip = current_path / "meshfiles" / "scrip" / "outCSne8" / "outCSne8.nc"

Expand Down
8 changes: 4 additions & 4 deletions uxarray/grid/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ def inverse_stereographic_projection(x, y, central_lon, central_lat):
return lon, lat


@njit(cache=True)
# @njit(cache=True)
def point_in_face(
edges_xyz,
point_xyz,
Expand Down Expand Up @@ -1651,7 +1651,7 @@ def point_in_face(
return intersection_count % 2 == 1


@njit(cache=True)
# @njit(cache=True)
def _find_faces(face_edge_cartesian, point_xyz, inverse_indices):
"""Finds the faces that contain a given point, inside a subset "face_edge_cartesian"""

Expand Down Expand Up @@ -1693,7 +1693,7 @@ def get_max_face_radius(self):
return max_distance


@njit(cache=True)
# @njit(cache=True)
def calculate_max_face_radius(
face_node_connectivity, node_lats_rad, node_lons_rad, face_lats_rad, face_lons_rad
):
Expand Down Expand Up @@ -1725,7 +1725,7 @@ def calculate_max_face_radius(
return np.max(end_distances)


@njit(cache=True)
# @njit(cache=True)
def haversine_distance(lon_a, lat_a, lon_b, lat_b):
"""Calculates the haversine distance between two points."""

Expand Down
2 changes: 1 addition & 1 deletion uxarray/grid/grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -2461,7 +2461,7 @@ def get_faces_containing_point(self, point_xyz):
face_edge_nodes_xyz = subset.face_edge_nodes_xyz.values

inverse_indices = subset.inverse_indices.face.values

print(inverse_indices)
# Check if any of the faces in the subset contain the point
index = _find_faces(face_edge_nodes_xyz, point_xyz, inverse_indices)

Expand Down

0 comments on commit bfa621b

Please sign in to comment.