Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring documentation updates from release/public-v4 back to master, correct syntax of \htmlinclude line for m_micro_run #448

Merged
merged 14 commits into from
May 11, 2020

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented May 6, 2020

This PR contains:

  • updates to the scientific documentation for CCPP release 4.0.0
  • update of version number in CMakeLists.txt (3.0.0 -> 4.0.0)
  • fix a bug in physics/m_micro.F90: correct syntax for \htmlinclude line for scheme m_micro_run; @mzhangw @ligiabernardet @JulieSchramm: during the update of the scientific documentation, someone replaced the correct syntax
!! \htmlinclude m_micro_run.html

with

!> \htmlinclude m_micro_run.html

and the CCPP framework didn't check for this error. As a result, m_micro_run had an empty CCPP argument table and was removed entirely. PR NCAR/ccpp-framework#289 adds the missing check in the metadata parser script.

Associated PRs:
NCAR/ccpp-framework#289
#448
NOAA-EMC/fv3atm#113
ufs-community/ufs-weather-model#120

For regression testing information, see ufs-community/ufs-weather-model#120.

@climbfuji
Copy link
Collaborator Author

@ligiabernardet @mzhangw @JulieSchramm I created a PR to bring back the updates (almost exclusively scientific documentation) from the public release to master.

Please check everything carefully, as there were many merge conflicts and changes made in both branches. Let me know if you find anything wrong. Once this PR is part of the entire ufs-weather-model "bring hotfixes from public release back to master / develop", you can also generate the scientific documentation and look at the output.

Thanks!

Copy link
Collaborator

@mzhangw mzhangw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.

Copy link
Contributor

@llpcarson llpcarson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved, pending reg-tests with the other PRs/repos

@ligiabernardet
Copy link
Collaborator

ligiabernardet commented May 7, 2020 via email

@climbfuji
Copy link
Collaborator Author

This PR and NCAR/ccpp-framework#289 will have to wait for the next round. When merging them (together with my fv3atm changes) into Dusan's branch, some of the new csawmg tests failed. We postponed this until next week when I am 100% back to work.

@climbfuji climbfuji changed the title Bring documentation updates from release/public-v1 back to master Bring documentation updates from release/public-v1 back to master, correct syntax of \htmlinclude line for m_micro_run May 11, 2020
@climbfuji climbfuji changed the title Bring documentation updates from release/public-v1 back to master, correct syntax of \htmlinclude line for m_micro_run Bring documentation updates from release/public-v4 back to master, correct syntax of \htmlinclude line for m_micro_run May 11, 2020
@climbfuji climbfuji merged commit 7b1e66c into NCAR:master May 11, 2020
@climbfuji climbfuji deleted the bugfixes_from_public_release branch June 27, 2022 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants