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_3_146: ZM clean up in preparation for using via CCPP and remove zmconv_microp feature #890

Merged
merged 12 commits into from
Jan 23, 2024

Conversation

cacraigucar
Copy link
Collaborator

@cacraigucar cacraigucar commented Sep 29, 2023

This PR is the first step in the CCPP conversion process. It has the ZM module separated into its key components and all of the CAM "use" statements lower down have been removed and variables are passed in the calling lists.

zmconv_microp and the zm_microphysics are being removed with this PR as well. It was deemed that this implementation is not the correct way to embed the microphysics in ZM.

Closes #889

@cacraigucar cacraigucar self-assigned this Sep 29, 2023
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.

Looks fine to me! I have some minor concerns that will need to be addressed eventually before conversion is complete, but nothing that should hold up this PR (especially if it is needed for science work).

Externals_CAM.cfg Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
src/physics/cam/zm_conv_intr.F90 Outdated Show resolved Hide resolved
bld/configure Outdated Show resolved Hide resolved
@nusbaume nusbaume requested review from peverwhee and mwaxmonsky and removed request for peverwhee November 14, 2023 20:49
Copy link
Collaborator

@mwaxmonsky mwaxmonsky left a comment

Choose a reason for hiding this comment

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

Looks great! Had a few questions discussed during our weekly SIMA meeting so no need for any changes that I can see.

Thanks for tackling this one @cacraigucar!

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.

Have some minor cleanup and a question about the lengath variable, but once those are resolved then this PR should be ready to go!

@@ -155,6 +155,7 @@ subroutine zm_conv_register
! convective mass fluxes
call pbuf_add_field('CMFMC_DP', 'physpkg', dtype_r8, (/pcols,pverp/), mconzm_idx)

!CACNOTE - Is zm_org really a constituent or was it just a handy structure to use for an allocatable which persists in the run?
Copy link
Collaborator

Choose a reason for hiding this comment

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

Question for @swrneale

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

@mwaxmonsky mwaxmonsky left a comment

Choose a reason for hiding this comment

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

Looks great @cacraigucar!

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.

Looks great now, thanks @cacraigucar!

@cacraigucar cacraigucar merged commit 11900b3 into ESCOMP:cam_development Jan 23, 2024
@cacraigucar cacraigucar deleted the cam_zm_clean_up branch January 23, 2024 23:57
@cacraigucar cacraigucar changed the title ZM clean up in preparation for using via CCPP and remove zmconv_microp feature cam6_3_146: ZM clean up in preparation for using via CCPP and remove zmconv_microp feature Jan 25, 2024
gold2718 pushed a commit to gold2718/CAM that referenced this pull request May 2, 2024
Merge pull request ESCOMP#890 from cacraigucar/cam_zm_clean_up

ZM clean up in preparation for using via CCPP and remove zmconv_microp feature

ESCOMP commit: 11900b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Tag
Development

Successfully merging this pull request may close these issues.

4 participants