-
Notifications
You must be signed in to change notification settings - Fork 55
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
Implement area calculation for footprint of 3D objects #378
Merged
w-k-jones
merged 49 commits into
tobac-project:RC_v1.5.x
from
w-k-jones:3d_area_calculation
Mar 15, 2024
Merged
Changes from all commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
cd3dfaa
Reorganise imports
w-k-jones 8a13960
Reorganise imports
w-k-jones f2086c8
Restructure analysis module
w-k-jones a0c2ed9
Move distance, velocity and area functions to analysis.spatial
w-k-jones 8f3b6e9
Move distance, velocity and area functions to analysis.spatial
w-k-jones b2f92ca
Rename init file in analysis to fix import issues
w-k-jones fb3731a
Update setup.py to automatically find package names
w-k-jones e353f93
Reorganise imports in setup.py
w-k-jones 00c1c38
Add collapse_axis keyword to get_statistics, allowing one or more axe…
w-k-jones 029eccd
Add collapse_dims keyword to get_statistics_from_mask, allowing one o…
w-k-jones 100f2a6
Update calculate_area to use bulk statistics
w-k-jones 7d16627
Change order of input checks in get_statistics to raise correct error…
w-k-jones 1f56e2d
Reorganise imports and remove unused
w-k-jones 361a1f3
Remove broadcasting warning
w-k-jones 4a8f049
Add test for calculate_area with 1D lat/lon coords
w-k-jones 68f2f54
Add tests for area calculation using 1D and 2D lat/lon coords
w-k-jones 35313bf
Merge branch 'RC_v1.5.x' of https://github.com/climate-processes/toba…
w-k-jones 929483f
Update pylint workflow to trigger on pull_request_target
w-k-jones e49dfff
Update docstring
w-k-jones 3bc9ebe
Fix wrong ordering of x/y coords in calculate_area
w-k-jones 2403c8c
merge the latest version of the RTD back-integration branch into the …
fsenf 7fdb65c
bufix in Idealized-Case-1 notebook:
fsenf 9b1298a
Update analysis package srtucture, separate cell and feature analysis…
w-k-jones b208274
Resolve import errors
w-k-jones 6088505
Merge changes from RC_v1.5.x
w-k-jones 17f32a4
Reformatting
w-k-jones d2f704f
Update formatting check to show version of black that is used
w-k-jones 91871bf
Reformat with black version 22.10
w-k-jones 4cf994f
Resolve merge conflicts
w-k-jones b9d084e
Merge branch 'fsenf-bugfix-area-calculation' into 3d_area_calculation
w-k-jones 7380442
Rerun idealised case notebook
w-k-jones 26334c9
Add xarray_to_iris decorator to calculate_areas, remove explicit conv…
w-k-jones 66d664c
Rename mask to segment_labels and correct description of segmentation…
w-k-jones b77d21b
Reformatting
w-k-jones 3bc47ca
fix issues with decorators
freemansw1 99b1bf8
Fix merge conflicts from RC_v1.5.x
w-k-jones a49a692
Merge changes from freemansw1/fix_1.5.x_issues
w-k-jones 01c324e
Add new conversion function for iris cubes to handle error with integ…
w-k-jones 7f31002
Formatting
w-k-jones 7d393b4
Update API reference docs for analysis package and add all utils subm…
w-k-jones 9a6b560
Add tests for decorators
w-k-jones ba68e2a
Add tests for calculate_distance and calculate_velocity_individual
w-k-jones db09d7e
Add test for calculate_velocity
w-k-jones 242d0de
Add tests for calculate_nearestneighbordistance
w-k-jones 313f024
Add tests for lat/lon area and exception handling in calculate_area
w-k-jones 683aff0
Fix coordinate/dim naming clash
w-k-jones 388d123
Fix test catching wrong exception
w-k-jones 6563569
Fix wrong coordinate name in calculate_area
w-k-jones a5f126e
Clarify tests for invalid lat/lon and add test for 3D lat/lon
w-k-jones 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 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 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
489 changes: 96 additions & 393 deletions
489
examples/Basics/Idealized-Case-1_Tracking-of-a-Test-Blob-in-2D.ipynb
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this is a good change. I've been caught by this more than a few times.