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.

Sign up for GitHub

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

Jump to bottom

Bring hotfixes from release/public-v4 back to master, add syntax check for parsing \htmlinclude lines #289

Merged
merged 6 commits into from
May 11, 2020
Merged

Bring hotfixes from release/public-v4 back to master, add syntax check for parsing \htmlinclude lines #289

merged 6 commits into from
May 11, 2020

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented May 6, 2020 •
edited
Loading

This PR contains:

  • removal of CCPP technical documentation (which is now in a separate repository, ccpp-doc)
  • update CCPP variable files (PDFs) for SCM v4.0 and UFS-MRW v1.0 release
  • update of version number in CMakeLists.txt (3.0.0 -> 4.0.0)
  • fix a bug in scripts/metadata_parser.py: missing check for correct syntax in lines containing \htmlinclude statements @mzhangw @ligiabernardet @JulieSchramm

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

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

This was referenced May 6, 2020
Merged
Merged
@climbfuji climbfuji marked this pull request as ready for review May 7, 2020 13:30
JulieSchramm
JulieSchramm approved these changes May 7, 2020
View reviewed changes
Copy link

@JulieSchramm JulieSchramm 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.

llpcarson
llpcarson approved these changes May 7, 2020
View reviewed changes
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

gold2718
gold2718 approved these changes May 7, 2020
View reviewed changes
Copy link
Collaborator

@gold2718 gold2718 left a comment

Choose a reason for hiding this comment

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

Looks okay to me.

@climbfuji
Copy link
Collaborator Author

This PR and NCAR/ccpp-physics#448 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.

This was referenced May 8, 2020
Merged
Merged
@climbfuji climbfuji changed the title Bring hotfixes from release/public-v1 back to master Bring hotfixes from release/public-v1 back to master, add syntax check for parsing \htmlinclude lines May 11, 2020
@climbfuji climbfuji changed the title Bring hotfixes from release/public-v1 back to master, add syntax check for parsing \htmlinclude lines Bring hotfixes from release/public-v4 back to master, add syntax check for parsing \htmlinclude lines May 11, 2020
@climbfuji climbfuji merged commit 6890b2f into NCAR:master May 11, 2020
@climbfuji climbfuji mentioned this pull request Jun 2, 2020
Closed
@climbfuji climbfuji deleted the bugfixes_from_public_release branch June 27, 2022 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gold2718 gold2718 gold2718 approved these changes

@JulieSchramm JulieSchramm JulieSchramm approved these changes

@llpcarson llpcarson llpcarson approved these changes

@grantfirl grantfirl Awaiting requested review from grantfirl

@ligiabernardet ligiabernardet Awaiting requested review from ligiabernardet

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@climbfuji @gold2718 @JulieSchramm @llpcarson