Merge tag 'cam6_4_128' into cam_dustemis_dev

Merge pull request ESCOMP#1355 from jshaw35/hgt_matrix_half_error

Author: dmleung

.gitmodules

@@ -96,7 +96,7 @@
 	url = https://github.com/CFMIP/COSPv2.0
         fxrequired = AlwaysRequired
         fxsparse = ../.cosp_sparse_checkout
-        fxtag = v2.1.4cesm
+        fxtag = v2.1.9
 	fxDONOTUSEurl = https://github.com/CFMIP/COSPv2.0
 
 [submodule "clubb"]

bld/namelist_files/namelist_defaults_cam.xml

@@ -197,8 +197,7 @@
 <ncdata hgrid="ne30np4"  nlev="32" chem="trop_strat_mam5_ts2">atm/cam/inic/se/f.e22.FC2010climo.ne30_ne30_mg17.cam6_2_032.001.cam.i.0006-01-01-00000_c200623.nc</ncdata>
 <ncdata hgrid="ne30np4"  nlev="58" chem="trop_strat_mam5_vbs">atm/cam/inic/se/f.e22.FCnudged.ne30_ne30_mg17.release-cesm2.2.0_spinup.2010_2020.001.cam.i.2011-01-01-00000_L58_c220310.nc</ncdata>
 <ncdata hgrid="ne30np4"  nlev="58"                 >atm/cam/inic/se/FLT_L58_ne30pg3_IC_c220623.nc</ncdata>
-<ncdata hgrid="ne30np4"  nlev="70"                 >atm/waccm/ic/FW2000_ne30_L70_01-01-0001_c200602.nc</ncdata>
-<ncdata hgrid="ne30np4"  nlev="70" npg="3"         >atm/waccm/ic/FW2000.ne30pg3_ne30pg3_nlev70_c230906.nc</ncdata>
+<ncdata hgrid="ne30np4"  nlev="70" waccm_phys="1"  >atm/waccm/ic/FW2000.ne30pg3_ne30pg3_nlev70_c230906.nc</ncdata>
 <ncdata hgrid="ne30np4"  nlev="93"                           >atm/cam/inic/se/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000_c240618.nc</ncdata>
 <ncdata hgrid="ne30np4"  nlev="93" chem="trop_strat_mam5_vbs">atm/cam/inic/se/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000_c240618.nc</ncdata>
 <ncdata hgrid="ne30np4"  nlev="110"                >atm/waccm/ic/FWsc2000_ne30pg3_L110_01-01-0001_c200521.nc</ncdata>

cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam

@@ -9,7 +9,7 @@ cosp_histfile_aux=.true.
 cosp_histfile_aux_num=3
 fexcl2='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP',
        'CS_PIA','CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_RAINHARD','CS_SNOWCERT','CS_SNOWPOSS',
-       'CS_UN'
+       'CS_UN', 'CS_WR_CFODD_REFF_LARGE'
 
  mode_defs=
 'mam4_mode1:accum:=', 'A:num_a1:N:num_c1:num_mr:+',

doc/ChangeLog

@@ -1,5 +1,77 @@
 ===============================================================
 
+Tag name: cam6_4_128
+Originator(s): jshaw35, fvitt, cacraig, nusbaume
+Date: Oct 30, 2025
+One-line Summary: Correct allocation and assignment error for 'hgt_matrix_half' field in cospsimulator_intr.F90
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1355
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+  - Fix bug where CAM height interfaces were incorrectly passed to COSP (requires COSP update):
+    https://github.com/ESCOMP/CAM/issues/1354
+  - Bring in an updated default WACCM IC file for the ne30 grid:
+    https://github.com/ESCOMP/CAM/issues/1425
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist: N/A
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: eaton, brianpm, jedwards
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+
+M       .gitmodules
+M       src/physics/cosp2/src
+ - Update COSP submodule to version 2.1.9
+
+M       src/physics/cam/cospsimulator_intr.F90
+ - Fix 'hgt_matrix_half' bug, and add new COSP diagnostic fields to
+   CAM history output.
+
+M       bld/namelist_files/namelist_defaults_cam.xml
+ - Use spun-up default WACCM IC file for the ne30 grid.
+
+M       cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam
+ - Add 'CS_WR_CFODD_REFF_LARGE' to fexcl list in COSP ERC test in order
+   to allow tests to pass (CloudSat variables appear to be task-dependent).
+
+
+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:
+
+  ERC_D_Ln9.f19_f19_mt232.QPC6.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF)
+ - COSP answer changes due to bug fix and new COSP submodule
+
+derecho/nvhpc/aux_cam: ALL PASS
+
+izumi/nag/aux_cam:
+
+ERC_D_Ln9.f10_f10_mt232.FHIST.izumi_nag.cam-outfrq3s_cospsathist (Overall: DIFF)
+ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: DIFF)
+ - COSP answer changes due to bug fix and new COSP submodule
+
+izumi/gnu/aux_cam:
+
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHIST_C5.izumi_gnu.cam-carma_cosp_rad_diag_mam (Overall: DIFF)
+ - COSP answer changes due to bug fix and new COSP submodule
+
+Summarize any changes to answers: COSP answer changes validated by Brian Medeiros (brianpm)
+
+===============================================================
+===============================================================
+
 Tag name: cam6_4_127
 Originator(s):  courtneyp, jedwards
 Date: Oct 24, 2025