Update develop from main 2024/12/05 #616
Merged
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
… are slices of a n+1 dimensional array have wrong allocation) (NCAR#600) ## Description 1. Bug fix in `scripts/mkstatic.py`: define `dim_string_allocate` so that temporary (group cap) variables of rank `n` that correspond to a slice of an `n+1` dimensional array have the right dimensions in the assignment calls and subroutine call lists. See the inline documentation added in `mkstatic.py` around line 1476 for more information. 2. Addition of test `test_prebuild/test_unit_conv` to test for the above and to test for the `capgen` issue reported in NCAR#594 (Unit conversion bug when variable is used by two different schemes with different units). Note that `ccpp_prebuild.py` did not suffer from this bug, but I wanted to make sure that we test for it. 3. In the development of the new test `test_unit_conv`, I discovered that we should declare all incoming host variables in the group caps as `target`. This is because it is tricky in prebuild to determine that a parent variable `bar` needs to have the `target` attribute 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 of `target` causes the compiler to optimize differently. 4. 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.
Update `main` with latest commits from `develop`
climbfuji
requested review from
gold2718,
dustinswales,
mwaxmonsky,
peverwhee,
grantfirl and
mkavulich
as code owners
gold2718
approved these changes
Dec 5, 2024
| @@ -0,0 +1,98 @@ | |||
| #------------------------------------------------------------------------------ | |||
| cmake_minimum_required(VERSION 3.10) | |||
There was a problem hiding this comment.
I know this is a straightforward merge but perhaps this should be updated sometime?
There was a problem hiding this comment.
Certainly. I can go through all files after this update and bump the minimum version to what is in the top-level CMakeLists.txt.
|
Can we get more reviews for this PR, please? It's needed to in so that other updates can be pushed from NEPTUNE. Thanks! |
grantfirl
reviewed
Dec 9, 2024
| # Definitions # | ||
| ############################################################################### | ||
|
|
||
| HOST_MODEL_IDENTIFIER = "FV3" |
There was a problem hiding this comment.
It's a little weird that the host model identifier is FV3 since this is a unit test that arguably has nothing to do with FV3.
There was a problem hiding this comment.
I know, it's always been like that. Will go away when prebuild dies ....
grantfirl
approved these changes
Dec 9, 2024
peverwhee
approved these changes
Dec 9, 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.
Now that we merged #615, it is time to update develop from main to pull in the few ccpp-prebuild updates that went straight into main. Must be merged as a regular merge, not as a squash merge.