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

Bilinear Remapping #1016

Open
wants to merge 208 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
5a4e46d
Added dual mesh initial support
aaronzedwick Jul 17, 2024
058662b
Updated Mesh Construction Method
aaronzedwick Jul 19, 2024
c2d2ab7
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Jul 19, 2024
5890270
Removed Old Files
aaronzedwick Jul 19, 2024
96a61b8
Merge branch 'zedwick/dual_mesh' of https://github.com/UXARRAY/uxarra…
aaronzedwick Jul 19, 2024
6b2468b
Updated API added comprehensive test
aaronzedwick Jul 22, 2024
5d1f918
Fixed pre-commit
aaronzedwick Jul 22, 2024
cd2f643
Merge branch 'main' into zedwick/dual_mesh
philipc2 Jul 23, 2024
8d61fe9
optimize code
philipc2 Jul 24, 2024
39a0902
update dual mesh construction and duplicate node validation
philipc2 Jul 25, 2024
09efe64
progress on migrating implementation to Grid
philipc2 Jul 25, 2024
fe221f7
Testing Notebook
aaronzedwick Jul 26, 2024
eea2157
Update Untitled.ipynb
aaronzedwick Jul 26, 2024
39d43b1
Updated Notebook
aaronzedwick Jul 26, 2024
366a5f7
Update dual-mesh.ipynb
aaronzedwick Jul 26, 2024
098ef2b
Update Notebook
aaronzedwick Jul 26, 2024
f223941
Update docs
aaronzedwick Jul 26, 2024
75b6f65
Update dual-mesh.ipynb
aaronzedwick Jul 26, 2024
b628c8e
Merge branch 'main' into zedwick/dual_mesh
philipc2 Jul 29, 2024
1dffe37
Updated Merge Duplicate Nodes and cleaned up code
aaronzedwick Jul 29, 2024
62291c5
Added Duplicate Nodes Test
aaronzedwick Aug 2, 2024
24a7ece
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Aug 2, 2024
914db53
Duplicate nodes error, updated index, fix codecov,
aaronzedwick Aug 2, 2024
b01756a
Merge branch 'zedwick/dual_mesh' of https://github.com/UXARRAY/uxarra…
aaronzedwick Aug 2, 2024
2494008
Fixed pre-commit
aaronzedwick Aug 2, 2024
7c91d52
fixed duplicate check
aaronzedwick Aug 2, 2024
9d880f9
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Aug 6, 2024
abf7556
Moved to dual.py remove duplication merge
aaronzedwick Aug 6, 2024
fe909af
Updated API and Benchmarks
aaronzedwick Aug 6, 2024
dbb935c
Updated face construction and ordering
aaronzedwick Aug 6, 2024
314e877
Optimization and clean up
aaronzedwick Aug 6, 2024
558f871
Update dual-mesh.ipynb
aaronzedwick Aug 7, 2024
0b22e4f
Updated userguide.rst
aaronzedwick Aug 7, 2024
5dd4f81
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Aug 9, 2024
dd354e3
Fixed pre-commit
aaronzedwick Aug 9, 2024
7cbecdf
Update docs/userguide.rst
aaronzedwick Aug 12, 2024
c87554b
Added docstrings
aaronzedwick Aug 16, 2024
7f8c50e
Update dual.py
aaronzedwick Aug 16, 2024
692cb03
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Aug 16, 2024
8778b80
Merge branch 'main' into zedwick/dual_mesh
philipc2 Aug 16, 2024
cbfdb74
Added dual mesh support of DataArrays
aaronzedwick Aug 20, 2024
7a02c55
Fixed asv config file
aaronzedwick Aug 20, 2024
65c7b5a
Added name to data array
aaronzedwick Aug 21, 2024
e3bdd6a
Fixed constructed node face connectivity error
aaronzedwick Aug 21, 2024
374770e
Updated user guide
aaronzedwick Aug 22, 2024
acc4a42
Fixed docs
aaronzedwick Aug 22, 2024
a73a2de
Removed method parameter
aaronzedwick Sep 3, 2024
68a082d
Added support for UxDatasets
aaronzedwick Sep 4, 2024
9219579
Update dual user guide
aaronzedwick Sep 4, 2024
9657d8e
Update index.rst
aaronzedwick Sep 4, 2024
4e039bc
Updated Test Cases
aaronzedwick Sep 4, 2024
c0feb34
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 4, 2024
cda5e96
Update test_grid.py
aaronzedwick Sep 4, 2024
0667e0d
Merge branch 'zedwick/dual_mesh' of https://github.com/UXARRAY/uxarra…
aaronzedwick Sep 4, 2024
f690a3e
Updated colormaps
aaronzedwick Sep 4, 2024
25ee56e
pre-commit fix
aaronzedwick Sep 4, 2024
bdadd23
Notebook Update
aaronzedwick Sep 5, 2024
4ff128d
Update dual-mesh.ipynb
aaronzedwick Sep 5, 2024
c1bd224
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 10, 2024
2db6390
Update dual-mesh.ipynb
aaronzedwick Sep 10, 2024
e1d9621
Fixed Dimension Bug
aaronzedwick Sep 10, 2024
a870c20
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 10, 2024
3dcc6f5
Added bilinear.py
aaronzedwick Sep 10, 2024
eeb6c62
Fixed pre-commit
aaronzedwick Sep 10, 2024
dd13f3c
Merge branch 'zedwick/dual_mesh' into zedwick/bilinear-remapping
aaronzedwick Sep 10, 2024
4645083
Added bilinear weights function
aaronzedwick Sep 11, 2024
72de87a
Working on fixing errors
aaronzedwick Sep 17, 2024
324d043
Fixed bilinear weights calculation error
aaronzedwick Sep 17, 2024
12e2f1c
Pre-commit run
aaronzedwick Sep 19, 2024
d1c5c92
Added cartesian support and node edge support
aaronzedwick Sep 19, 2024
9bdce8a
Update bilinear.py
aaronzedwick Sep 20, 2024
cb3c9e8
Testing Notebook
aaronzedwick Sep 20, 2024
a4f5cbc
initial code for finding polygon containing point
aaronzedwick Sep 28, 2024
5e12a05
Added `get_max_face_radius`
aaronzedwick Oct 9, 2024
6a21586
Updated tolerance
aaronzedwick Oct 10, 2024
9f06371
Updated support for mesh with holes and spherical coords
aaronzedwick Oct 14, 2024
786c914
pre-commit
aaronzedwick Oct 14, 2024
1db878a
Initial point in triangle
aaronzedwick Oct 17, 2024
1ffc62c
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Oct 17, 2024
95b481f
Fixed merge issues
aaronzedwick Oct 17, 2024
3b79afb
Remove leftover checkpoint
aaronzedwick Oct 17, 2024
1c85080
Updated test cases
aaronzedwick Oct 17, 2024
e16e25a
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Oct 17, 2024
c0587f4
Fixed notebook, added numba speedup
aaronzedwick Oct 17, 2024
18a6e30
Update remapping.ipynb
aaronzedwick Oct 17, 2024
bee4b5c
Merge branch 'main' into zedwick/bilinear-remapping
philipc2 Oct 23, 2024
75b88e8
Initial work
aaronzedwick Oct 24, 2024
a3fbad5
Testing point in polygon
aaronzedwick Oct 29, 2024
2e296d4
Merge branch 'zedwick/point-in-polygon' into zedwick/bilinear-remapping
aaronzedwick Oct 29, 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
3518e91
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Nov 7, 2024
140fa95
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Nov 7, 2024
4baf718
Update bilinear.py
aaronzedwick Nov 7, 2024
f1e36e9
Merge branch 'zedwick/point-in-polygon' into zedwick/bilinear-remapping
aaronzedwick Nov 7, 2024
b4b73d7
Updating search
aaronzedwick Nov 12, 2024
9302919
Update geometry.py
aaronzedwick Nov 19, 2024
22e84d5
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Nov 20, 2024
4043c8b
Updated detection method
aaronzedwick Nov 20, 2024
e411553
Fixed bilinear calculation
aaronzedwick Nov 21, 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
4d009d6
Added edge case checks
aaronzedwick Nov 27, 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
634f92e
Delete leftover file
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
856451f
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Dec 16, 2024
200f4bb
Merge branch 'main' into zedwick/point-in-polygon
aaronzedwick Dec 16, 2024
02f44a8
Updated polygon search handling
aaronzedwick Dec 16, 2024
6fae82d
Added support for non triangular dual mesh faces
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
9d78eee
Update bilinear.py
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
82fd957
Merge branch 'main' into zedwick/bilinear-remapping
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
2e7bb38
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Jan 15, 2025
1f5ee4e
Merge branch 'zedwick/point-in-polygon' into zedwick/bilinear-remapping
aaronzedwick Jan 15, 2025
a750eb9
Update bilinear.py
aaronzedwick Jan 15, 2025
5f66225
added normalize to ensure consistency
aaronzedwick Jan 15, 2025
ef56b0d
Added test, fixed errors
aaronzedwick Jan 15, 2025
b8833cd
Merge branch 'zedwick/point-in-polygon' into zedwick/bilinear-remapping
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
162ec4e
Merge branch 'zedwick/point-in-polygon' into zedwick/bilinear-remapping
aaronzedwick Jan 30, 2025
18937c6
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Feb 6, 2025
18ed51b
Merge fixes
aaronzedwick Mar 5, 2025
0aba63c
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Mar 5, 2025
b318a58
Fixed merging issues
aaronzedwick Mar 5, 2025
b29b103
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 5, 2025
03d4955
Remove parameter coord_type
aaronzedwick Mar 5, 2025
dc528df
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 10, 2025
e66d1dc
Merge branch 'main' into zedwick/bilinear-remapping
philipc2 Mar 10, 2025
e44bbb8
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 10, 2025
84ec4cf
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 11, 2025
224ebbf
Merge branch 'main' into zedwick/bilinear-remapping
philipc2 Mar 11, 2025
3500676
Integrated weighting functions, fixed bugs
aaronzedwick Mar 12, 2025
9fb385a
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Mar 12, 2025
e5e4f83
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 17, 2025
ada86c8
testing and bug fixes
aaronzedwick Mar 18, 2025
e30ebd8
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 18, 2025
ae050bf
Added tests, bug fixes, deprecated destination_obj
aaronzedwick Mar 18, 2025
c823acd
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Mar 18, 2025
0a3ddb1
Updated docs and api
aaronzedwick Mar 18, 2025
40f33f3
added cartesian barycentric coordinate function
aaronzedwick Mar 21, 2025
ffe1de7
Update geometry.py
aaronzedwick Mar 21, 2025
7091114
Merge branch 'main' into zedwick/bilinear-remapping
aaronzedwick Mar 21, 2025
679999d
Merge branch 'main' into zedwick/bilinear-remapping
philipc2 Mar 25, 2025
4cdf2b1
fixed user guide
aaronzedwick Mar 25, 2025
1434aca
Merge branch 'zedwick/bilinear-remapping' of https://github.com/UXARR…
aaronzedwick Mar 25, 2025
b68ce47
Fixed failing tests
aaronzedwick Mar 25, 2025
e60bf21
Updated weights function to use numba and be more efficient
aaronzedwick Mar 25, 2025
8651c02
Updated weights to calculate properly
aaronzedwick Mar 27, 2025
b73f25d
Pre-commit
aaronzedwick Mar 27, 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
Prev Previous commit
Next Next commit
Fixed failing tests
aaronzedwick committed Mar 25, 2025
commit b68ce470f291f7305b68025658e44a8c089e510e
2 changes: 0 additions & 2 deletions uxarray/grid/neighbors.py
Original file line number Diff line number Diff line change
@@ -995,8 +995,6 @@ def _barycentric_coordinates(nodes, point):
a2 = max(_triangle_area(point, vi, vi1), ERROR_TOLERANCE)
sum_wi += a0 / (a1 * a2)
w.append(a0 / (a1 * a2))
if sum_wi == 0:
return np.zeros(n)
barycentric_coords = [w_i / sum_wi for w_i in w]

return barycentric_coords