-
Notifications
You must be signed in to change notification settings - Fork 46
Non-Conservative Zonal Mean #785
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
Closed
Closed
Changes from 2 commits
Commits
Show all changes
115 commits
Select commit
Hold shift + click to select a range
6c9f2bc
set up boiler plate
philipc2 786f221
update zonal mean boilerplate
philipc2 0627541
Merge branch 'main' into zonal-mean
philipc2 fb1e82f
Merge branch 'main' into zonal-mean
philipc2 73a05d2
Add functions implementation description
hongyuchen1030 8b3aefb
update string
hongyuchen1030 1c9711f
Merge branch 'main' into zonal-mean
philipc2 bfdf8f7
Merge branch 'main' into zonal-mean
philipc2 c43489e
add boilerplate for user guide section
philipc2 b10787b
implement _get_candidate_faces_at_constant_latitude
amberchen122 c9e02eb
Merge branch 'main' into zonal-mean
philipc2 8fc9f51
change input to zonal.py in api
amberchen122 3982151
Merge branch 'main' into zonal-mean
philipc2 40c878e
Optimizing _get_cartesian_face_edge_nodes
hongyuchen1030 efe2ead
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
hongyuchen1030 55ab278
debug for _get_cartesian_single_face_edge_nodes
hongyuchen1030 89761f4
update the `_get_cartesian_face_edge_nodes`
hongyuchen1030 eddbc95
initial commit
hongyuchen1030 386e92d
Finished implementation
hongyuchen1030 c1418ee
Fixed faces with holes
hongyuchen1030 98044b3
Fix precommit
hongyuchen1030 365009f
Merge branch 'Optimized-`get_cartesian_face_edge_nodes`and`get_lonlat…
hongyuchen1030 d672ef2
finished zonal_mean implimentation using the new _get_cartesian_face_…
amberchen122 dd95be2
set dimension of returning uxda
amberchen122 40bab03
Merge branch 'main' into zonal-mean
philipc2 3319f1c
handle zero candidate faces case
amberchen122 417f2c3
initial commit for test_zonal
amberchen122 2839310
Merge branch 'main' into zonal-mean
philipc2 afd2909
placeholder
amberchen122 f52b3c6
user defined latitude range
amberchen122 e2d291f
update api
amberchen122 7eb648b
user guide
amberchen122 bc4544c
zonal unit test mocking _get_zonal_faces_weight_at_constLat
amberchen122 7f05938
correct internal api directory
amberchen122 662f873
update interface
amberchen122 b7f7ab0
Merge branch 'main' into zonal-mean
philipc2 7eadff8
update `_get_cartesian_face_edge_nodes` calls
amberchen122 f2ff2b7
Revert "update `_get_cartesian_face_edge_nodes` calls"
amberchen122 4d2c8de
Merge branch 'main' into zonal-mean
hongyuchen1030 a2b5df2
update zonal desc
amberchen122 904fd4c
Merge remote-tracking branch 'origin/main' into zonal-mean
amberchen122 0a93fdd
change interface to include single lat
amberchen122 24db7df
Add Fill value testcase
hongyuchen1030 8f2175e
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
hongyuchen1030 e4ab62d
file test case
amberchen122 5423283
Merge remote-tracking branch 'upstream/zonal-mean' into zonal-mean
hongyuchen1030 47c5a8f
Add file testcase
hongyuchen1030 cf4fb1b
Merge branch 'main' into zonal-mean
hongyuchen1030 d983429
debug
hongyuchen1030 de2bf23
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
hongyuchen1030 c6707e4
Fix the zonal_mean bug
hongyuchen1030 4111e01
update user guide+latitude coordinate
amberchen122 f7c4dbe
file test
amberchen122 d59c520
Merge branch 'main' into zonal-mean
hongyuchen1030 e6c5f97
Force commit of ignored .nc files
amberchen122 e45cd3c
file values test
amberchen122 e85c7a3
initial fix for the i`is_ppole_point_inside`
hongyuchen1030 efa0317
Fix the face_weight calculation at the pole
hongyuchen1030 202b622
fix duplicate intersection point
hongyuchen1030 ebac890
fix no converge intersection point
hongyuchen1030 8515ddb
everthing pass for file `outCSne3`
hongyuchen1030 8dc2b9f
clean up
hongyuchen1030 0cc6750
add pole point testcase
hongyuchen1030 e402695
add raise runtime error for query near pole
amberchen122 99a6a73
add away from pole points test case
hongyuchen1030 ab605b1
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
hongyuchen1030 0ce60d8
Add pole point test case
hongyuchen1030 3064a34
typofix
hongyuchen1030 f73f53f
add equator
hongyuchen1030 6337ac4
add warning user
hongyuchen1030 342f94b
fix pole location logic
amberchen122 c794400
clean up
amberchen122 4fdc9aa
typo
amberchen122 6da3bea
update userguide.rst
amberchen122 11bf855
clean up
amberchen122 07aeffc
consistant naming for constLat
amberchen122 cbf9490
todo: right ground truth
amberchen122 266b71b
correct ground truth
amberchen122 00a4988
fix `pt_within_gca`
hongyuchen1030 bb70917
Merge branch 'main' into zonal-mean
hongyuchen1030 9f0db6e
orgnize test files into new folder
amberchen122 b423fe3
remove test files
amberchen122 e6811bc
Merge branch 'main' into zonal-mean
hongyuchen1030 154d2e0
update test_api
amberchen122 9a5d6e7
separate constants
amberchen122 d8e28a1
Merge branch 'main' into zonal-mean
hongyuchen1030 7d3010e
fix `_is_pole_inside`
hongyuchen1030 67ec68c
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
hongyuchen1030 617ffc7
Merge branch 'main' into zonal-mean
hongyuchen1030 4d42882
remove invalid testcase
hongyuchen1030 1ce4acc
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
hongyuchen1030 859bbde
zonal average across multiple dimensions, update user guide
philipc2 805160b
add new data variable to showcase zonal average
philipc2 2f0e3c2
Merge branch 'zonal-mean' of https://github.com/UXARRAY/uxarray into …
philipc2 6f82887
add benchmark for zonal mean
philipc2 e85bcba
add zonal average user guide to index
philipc2 0847a1f
Merge branch 'main' into zonal-mean
philipc2 bd905db
Merge branch 'main' of https://github.com/UXARRAY/uxarray into zonal-…
amberchen122 f1a51c1
fix typo
amberchen122 d51b843
Merge branch 'main' into zonal-mean
philipc2 9b37229
Update test_integrate.py
amberchen122 f012bc0
workaround the precision issues again
hongyuchen1030 9a67080
fix precommit
amberchen122 f4385b1
add option to disable fma
philipc2 cd0a29c
update benchmarks
philipc2 8a704c5
Merge branch 'main' into zonal-mean
philipc2 861c8f7
update ZonalMean benchmarks
philipc2 064a465
use numba isclose
philipc2 b6be73d
use numba cross and dot in newton solver
philipc2 837542e
Merge branch 'main' into zonal-mean
hongyuchen1030 aaa7c7a
Merge branch 'main' into zonal-mean
philipc2 4e647b2
Merge branch 'main' into zonal-mean
philipc2 869b17e
remove test file
amberchen122 d00a971
update zonal_mean signiture to explicitly accept two types
amberchen122 c307959
correct var name
amberchen122 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import numpy as np | ||
|
|
||
|
|
||
| def _non_conservative_zonal_mean_constant_latitude( | ||
| data: np.ndarray, lat: float | ||
| ) -> np.ndarray: | ||
| # consider that the data being fed into this function may have multiple non-grid dimensions | ||
| # (i.e. (time, level, n_face) | ||
| # this shouldn't lead to any issues, but need to make sure that once you get to the point | ||
| # where you obtain the indices of the faces you will be using for the zonal average, the indexing | ||
| # is done properly along the final dimensions | ||
| # i.e. data[..., face_indicies_at_constant_lat] | ||
|
|
||
| # TODO: obtain indices of the faces we will be considering for the zonal mean | ||
|
|
||
| # the returned array should have the same leading dimensions and a final dimension of one, indicating the mean | ||
| # (i.e. (time, level, 1) | ||
|
|
||
| return None | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.