Refactor shape masking #6129
Merged
Refactor shape masking #6129
+2,362
−688
Conversation
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
Member
|
From @SciTools/peloton : discussed what we are seeing here and in #6126. |
Contributor
Author
|
Discussion with @acchamber notes:
|
Contributor
Author
|
What are @SciTools/peloton (@pp-mo) thoughts about adding This would facilitate better handling of shapes to rasters (which is essentially the problem we're solving) with the added bonus that we could also mask to other shape types, like lines, to extract a trajectory from a Cube, for example. |
Contributor
Contributor
Author
I was planning on going to the AVD surgery this week to discuss some changes and/or make the case for rasterio |
Contributor
|
Thanks for your patience everyone. It's sometimes a struggle to balance everything and we just haven't had an opportunity to discuss this. Coming to the Surgery (UK Met Office) is an ideal next step. |
Contributor
|
@pp-mo, @trexfeathers and @stephenworsley have discussed this at the Surgery and agree in principle that we could consider adding rasterio as an optional dependency. |
Contributor
|
From @SciTools/peloton: would @hsteptoe and @acchamber appreciate any more input from core devs at this point? |
Contributor
Author
I just need to find more time, which is in short supply as we get near the end of FY... |
Contributor
Author
|
This is now ready for some initial (alpha?) testing 🎉. @acchamber are you available to try out the new features? (Updates to docs etc. will follow if this is successful) Tests are incomplete are should not be review yet. This is a fairly substantial re-write. New/improved features include:
There are some breaking changes, principally moving away from having a My informal tests so far show working behaviour for iris test data from |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6129 +/- ##
==========================================
+ Coverage 90.30% 90.36% +0.05%
==========================================
Files 91 91
Lines 24674 24720 +46
Branches 4623 4632 +9
==========================================
+ Hits 22282 22337 +55
+ Misses 1620 1610 -10
- Partials 772 773 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
⏱️ Performance Benchmark Report: b6002b8Performance shiftsFull benchmark resultsGenerated by GHA run |
trexfeathers
requested changes
Oct 24, 2025
Contributor
trexfeathers
left a comment
trexfeathers
left a comment
There was a problem hiding this comment.
End-of-review! Thanks again @hsteptoe
Contributor
⏱️ Performance Benchmark Report: 014dfd9Performance shiftsFull benchmark resultsGenerated by GHA run |
Contributor
⏱️ Performance Benchmark Report: ac2074cPerformance shiftsFull benchmark resultsGenerated by GHA run |
Contributor
⏱️ Performance Benchmark Report: d2f5052Performance shiftsFull benchmark resultsGenerated by GHA run |
trexfeathers
requested changes
Oct 28, 2025
Contributor
trexfeathers
left a comment
trexfeathers
left a comment
There was a problem hiding this comment.
Getting very close now!
trexfeathers
approved these changes
Oct 29, 2025
Contributor
trexfeathers
left a comment
trexfeathers
left a comment
There was a problem hiding this comment.
Superb work @hsteptoe. This has been a real odyssey. Will be a great addition to the 3.14 release.
Contributor
⏱️ Performance Benchmark Report: 0576227Performance shiftsFull benchmark resultsGenerated by GHA run |
trexfeathers
dismissed
scitools-ci[bot]’s stale review
This request was triggered by changes to pyproject.toml, which may have needed an update to the pyproject.toml template as well. Owing to uncertainty around templating, the pyproject.toml changes were backed out.
Contributor
Author
|
@acchamber @markgrahamdawson @mo-DanCubbon Confirming that the new shape masking will be available in Iris 3.14 🎉 |
Contributor
Author
@trexfeathers Thanks for all your help and advice in getting it over the line 🙌 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
🚀 Pull Request
Description
Fixes #6126 by exposing the shape geometry to the user. Adds to docs and docstrings to make it clearer how to use this.
Consult Iris pull request check list
Add any of the below labels to trigger actions on this PR: