Drop model-native variable attributes from CMORised output - #697
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #697 +/- ##
=======================================
+ Coverage 78.8% 78.8% +0.1%
=======================================
Files 41 41
Lines 9070 9078 +8
Branches 1692 1694 +2
=======================================
+ Hits 7143 7154 +11
+ Misses 1592 1589 -3
Partials 335 335
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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
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.
Closes #696
What this does
Adds
_MODEL_NATIVE_VARIABLE_ATTRIBUTES(8 attributes, from a 30,373-filescan) and
_drop_model_native_attributes()tobase.py, called once at theend of
update_attributes()in the atmosphere, ocean and sea-ice CMORisers.The redundant
pop("um_stash_source")inatmosphere.pyis removed.Two decisions worth reviewing
It sweeps every variable, not just
self.cmor_name. That is the actualbug: the old pop never reached auxiliary variables, which is why
clwandorogstill shippedum_stash_sourcein released files.It is a denylist, not an allowlist. An allowlist would silently drop
coordinates,units_metadataandformula_terms— required CF metadata thatvaries by variable and grid.
grid_mappingis deliberately kept; it islegitimate on projected grids.
The helper must run after
_check_calendar(), which readscalendar_typetoinfer the MOM calendar before it is removed. Both constraints are in the
docstring.
Validation
Five variables covering all four attribute sources, CMORised before and after
from real archives: