Merge main into feature capgen 2021/11/05#414
Merged
climbfuji merged 15 commits intoNov 7, 2021
Merged
Conversation
Cleanup cmake build
Remove Julie from CODEOWNERS
…ew --debug capability to add array size comparisons in auto-generated caps. Updates to formatting of auto-generated caps (no code changes)
Rename --debug flag to --verbose, add new debugging capability to detect array size mismatches, pretty-print auto-generated caps
…d ccpp_prebuild scripts
…move_optional_arguments_from_ccpp
…from_ccpp Remove optional arguments from CCPP (capgen metadata parser and ccpp_prebuild scripts)
climbfuji
commented
Nov 5, 2021
| >>> Var({'local_name' : 'foo', 'standard_name' : 'hi_mom', 'units' : 'm s-1', 'dimensions' : '()', 'type' : 'real', 'intent' : 'ino'}, ParseSource('vname', 'SCHEME', ParseContext()), _MVAR_DUMMY_RUN_ENV) #doctest: +IGNORE_EXCEPTION_DETAIL | ||
| Traceback (most recent call last): | ||
| ParseSyntaxError: Invalid intent variable property, 'ino', at <standard input>:1 | ||
| >>> Var({'local_name' : 'foo', 'standard_name' : 'hi_mom', 'units' : 'm/s', 'dimensions' : '()', 'type' : 'real', 'intent' : 'in', 'optional' : 'false'}, ParseSource('vname', 'SCHEME', ParseContext()), _MVAR_DUMMY_RUN_ENV) #doctest: +IGNORE_EXCEPTION_DETAIL |
Collaborator
Author
There was a problem hiding this comment.
I added this explicitly so that we know for sure that the parser will throw an exception of old metadata with an optional attribute is found.
climbfuji
added a commit
to climbfuji/ccpp-framework
that referenced
this pull request
Nov 10, 2021
…pgen_20211105 Merge main into feature capgen 2021/11/05
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
2 participants
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
Merge main into feature capgen 2021/11/05
Updates include:
ccpp_prebuildscriptsccpp_prebuildscriptsccpp_prebuildcmake buildmetavar.py, update call to parse_metadata_file in prebuild'smetadata_parser.pyAll changes except commits 0159166 and ee22e68 have been reviewed and approved before they were merged into main.
User interface changes?: No
Testing:
test/run_test.shpassesPYTHONPATH=$PWD/scripts:$PWD/scripts/parse_tools pytestpassesAfter this PR is merged, I will create the reverse PR to update main with the refactored feature/capgen code. That merge will bring the bug fixes for invalid units in fv3atm and ccpp-physics into the authoritative repositories.
A surprisingly clean merge.