-
Notifications
You must be signed in to change notification settings - Fork 297
Fix merge: assign cell measures and ancillary variables to correct dimensions #6688
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
Open
rcomer
wants to merge
1
commit into
SciTools:main
Choose a base branch
from
rcomer:merge-cell_measures
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+23
−2
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
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #6688 +/- ##
=======================================
Coverage 90.29% 90.29%
=======================================
Files 91 91
Lines 24465 24467 +2
Branches 4568 4568
=======================================
+ Hits 22090 22092 +2
Misses 1607 1607
Partials 768 768 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
c2590ea
to
64f80f2
Compare
⏱️ Performance Benchmark Report: 1e8e4adPerformance shifts
Full benchmark results
Generated by GHA run |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
benchmark_this
Request that this pull request be benchmarked to check if it introduces performance shifts
Feature: Merge/Concatenate
Type: Bug
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 #2076
The problem was that merge tries to add the cell measure to the same dimension that it had on the input cubes. This is wrong, because the new dimension[s] are added to the start. So we need to add an offset in the same way that is already done for coordinates. The problem was not picked up by the tests because the output cube there was square (2 by 2) and there was no check for which dimension the cell measure was on. By adding a third cube in the test input, we reproduce the error shown in the issue.
Also made equivalent change for ancillary variables.
Full disclosure: the list comprehensions and most of the what's new entry were written by Copilot.
Consult Iris pull request check list
Add any of the below labels to trigger actions on this PR: