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

cam6_4_065: ZM CCPP'ization round 4 (completes CCPP conversion of ZM) #1218

Merged
merged 23 commits into from
Feb 11, 2025

Conversation

cacraigucar
Copy link
Collaborator

This round of cleanup completes moving ZM to CCPP

closes #873

Copy link
Member

@jimmielin jimmielin left a comment

Choose a reason for hiding this comment

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

Thanks @cacraigucar! I went through this PR first since I pulled a few of the changes in this PR into my Hack shallow convection work. I just had two (hopefully easy to resolve) questions (on the water vapor standard name and another on cloud_fraction_fice).

src/utils/cam_ccpp/ccpp_constituent_prop_mod.F90 Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Show resolved Hide resolved
@cacraigucar cacraigucar requested a review from jimmielin January 6, 2025 16:39
Copy link
Member

@jimmielin jimmielin left a comment

Choose a reason for hiding this comment

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

Thank you so much @cacraigucar for addressing my comments!

Copy link
Collaborator

@nusbaume nusbaume left a comment

Choose a reason for hiding this comment

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

Good work @cacraigucar! I have some suggestions, but most should hopefully be pretty straight-forward. The one possible exception is the request to remove references to zmconv_org from the configure and definition.xml files, so if you run into any problems or issues with that or any other suggestion I have just let me know. Thanks!

bld/configure Outdated Show resolved Hide resolved
bld/configure Show resolved Hide resolved
src/physics/cam/convect_shallow.F90 Outdated Show resolved Hide resolved
call phys_getopts (macrop_scheme_out = macrop_scheme)
if ( .not. (macrop_scheme == "rk" .or. macrop_scheme == "SPCAM_sam1mom")) top_lev = trop_cloud_top_lev

call cloud_fraction_fice_run(ncol, state1%t(1:ncol,:), tmelt, top_lev, pver, fice(1:ncol,:), fsnow_conv(1:ncol,:))
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wouldn't worry about it for this PR, but I believe that cloud_fraction_fice_run should also be returning an error message and error code. Maybe worth opening an issue in the atmospheric_physics repo?

Copy link
Member

Choose a reason for hiding this comment

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

I will be working on convect_shallow.F90 for Hack and the rest of cloud_fraction for RK so I can (eventually) bundle this in with one of my PRs, so if the issue is opened please feel free to assign it to me.

Copy link
Member

Choose a reason for hiding this comment

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

Made issue in atmos_phys; ESCOMP/atmospheric_physics#201

src/utils/cam_ccpp/ccpp_constituent_prop_mod.F90 Outdated Show resolved Hide resolved
@@ -142,14 +141,8 @@ subroutine zm_conv_register
! detrained convective cloud water mixing ratio.
call pbuf_add_field('DLFZM', 'physpkg', dtype_r8, (/pcols,pver/), dlfzm_idx)
! detrained convective cloud ice mixing ratio.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe the wrong comment was deleted here:

Suggested change
! detrained convective cloud ice mixing ratio.
! convective mass fluxes

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Modified comment

Copy link
Collaborator

Choose a reason for hiding this comment

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

Sorry, but it looks like the wrong comment was updated. We want to keep the detrained convective cloud water mixing ratio. and instead replace detrained convective cloud ice mixing ratio. below it with convective mass fluxes.

src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
Copy link
Collaborator

@nusbaume nusbaume left a comment

Choose a reason for hiding this comment

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

Had one last change request, but otherwise everything looks great to me!

@@ -142,14 +141,8 @@ subroutine zm_conv_register
! detrained convective cloud water mixing ratio.
call pbuf_add_field('DLFZM', 'physpkg', dtype_r8, (/pcols,pver/), dlfzm_idx)
! detrained convective cloud ice mixing ratio.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Sorry, but it looks like the wrong comment was updated. We want to keep the detrained convective cloud water mixing ratio. and instead replace detrained convective cloud ice mixing ratio. below it with convective mass fluxes.

Merge pull request ESCOMP#1226 from sjsprecious/fix_broken_gpu_tests
@cacraigucar cacraigucar changed the title ZM CCPP'ization round 4 (completes CCPP conversion of ZM) cam6_4_065: ZM CCPP'ization round 4 (completes CCPP conversion of ZM) Feb 10, 2025
@cacraigucar cacraigucar merged commit 3eb2112 into ESCOMP:cam_development Feb 11, 2025
2 checks passed
gold2718 pushed a commit to gold2718/CAM that referenced this pull request Feb 13, 2025
Merge pull request ESCOMP#1218 from cacraigucar/cam_zm_cleanup4

cam6_4_065: ZM CCPP'ization round 4 (completes CCPP conversion of ZM)

ESCOMP commit: 3eb2112
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Tag
Development

Successfully merging this pull request may close these issues.

3 participants