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

Dual Mesh Construction #859

Open
wants to merge 78 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
78 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
eeb6c62
Fixed pre-commit
aaronzedwick Sep 10, 2024
7ab0cdb
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 17, 2024
03bc8b7
Update mpas_ocean.py
aaronzedwick Sep 17, 2024
3e0a197
Added warnings
aaronzedwick Sep 17, 2024
8c44fb0
Fixed test failures
aaronzedwick Sep 17, 2024
bc88eaf
Merge branch 'main' into zedwick/dual_mesh
philipc2 Sep 17, 2024
6612f56
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 17, 2024
e827b52
Updated notebook and jit
aaronzedwick Sep 19, 2024
af98a0a
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 24, 2024
149aaa5
Merge branch 'zedwick/dual_mesh' of https://github.com/UXARRAY/uxarra…
aaronzedwick Sep 24, 2024
b8750fc
Merge pre-commit fix
aaronzedwick Sep 24, 2024
4931f3f
Merge branch 'main' into zedwick/dual_mesh
aaronzedwick Sep 27, 2024
6f6d981
Merge branch 'main' into zedwick/dual_mesh
philipc2 Sep 27, 2024
853ece5
Merge branch 'main' into zedwick/dual_mesh
rajeeja Oct 1, 2024
d7b09f2
Updated notebook
aaronzedwick Oct 2, 2024
5ab7b10
Update Dual Notebook
aaronzedwick Oct 2, 2024
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
3 changes: 1 addition & 2 deletions benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@

// List of branches to benchmark. If not provided, defaults to "master"
// (for git) or "default" (for mercurial).
"branches": ["main"], // for git
// "branches": ["default"], // for mercurial
"branches": ["default"], // for mercurial
aaronzedwick marked this conversation as resolved.
Show resolved Hide resolved

// The DVCS being used. If not set, it will be automatically
// determined from "repo" by looking at the protocol in the URL
Expand Down
15 changes: 15 additions & 0 deletions benchmarks/mpas_ocean.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def time_dataarray_to_polycollection(self, resolution, periodic_elements):


class ConstructTreeStructures:

param_names = ['resolution']
params = ['480km', '120km']

Expand Down Expand Up @@ -164,3 +165,17 @@ def time_nearest_neighbor_remapping(self):

def time_inverse_distance_weighted_remapping(self):
self.uxds_480["bottomDepth"].remap.inverse_distance_weighted(self.uxds_120.uxgrid)


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

def setup(self, resolution):
self.uxds = ux.open_dataset(file_path_dict[resolution][0], file_path_dict[resolution][1])

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

def time_dual_mesh_construction(self, resolution):
self.uxds.uxgrid.compute_dual(method="global")
3 changes: 3 additions & 0 deletions docs/internal_api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ Validation
grid.validation._check_connectivity
grid.validation._check_duplicate_nodes
grid.validation._check_area
grid.validation._check_duplicate_nodes_indices
grid.validation._find_duplicate_nodes


Accurate Computing Utils
------------------------
Expand Down
Loading
Loading