Bugfix for #3696 #5382
Merged
Bugfix for #3696 #5382
Conversation
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
stephenworsley
requested changes
Jul 20, 2023
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #5382 +/- ##
==========================================
+ Coverage 89.37% 89.39% +0.01%
==========================================
Files 89 89
Lines 22426 22433 +7
Branches 5379 5381 +2
==========================================
+ Hits 20043 20053 +10
+ Misses 1637 1635 -2
+ Partials 746 745 -1
☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Looks good! I think one last thing I forgot to mention was a what's new entry (to go somewhere here, probably in "features"). This can either go in this PR or as part of its own PR (which is sometimes worth doing if there are many simultaneous PRs going in which could cause each other conflicts). Otherwise I'm happy to pull this one in.
stephenworsley
approved these changes
Jul 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Following #3696, which left the user confused about how concatenation interfaced with cube overlap, added a more explicit error message if you try to use concatenate_cube to concatenate two cubes with overlapping coordinates and added warning if you use regular concatenate so the user understands why they remain separate.
New test added for the error message and all tests pass.
Consult Iris pull request check list