(main) ccpp_prebuild: fix hardcoded name of ccpp_t host variable, update CCPP stub, fix capgen unit tests #498
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
…e information from host model
…rrect path to TEST_FILE
climbfuji
requested review from
grantfirl,
gold2718 and
mkavulich
as code owners
climbfuji
requested review from
peverwhee,
nusbaume,
mwaxmonsky and
dustinswales
dustinswales
approved these changes
Sep 7, 2023
peverwhee
approved these changes
Sep 7, 2023
climbfuji
deleted the
feature/remove_ccpp_hardcoded_name_and_update_stub
branch
|
thanks for the quick turnaround! |
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.
Turns out the CCPP stub in directory
stubis currently broken inmain, following an earlier PR.This PR fixes the problem in the
ccpp_prebuild.pycode by removing the hardcoded name of the CCPP data (typeccpp_tvariable and replacing it with the actual name from the host model that gets passed to the group caps through the API and suite cap.I took this opportunity to replace the ugly in-source build of the CCPP stub with an out-of-source build.
And while testing I discovered that the capgen unit tests are also broken ... simple fix in this PR included.
Note that each part of this PR is a separate commit so that individual parts can easily be identified cherry-picked, if necessary (thus this PR should be a merge commit, not a squash merge).
User interface changes?: No
Fixes: #496
Fixes #497
Testing:
test removed: 0
unit tests:
- ccpp_prebuild tests in
testspass- capgen tests in
testpasssystem tests:
- none conducted - someone needs to test this with the ufs-weather-model and the ccpp-scm (I expect no impact) @dustinswales @grantfirl @mkavulich is this something you can help with?
manual testing:
- ccpp-framework stub instructions work