Skip to content

Rename Fortran variables and CCPP standard names / long names of surface composites from ocean to water#271

Closed
climbfuji wants to merge 12 commits into
NOAA-EMC:developfrom
climbfuji:rename_surface_composites_ocean_water
Closed

Rename Fortran variables and CCPP standard names / long names of surface composites from ocean to water#271
climbfuji wants to merge 12 commits into
NOAA-EMC:developfrom
climbfuji:rename_surface_composites_ocean_water

Conversation

@climbfuji
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji commented Apr 5, 2021

Description

This PR renames Fortran variables and CCPP standard names / long names of surface composites from "ocean" to "water", since these also contain lake points. For consistency, rename Sfcprop%zorlo to Sfcprop%zorlw.

Note that this PR contains all the changes in #261. #261 can be merged independently before this PR, or as part of this PR. Note also that #261 renames the previously existing Sfcprop%zorlw to Sfcprop%zorlwav so that the change presented here can be made. Doing this renaming in two steps ensures that there is no mixup of variables being used.

Issue(s) addressed

Fixes NCAR/ccpp-physics#455.

Testing

For regression testing, see ufs-community/ufs-weather-model#508

Dependencies

NCAR/ccpp-physics#609
#271
ufs-community/ufs-weather-model#508

Copy link
Copy Markdown
Collaborator

@ShanSunNOAA ShanSunNOAA left a comment

Choose a reason for hiding this comment

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

I approve it. Thanks for cleaning up this portion, -Shan

Copy link
Copy Markdown
Collaborator

@ShanSunNOAA ShanSunNOAA left a comment

Choose a reason for hiding this comment

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

I approve it. Thanks for the cleaning up, -Shan

junwang-noaa pushed a commit that referenced this pull request Apr 15, 2021
…2 threading (#279)

* changed .gitmodules to point to merra2 ccpp/physics
* remove GFDL_atmos_cubed_sphere and ccpp-framework from .git module
* remove IPD gfsphysics
* Update .gitmodules and submodule pointer for ccpp-physics for code review and testing
* Remove interstitial zorl composites
* Update .gitmodules and submodule pointer fpor ccpp-physics for code review and testing
* Remove or replace references to IPD in comments in atmos_model.F90
* Initialize Sfcprop%zorlx to clear_val instead of huge
* Update submodule pointer for ccpp-physics
* Rename Fortran variables and CCPP standard names / long names of surface composites from ocean to water
* Rename Sfcprop%zorlw to Sfcprop%zorlwav
* Rename Sfcprop%zorlo to Sfcprop%zorlw
* update submodule pointer for ccpp-physics
* Revert change to .gitmodules and update submodule pointer for ccpp-physics
Co-authored-by: anning.cheng <anning.cheng@noaa.gov>
@climbfuji
Copy link
Copy Markdown
Collaborator Author

Merged as part of #279, doesn't get flagged as merged automatically because we are doing squashed merges in fv3atm.

@climbfuji climbfuji closed this Apr 15, 2021
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.

Update metadata for composite variables from ocean to water

2 participants