Skip to content
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

Remove custom fix for concatenation of aux factories now that bug in iris is solved #2392

Merged
merged 2 commits into from
Apr 10, 2024

Conversation

schlunma
Copy link
Contributor

@schlunma schlunma commented Apr 9, 2024

Description

For at least 6 years, iris dropped derived coordinates (i.e., aux factories) during concatenation (see SciTools/iris#2478). For this reason, we implemented our own custom code to solve this:

def _fix_aux_factories(cube):

Since the issue is solved now since iris 3.5, this PR removes the corresponding custom code in ESMValCore. I did not remove a tiny test that checks if the actual concatenation still works; and indeed, it does (also without our custom code) 🚀

Closes #2284


Before you get started

Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.


To help with the number pull requests:

@schlunma schlunma added the iris Related to the Iris package label Apr 9, 2024
@schlunma schlunma added this to the v2.11.0 milestone Apr 9, 2024
@schlunma schlunma self-assigned this Apr 9, 2024
Copy link

codecov bot commented Apr 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.28%. Comparing base (d128753) to head (f8832e7).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2392      +/-   ##
==========================================
- Coverage   94.29%   94.28%   -0.01%     
==========================================
  Files         246      246              
  Lines       13532    13511      -21     
==========================================
- Hits        12760    12739      -21     
  Misses        772      772              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@valeriupredoi valeriupredoi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fastest review in history? Cheers, Manu! Bit of a shame to destroy so much good code 😭

@schlunma
Copy link
Contributor Author

schlunma commented Apr 10, 2024

Well, the good code is now in iris, so I don't feel too bad about it 😄

@schlunma schlunma merged commit e2c68e7 into main Apr 10, 2024
6 checks passed
@schlunma schlunma deleted the clean_code branch April 10, 2024 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iris Related to the Iris package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove custom concatenation of derived coords now that bug in iris is fixed
2 participants