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

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

Merged
merged 11 commits into from
Apr 15, 2021

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Apr 5, 2021

This PR renames Fortran variables and CCPP standard names / long names of surface composites from "ocean" to "water", since these also contain lake points.

Note that this PR contains all the changes in #596. #596 can be merged independently before this PR, or as part of this PR.

Fixes #455.

Associated PRs:

#609
NOAA-EMC/fv3atm#271
ufs-community/ufs-weather-model#508

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

@ligiabernardet
Copy link
Collaborator

The change of standard names to use over_water instead of over_ocean is good to avoid confusion.

@climbfuji climbfuji marked this pull request as ready for review April 5, 2021 15:23
@@ -436,6 +436,8 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorl' , Sfcprop%zorl)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorlo' , Sfcprop%zorlo)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorll' , Sfcprop%zorll)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorli' , Sfcprop%zorli)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorlw' , Sfcprop%zorlw)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are zorlo and zorlw for ocean and water, respectively? Are they the same?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I have not renamed the Sfcprop constituents yet, exactly because I wasn't sure what to do with Sfcprop%zorlw - make this Sfcprop%zorlwav and use Sfcprop%zorlw for water? Would that be confusing?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Got it. zorlwav would be good for me. Thanks.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@shansun6 @SMoorthi-emc I renamed Sfcprop%zorlw to Sfcprop%zorlwav in #596, and then in this PR Sfcprop%zorlo to Sfcprop%zorlw. Doing this in two steps ensures that I am not mistakenly using the wrong values.

@SMoorthi-emc
Copy link
Collaborator

SMoorthi-emc commented Apr 5, 2021 via email

Copy link
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 this. Very nice work. Thanks, -Shan

@@ -436,6 +436,8 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorl' , Sfcprop%zorl)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorlo' , Sfcprop%zorlo)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorll' , Sfcprop%zorll)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorli' , Sfcprop%zorli)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%zorlw' , Sfcprop%zorlw)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Got it. zorlwav would be good for me. Thanks.

@climbfuji
Copy link
Collaborator Author

I approve this. Very nice work. Thanks, -Shan

zorlwav also matches the (albeit commented out) name of the coupled variable Coupling%zorlwav_cpl in GFS_typedefs.F90

@SMoorthi-emc
Copy link
Collaborator

It is a bit confusing looking at code changes in this format. I guess there are plenty of changes in "gfdl_sfc_layer.F90"

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.

looks good to me, approved

climbfuji added a commit that referenced this pull request Apr 15, 2021
Wrapper PR for #596, #609, #605: zorl interstitial, ocn -> wat, merra2 threading
@climbfuji climbfuji merged commit e46fe37 into NCAR:master Apr 15, 2021
@climbfuji climbfuji deleted the rename_surface_composites_ocean_water branch June 27, 2022 03:22
HelinWei-NOAA pushed a commit to HelinWei-NOAA/ccpp-physics that referenced this pull request Feb 26, 2023
* update atmos_cubed_sphere
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
7 participants