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

Update master from gsd/develop 2020/06/30 #307

Merged

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Jun 30, 2020

Changes in this PR:

  • handle blocked data structures in physics _init and _finalize routines
  • correctly use horizontal_dimension versus horizontal_loop_extent
  • remove old pset logic (was required for dynamic CCPP)

These changes were reviewed by all reviewers on this PR when merged originally into gsd/develop.

Associated PRs:
NCAR/ccpp-physics#465
#307
NOAA-EMC/GFDL_atmos_cubed_sphere#30
NOAA-EMC/fv3atm#134
ufs-community/ufs-weather-model#156

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

climbfuji and others added 24 commits December 3, 2019 15:41
gsd/develop: update from master 2020/01/27
Bugfix for converting optional attribute from new metadata for ccpp_prebuild.py
…ersions K<->C and g kg-1 <-> kg kg-1

scripts/common.py: additional definitions required for handling blocked data structures
…iminary name) from new metadata; remove support for old metadata standard; add legacy extension code to handle inconsistent use of horizontal_dimension versus horizontal_loop_extent
…n _init and _finalize routines, support for handling conditionally allocated/used variables when converting blocked data structures or units
…uctures

gsd/develop: handle blocked data structures in init and finalize routines, remove pset logic
…er_20200616

Update gsd/develop from master 2020/06/16
@climbfuji
Copy link
Collaborator Author

All, we are hoping to merge this tonight. Given that you reviewed these changes when they were merged into gsd/develop, I would go ahead without approval if needed.

" with 'horizontal_dimension' in table {}".format(table_name))
standard_name = 'horizontal_dimension'
legacy_note = ' replaced by horizontal dimension (legacy extension)'
elif standard_name == 'horizontal_dimension' and scheme_name and table_name.endswith("_run"):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since this is being handled in the CCPP framework here, do we not need to clean up the scheme metadata? Or should that still be done to avoid future confusion (and to set the right example for future developers)?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Correct, this is a temporary workaround - we need to do a full cleanup of the metadata in GFS_typedefs.F90 and other places. I didn't want to do this as part of this commit, because it would have required a huge amount of changes on top of all that is in the current PRs already. Making this metadata change should be a self-contained PR that does nothing but to remove the workaround and correct the metadata in ccpp-physics and fv3atm.

Copy link
Collaborator

@grantfirl grantfirl left a comment

Choose a reason for hiding this comment

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

I don't feel super qualified to approve this, but I did look it over. It seems like the most "interesting" change is in commit 1975041 which I still need to digest. I'm sure that it could benefit from some more documentation on the implications of these changes, but I don't want to get in the way of this either, especially if this is made obsolete by capgen?

@climbfuji
Copy link
Collaborator Author

I don't feel super qualified to approve this, but I did look it over. It seems like the most "interesting" change is in commit 1975041 which I still need to digest. I'm sure that it could benefit from some more documentation on the implications of these changes, but I don't want to get in the way of this either, especially if this is made obsolete by capgen?

Yes, this will be taken over by cap_gen hopefully rather sooner than later.

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.

Well, that was . . . interesting. mkstatic logic certainly gets deep(ly nested).
I have some questions and minor concerns but nothing that should block merging if you feel it is not important or if the commit is too urgent.

scripts/ccpp_prebuild.py Show resolved Hide resolved
scripts/conversion_tools/unit_conversion.py Show resolved Hide resolved
scripts/mkcap.py Show resolved Hide resolved
scripts/mkcap.py Show resolved Hide resolved
scripts/mkstatic.py Show resolved Hide resolved
@climbfuji
Copy link
Collaborator Author

climbfuji commented Jul 1, 2020

Thanks, @gold2718 . I will add your suggested changes to an issue for a follow-up commit. I don't want to trigger a rerun of all regression tests on all platforms: #309

@climbfuji climbfuji merged commit b14e3e0 into NCAR:master Jul 2, 2020
climbfuji added a commit to climbfuji/ccpp-framework that referenced this pull request Jul 7, 2020
…elop_20200630

Update master from gsd/develop 2020/06/30
@climbfuji climbfuji deleted the update_master_from_gsl_develop_20200630 branch June 27, 2022 03:10
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.

None yet

4 participants