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

scidoc fix for PR626 #3

Merged
merged 3 commits into from
Apr 16, 2021
Merged

Conversation

mzhangw
Copy link
Collaborator

@mzhangw mzhangw commented Apr 15, 2021

Here is a doxyen fix for PR626

Copy link

@ligiabernardet ligiabernardet 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. Note that the use of ver="5" in the SDF is compatible with the v5 public release but not with the current master code. In general, the documentation we are putting in master matches v5, and not the master itself. There is an understanding that we will update the documentation before the next public release.

@climbfuji
Copy link
Collaborator

Looks good to me. Note that the use of ver="5" in the SDF is compatible with the v5 public release but not with the current master code. In general, the documentation we are putting in master matches v5, and not the master itself. There is an understanding that we will update the documentation before the next public release.

This is a bit of a problem. The version string in the suite definition file no longer corresponds to the version of the CCPP release, but to the format/syntax of the suite definition file. This is what we agreed to with our NCAR colleagues a few months ago and we made the change to version="1" with this understanding. So this must be version="1", not 5.

@climbfuji
Copy link
Collaborator

The meeting minutes for this discussion are here: https://github.com/NCAR/ccpp-framework/wiki/CCPP-Framework-Meeting-Minutes-2020-08-27

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

Replace version="5" with version="1" everywhere.

@ligiabernardet
Copy link

Sure, but the Scientific Documentation that Laurie is proposing to commit to master is all about the v5 release and lags behind what is actually on trunk. I suggest that we go forward with updating the master with innovations from v5, and we can proceed with additional updates updates of documentation afterwards.

@mzhangw
Copy link
Collaborator Author

mzhangw commented Apr 15, 2021 via email

@ligiabernardet
Copy link

OK. In this case I believe lib="ccppphys" needs to be removed, as it is no longer used in the SDFs.

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

Thanks for your changes so far. When release code goes back to the authoritative repositories, it needs to be adjusted to the innovations that have been made in the meantime, and one of them is the agreement on the new SDF syntax. Thus, replacing lib="ccppphys" ver="5" (or lib="ccppphys" ver="1" in places where you made such changes already) with just version="1" is correct.

physics/docs/pdftxt/GFSv15p2_suite.txt Show resolved Hide resolved
physics/docs/pdftxt/GFSv16beta_suite.txt Show resolved Hide resolved
physics/docs/pdftxt/RRFS_v1alpha_suite.txt Show resolved Hide resolved
@llpcarson llpcarson merged commit 495536d into llpcarson:updates_from_v2 Apr 16, 2021
@mzhangw
Copy link
Collaborator Author

mzhangw commented Apr 16, 2021 via email

@climbfuji
Copy link
Collaborator

NCAR#581 is solved

Thanks @mzhangw . Laurie, please addd to the description of your PR

Fixes NCAR#581
so that the issue gets closed once your code gets merged. Thanks!

llpcarson pushed a commit that referenced this pull request May 12, 2021
llpcarson pushed a commit that referenced this pull request May 12, 2021
llpcarson pushed a commit that referenced this pull request May 12, 2021
llpcarson pushed a commit that referenced this pull request Sep 7, 2021
Constant branch update from Dom 2021/08/02
@mzhangw mzhangw deleted the pr-626 branch December 15, 2021 21:19
JeffBeck-NOAA referenced this pull request in JeffBeck-NOAA/ccpp-physics Dec 27, 2021
Update cloud_cover_xr with latest change from NCAR ccpp-physics main
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