Skip to content

Commit

Permalink
ESCOMP tag: cam6_4_065
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cacraigucar authored and Steve Goldhaber committed Feb 13, 2025
1 parent c785eb3 commit 0895213
Show file tree
Hide file tree
Showing 15 changed files with 343 additions and 2,637 deletions.
88 changes: 88 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,91 @@

===============================================================

Tag name: cam6_4_065
Originator(s): cacraig
Date: Feb 11, 2025
One-line Summary: ZM CCPP'ization round 4 (completes CCPP conversion of ZM)

Github PR URL: https://github.com/ESCOMP/CAM/pull/1218

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Convert ZM to CCPP and move into atmospheric_physics github repo: https://github.com/ESCOMP/CAM/issues/873

Describe any changes made to build system: N/A

Describe any changes made to the namelist:
- Removed zmconv_org namelist as that partially implemented capability has been removed

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: nusbaume, jimmielin

List all files eliminated: N/A
D src/physics/cam/wv_sat_methods.F90
D src/physics/cam/wv_saturation.F90
D src/utils/error_messages.F90
D src/utils/namelist_utils.F90
- Moved to atmospheric_physics (and currently reside in the to_be_ccppized directory)

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:
M .gitmodules
- update atmospheric_physics to bring in ZM changes

M bld/build-namelist
M bld/config_files/definition.xml
M bld/configure
M bld/namelist_files/namelist_defaults_cam.xml
M bld/namelist_files/namelist_definition.xml
- remove zmconv_org namelist

M src/physics/cam/cloud_fraction.F90
- moved cldfrc_fice to atmospheric_physics and ccppized

M src/physics/cam/clubb_intr.F90
- removed difzm declarations as no longer needed

M src/physics/cam/convect_shallow.F90
M src/physics/cam/macrop_driver.F90
M src/physics/cam/physpkg.F90
M src/physics/cam/rk_stratiform.F90
M src/physics/cam/zm_conv_intr.F90
M src/physics/cam7/physpkg.F90
M src/physics/simple/physpkg.F90
- various mods to get this to work with the routines that are ccppized

M src/utils/cam_ccpp/ccpp_constituent_prop_mod.F90
- Add routine:
ccp_set_standard_name to set constituent's standard name
ccp_is_dry to return whether species is dry
ccp_set_dry to set constituent's dry property based on what is passed in

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam: all BFB, except:
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF)
- pre-existing failure due to HEMCO not having reproducible results (issues #1018 and #856)

SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
- pre-existing failures due to build-namelist error requiring CLM/CTSM external update

derecho/nvhpc/aux_cam: BFB

izumi/nag/aux_cam: BFB

izumi/gnu/aux_cam:
ERC_D_Ln9.f10_f10_mg37.QPSPCAMM.izumi_gnu.cam-outfrq3s (Overall: FAIL) details:
- New failure, but since SPCAM is being removed(PR 1217) will create this new pre-existing failure

===============================================================
===============================================================

Tag name: cam6_4_064
Expand Down
Loading

0 comments on commit 0895213

Please sign in to comment.