Bug fix for unit conversion error in ccpp_prebuild.py (variables that are slices of a n+1 dimensional array have wrong allocation) #600
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
…ix wrong name of subroutines in diagnostic error messages, set thread number and thread counter to safe values when running over the entire domain
…ive and conditionally-allocated variables
…so that pointers can reference them, their children, or slices of their arrays
…mporary (group cap) variables of rank n that correspond to a slice of an n+1 dimensional array have the right dimensions in the assigment calls and subroutine call list
climbfuji
commented
Oct 9, 2024
climbfuji
requested review from
gold2718,
dustinswales,
mwaxmonsky,
peverwhee,
grantfirl and
mkavulich
as code owners
This was referenced Oct 11, 2024
grantfirl
approved these changes
Oct 18, 2024
9 tasks
|
Tests are done at ufs-community/ufs-weather-model#2463. @grantfirl @dustinswales Can you merge this pr? |
|
@mkavulich @dustinswales We need another approval before we can merge this. |
mkavulich
reviewed
Oct 22, 2024
|
There are also mismatched parens in the other new test schemes, I assume due to copy-paste |
|
I can fix those parentheses - I don't think it is necessary to retest with UFS, since all the "bugs" are in test_prebuild/... ? @grantfirl @dustinswales ? |
|
Done in f80f9c9. Here is the output of |
climbfuji
force-pushed
the
bugfix/unit_conv_invalid_allocation_prebuild
branch
from
ce21c6f
to
f80f9c9
Compare
mkavulich
approved these changes
Oct 22, 2024
Thanks for spotting those. I am also surprised that this only gave warnings, not errors. |
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
Bug fix in
scripts/mkstatic.py: definedim_string_allocateso that temporary (group cap) variables of ranknthat correspond to a slice of ann+1dimensional array have the right dimensions in the assignment calls and subroutine call lists. See the inline documentation added inmkstatic.pyaround line 1476 for more information.Addition of test
test_prebuild/test_unit_convto test for the above and to test for thecapgenissue reported in Unit conversion bug when variable is used by two different schemes (with different units) #594 (Unit conversion bug when variable is used by two different schemes with different units). Note thatccpp_prebuild.pydid not suffer from this bug, but I wanted to make sure that we test for it.In the development of the new test
test_unit_conv, I discovered that we should declare all incoming host variables in the group caps astarget. This is because it is tricky in prebuild to determine that a parent variablebarneeds to have thetargetattribute in case a slice of it has the active attribute. This is a bit of an edge case, but I believe this additional attribute is safe. I will run full UFS RTs with this PR to check if the results are b4b or if the addition oftargetcauses the compiler to optimize differently.Minor updates to
test_prebuid/{test_blocked_data,test_chunked_data}: fix wrong name of subroutines in diagnostic error messages, set thread number and thread counter to safe values when running over the entire domain.User interface changes?: No
Resolves #598
Testing:
test removed: n/a
unit tests: docstring tests not run, since the files that are modified in this PR do not have docstring tests
system tests: CI tests all pass
manual testing:
1. Ran
test_prebuild/run_all_tests.shon my laptop withgcc@13.3.0andopenmpi/5.0.32. Ran full regression tests with ufs-weather-model on Hera, all tests passed. See ufs-community/ufs-weather-model#2464 and NOAA-EMC/fv3atm#878