Merge tag 'cam6_4_021' into zm_cleanup3a

Merge pull request ESCOMP#1026 from jtruesdal/dadadj_ccpp

bld/configure

@@ -2329,6 +2329,7 @@ sub write_filepath
 
     #Add the CCPP'ized subdirectories
     print $fh "$camsrcdir/src/atmos_phys/zhang_mcfarlane\n";
+    print $fh "$camsrcdir/src/atmos_phys/dry_adiabatic_adjust\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";

doc/ChangeLog

@@ -1,5 +1,77 @@
 ===============================================================
 
+Tag name: cam6_4_021
+Originator(s): jet
+Date: 16 Aug 2024
+One-line Summary: CCPPize dadadj
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1026
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+  - Issue #928 - Convert Dry Adiabatic Adjustment to CCPP and move into the atmospheric_physics github repo
+  - Bugfix to dadadj although it didn't change answers in the regression suite.
+
+Describe any changes made to build system: add atmos_phys/dry_adiabatic_adjust directory to build filepath
+
+Describe any changes made to the namelist: none
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by: cacraigucar, nusbaume
+
+List all files eliminated:
+D   physics/cam/dadadj.F90
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+
+M   .gitmodules
+  - update to atmospheric_physics tag with new dry_adiabatic_adjust ccpp routine
+
+M   bld/configure
+  - Add dry_adiabatic_adjust to build Filepath
+M   src/cam_snapshot_common.F90
+  - update pbuf_snapshot fields from 250 to 300
+M   physics/cam/dadadj_cam.F90
+  - CCPP'ize dadadj interface
+M  physics/physpkg.F90
+M physics/cam7/physpkg.F90
+  - update subroutine name for cam dadadj initialization
+
+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:
+ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
+- pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details:
+- pre-existing failures -- need fix in CLM external
+
+SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
+- pre-existing failure -- need fix in CICE external
+
+derecho/nvphc/aux_cam: All Pass
+
+izumi/nag/aux_cam:
+DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
+- pre-existing failure - issue #670
+
+
+izumi/gnu/aux_cam: All Pass
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: BFB, as expected
+
+===============================================================
+
 Tag name: cam6_4_020
 Originator(s): fvitt
 Date: 14 Aug 2024

src/control/cam_snapshot_common.F90

@@ -86,7 +86,7 @@ module cam_snapshot_common
 type (snapshot_type)    ::  tend_snapshot(6)
 type (snapshot_type)    ::  cam_in_snapshot(30)
 type (snapshot_type)    ::  cam_out_snapshot(30)
-type (snapshot_type_nd) ::  pbuf_snapshot(250)
+type (snapshot_type_nd) ::  pbuf_snapshot(300)
 
 contains