remove separate u/v mask used for prints #1073
Open
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
travissluka
requested review from
guillaumevernieres,
fmahebert and
kbhargava
fmahebert
reviewed
Sep 20, 2024
| @@ -142,9 +147,9 @@ void Fields::print(std::ostream & os) const { | |||
| const auto & vGhost = atlas::array::make_view<int, 1>(field.functionspace().ghost()); | |||
| const auto & view = atlas::array::make_view<double, 2>(field); | |||
| std::unique_ptr<atlas::array::ArrayView<double, 2> > mask; | |||
| if (field.metadata().getBool("masked")) { | |||
| if (field.metadata().has(MASK_METADATA)) { | |||
There was a problem hiding this comment.
There is similar logic at line ~108 above, in the norm method. Did you want to make the same change there? Or is there a reason I'm missing to treat norm differently from print...
There was a problem hiding this comment.
thanks, you're right, nice catch! My grep skills have seemingly diminished lately.
fmahebert
approved these changes
Sep 21, 2024
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.
Description
In order to keep answers from changing when I did a massive C++ refactoring of fields, I added a hack where the U/V fields had a second mask (the true u/v mask) added to the atlas metadata (this was in addition to the interpolation mask, which was the T mask). So that @fmahebert can make progress with regard to having a single "mask" metadata that the generic algorithms can use, I have removed this second mask.
This only impacts the print statements for U/V fields, not any real results.
This is, again, a bit of a hack, U/V fields should not be using the cell center mask, but this will all get sorted out when u/v de-staggering is re-implemented in the variable changes.
Due to these changes, the convert state application should not be used to do a resolution change with uocn and vocn (or you could still use it, and make sure your results don't have missing values in them, the problem at this point is illegal floating point operations where the u/v and t masks don't line up... fix that some other day)
Testing
The reference values for u and v prints for all tests had to be updated
run-ci-on-draft=true
jedi-ci-test-select=clang