Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Point In Face & Get Faces Containing Point #1056

Merged
merged 104 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
75b88e8
Initial work
aaronzedwick Oct 24, 2024
998aa99
Switched to projection method
aaronzedwick Nov 5, 2024
7d7be67
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 5, 2024
e38ca24
Updated test cases, fixed spherical bug
aaronzedwick Nov 6, 2024
92bab4a
Added test cases
aaronzedwick Nov 6, 2024
354f821
Increased performance
aaronzedwick Nov 6, 2024
5fc59aa
Update test_geometry.py
aaronzedwick Nov 7, 2024
c4a4979
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 7, 2024
3b09973
updated api
aaronzedwick Nov 7, 2024
f7cb51c
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Nov 7, 2024
22e84d5
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 20, 2024
4043c8b
Updated detection method
aaronzedwick Nov 20, 2024
95a0dea
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 21, 2024
5dbed72
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Nov 21, 2024
c1eae89
Implemented new ray casting method
aaronzedwick Nov 21, 2024
586c8ad
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 26, 2024
b33326d
Added node crossing and point on edge checks
aaronzedwick Nov 27, 2024
0acaa2b
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 27, 2024
807ce07
Added docstrings, test case
aaronzedwick Nov 27, 2024
b4eba94
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Nov 27, 2024
fa6fd8c
Update test_geometry.py
aaronzedwick Nov 27, 2024
0092258
Fixed point conversion bug
aaronzedwick Nov 27, 2024
1f6f51b
Update geometry.py
aaronzedwick Nov 27, 2024
5e0477b
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Dec 4, 2024
acce252
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Dec 4, 2024
d88d69f
Converted functions to numba, updated tests accordingly
aaronzedwick Dec 5, 2024
a379a1a
Added max face radius function
aaronzedwick Dec 5, 2024
fefe1e7
Added baseplate code for polygon containing code
aaronzedwick Dec 5, 2024
cc9f943
Added reference point setter
aaronzedwick Dec 6, 2024
73a1be4
Updated to use constructed edges
aaronzedwick Dec 10, 2024
8392e2c
Debugging
aaronzedwick Dec 11, 2024
6fea25e
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Dec 11, 2024
200f4bb
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Dec 16, 2024
e86e81c
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Dec 17, 2024
a6b0dcc
Added unique face test cases
aaronzedwick Dec 18, 2024
36ef299
Fixed test cases, changed to `point_in_face`
aaronzedwick Dec 18, 2024
dc153dc
Convert face containing point to use updated function
aaronzedwick Dec 18, 2024
c5ed371
Added inverse indices, complete get_faces_containing_point
aaronzedwick Jan 2, 2025
d7318de
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Jan 2, 2025
ab18797
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Jan 2, 2025
47843d8
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Jan 9, 2025
845cca6
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Jan 9, 2025
88a602f
Updated to use inverse face indices
aaronzedwick Jan 9, 2025
c28772a
Fixed failing tests
aaronzedwick Jan 9, 2025
e055327
Moved function location
aaronzedwick Jan 9, 2025
46cecc4
Fixed circular import
aaronzedwick Jan 10, 2025
5dba109
Update grid.py
aaronzedwick Jan 10, 2025
d297a9e
updated comment
aaronzedwick Jan 13, 2025
bff6cd5
updated max_face_radius to handle variable face sizes
aaronzedwick Jan 13, 2025
67ea7b2
updated haversine and added test
aaronzedwick Jan 13, 2025
ce354fd
Added benchmark, made max_face_radius attribute for better performance
aaronzedwick Jan 14, 2025
7eeef4e
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Jan 14, 2025
98a676d
Fixed benchmark
aaronzedwick Jan 14, 2025
66fba3d
added property, update benchmark
aaronzedwick Jan 14, 2025
f1caa3f
updated benchmark
aaronzedwick Jan 15, 2025
bfa621b
CI debugging
aaronzedwick Jan 15, 2025
274591c
Fixed indexing problem
aaronzedwick Jan 15, 2025
5f66225
added normalize to ensure consistency
aaronzedwick Jan 15, 2025
4c97d18
Add spherical support for `faces_containing_point`, added docs, api, …
aaronzedwick Jan 16, 2025
a14286a
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Jan 16, 2025
60964fe
Fixed test cases
aaronzedwick Jan 16, 2025
e7721ae
Fixed test attempt #2
aaronzedwick Jan 16, 2025
a16b652
Fixed error with improper coordinates
aaronzedwick Jan 22, 2025
8239123
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Jan 28, 2025
5ea0911
Updated method of subsetting and test case
aaronzedwick Jan 28, 2025
bbb7b90
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Jan 28, 2025
23cdc74
pre-commit
aaronzedwick Jan 28, 2025
32ecaf4
fixed tests
aaronzedwick Jan 28, 2025
a3ba55c
Update test_grid.py
aaronzedwick Jan 28, 2025
f974db4
Added notebook
aaronzedwick Jan 28, 2025
2d7dcc7
Update point_in_face.ipynb
aaronzedwick Jan 28, 2025
ebfb0dd
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Jan 31, 2025
0638cfb
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Feb 3, 2025
bcb9f17
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Feb 4, 2025
37feaee
Merge branch 'main' into zedwick/point-in-polygon
rajeeja Feb 4, 2025
fdb28e4
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Feb 4, 2025
568689c
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Feb 5, 2025
44406e2
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Feb 5, 2025
3175c53
Added tests, updated numba, fixed bug
aaronzedwick Feb 5, 2025
683e2cc
Merge branch 'zedwick/point-in-polygon' of https://github.com/UXARRAY…
aaronzedwick Feb 5, 2025
ef22d37
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Feb 6, 2025
6557c93
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Feb 7, 2025
a93b79a
Addressed review comments
aaronzedwick Feb 7, 2025
76acbc9
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Feb 11, 2025
c20a147
Added error tolerance for points close to nodes
aaronzedwick Feb 12, 2025
2e3dc71
turned numba on
aaronzedwick Feb 12, 2025
63d6d8d
Fixed numba issues, updated error tolerance
aaronzedwick Feb 18, 2025
4937cd2
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Feb 20, 2025
34067b0
Update uxarray/grid/grid.py
aaronzedwick Feb 24, 2025
aeb88a9
Update uxarray/grid/grid.py
aaronzedwick Feb 24, 2025
f904b8f
Update uxarray/grid/grid.py
aaronzedwick Feb 24, 2025
7c3cda3
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Feb 24, 2025
e9e63fb
Updated warning and docstring
aaronzedwick Feb 25, 2025
a42fa2f
Added better comments
aaronzedwick Feb 25, 2025
33cf087
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Feb 25, 2025
d9d2fcc
Updated docstrings
aaronzedwick Feb 25, 2025
b69af29
Updated method to take both coordinate systems, updated tests and doc…
aaronzedwick Feb 28, 2025
406dfd8
Merge branch 'main' into zedwick/point-in-polygon
philipc2 Mar 3, 2025
d09dbcd
Update docs/userguide.rst
aaronzedwick Mar 4, 2025
1b3699b
Added examples to docstring
aaronzedwick Mar 4, 2025
b6c194d
Update docs/userguide.rst
aaronzedwick Mar 4, 2025
820c0c2
update example in docstring
philipc2 Mar 4, 2025
31b6e0f
Update grid.py
aaronzedwick Mar 4, 2025
250d318
Update uxarray/grid/grid.py
aaronzedwick Mar 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions benchmarks/mpas_ocean.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from pathlib import Path

import numpy as np
from polars.testing.parametric import dtypes

import uxarray as ux

Expand Down Expand Up @@ -194,6 +195,31 @@ def time_const_lat(self, resolution, lat_step):
self.uxgrid.cross_section.constant_latitude(lat)


class PointInPolygon:
param_names = ['resolution']
params = ['480km', '120km']

def setup(self, resolution):
self.uxgrid = ux.open_grid(file_path_dict[resolution][0])
self.uxgrid.normalize_cartesian_coordinates()

# Construct variables needed to ensure that the benchmark doesn't measure construction time
_ = self.uxgrid.face_edge_connectivity
_ = self.uxgrid.face_x.values
_ = self.uxgrid.face_lon.values

point = np.array([0.0, 0.0, 1.0])
res = self.uxgrid.get_faces_containing_point(point)

def teardown(self, resolution):
del self.uxgrid

def time_face_search(self, resolution):
point_xyz = np.array([self.uxgrid.face_x[0].values, self.uxgrid.face_y[0].values, self.uxgrid.face_z[0].values], dtype=np.float64)
point_lonlat = np.array([self.uxgrid.face_lon[0].values, self.uxgrid.face_lat.values[0]], dtype=np.float64)
self.uxgrid.get_faces_containing_point(point_xyz=point_xyz, point_lonlat=point_lonlat)


class ZonalAverage(DatasetBenchmark):
def setup(self, resolution, *args, **kwargs):
self.uxds = ux.open_dataset(file_path_dict[resolution][0], file_path_dict[resolution][1])
Expand Down
2 changes: 2 additions & 0 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ Descriptors
Grid.partial_sphere_coverage
Grid.global_sphere_coverage
Grid.triangular
Grid.max_face_radius

Attributes
~~~~~~~~~~
Expand All @@ -159,6 +160,7 @@ Methods
Grid.calculate_total_face_area
Grid.normalize_cartesian_coordinates
Grid.construct_face_centers
Grid.get_faces_containing_point

Inheritance of Xarray Functionality
-----------------------------------
Expand Down
299 changes: 284 additions & 15 deletions test/test_geometry.py

Large diffs are not rendered by default.

Loading
Loading