Skip to content

CCPP framework update and metadata bug fixes#745

Merged
climbfuji merged 22 commits into
ufs-community:developfrom
climbfuji:merge_feature_capgen_into_main_20210812
Aug 18, 2021
Merged

CCPP framework update and metadata bug fixes#745
climbfuji merged 22 commits into
ufs-community:developfrom
climbfuji:merge_feature_capgen_into_main_20210812

Conversation

@climbfuji
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji commented Aug 12, 2021

PR Checklist

  • Ths PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.

  • This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

  • An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
    are specified below.

  • If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

Description

This PR only updates the submodule pointer for fv3atm, which contains updates to ccpp-framework (in particular the metadata parser) and bug fixes for the CCPP metadata in fv3atm and ccpp-physics.

This update is needed to prepare for a future transition to the next-generation code generator capgen.py (instead of ccpp_prebuild.py). ccpp_prebuild.py under the hood uses the metadata parser from capgen.py, and the latest improvements and consistency checks made there (branch feature/capgen in ccpp-framework) are now brought back to the authoritative code base.

Also: change queue on Cheyenne from economy to regular to avoid regression tests being killed at 1:00am after sitting in the queue for many hours.

There are no Fortran code changes and no changes to the input data or the regression test results.

Issue(s) addressed

Fixes #744.

Testing

Preliminary regression testing

Regression tests were run on Hera with Intel against the existing baselines, all tests passed.

Final regression testing

  • hera.intel (redone due to changes in ccpp-framework following code review)
  • hera.gnu (redone due to changes in ccpp-framework following code review)
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss_cray
  • wcoss_dell_p3
  • CI - 87e5510 and 103fe82

Dependencies

@climbfuji
Copy link
Copy Markdown
Collaborator Author

All tests passed. Waiting for the ccpp-framework approval before we can merge (tomorrow morning).

@climbfuji
Copy link
Copy Markdown
Collaborator Author

climbfuji commented Aug 18, 2021

Update 08/18/2021: the code review for ccpp-framework led to a few small changes that have no impact on the code. I checked that the auto-generated code is 100% identical before/after making the changes in commit NCAR/ccpp-framework@53aa9dc. Nonetheless, I will rerun the regression tests on Hera with Intel and GNU to be absolutely sure everything is fine. I will also rerun the CI tests.

@climbfuji climbfuji requested review from BrianCurtis-NOAA and DeniseWorthen and removed request for DusanJovic-NOAA August 18, 2021 18:45
@climbfuji
Copy link
Copy Markdown
Collaborator Author

fv3atm submodule pointer has been updated, hash verified. All tests passed, including all reruns. Ready to merge.

@climbfuji climbfuji added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Aug 18, 2021
@climbfuji
Copy link
Copy Markdown
Collaborator Author

@junwang-noaa should we wait for more approvals or merge, given that it's only a submodule pointer update?

@climbfuji climbfuji merged commit f7cfebf into ufs-community:develop Aug 18, 2021
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
## DESCRIPTION OF CHANGES: 
* Modifications to `run_WE2E_tests.sh`:
  * Add examples to help/usage statement
* Modifications to `check_expts_status.sh`:
  * Add arguments list that can be processed by `process_args`
  * Add new optional arguments:  `num_log_lines`, `verbose`
  * Include a help/usage message

## TESTS CONDUCTED:
* Ran `run_WE2E_tests.sh --help` from the command line and got the expected help message.
* Ran `check_expts_status.sh --help` from the command line and got the expected help message.
* Used `run_WE2E_tests.sh` to run a set of 2 WE2E tests -- works as expected.
* Used `check_expts_status` to check on the status of the 2 tests run above and got the expected status message.
 
## DEPENDENCIES:
PR #[241](ufs-community/ufs-srweather-app#241)

## DOCUMENTATION:
A lot of this PR is documentation in the scripts.  There is an accompanying documentation PR #[241](ufs-community/ufs-srweather-app#241) into ufs-srweather-app.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. Waiting for Reviews The PR is waiting for reviews from associated component PR's.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bring updates of the CCPP metadata parser in feature/capgen to the ccpp-framework main branch - 1st round

5 participants