Fix cosp test and final ChangeLog for cam6_4_096

Author: cacraigucar

cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam

@@ -4,7 +4,8 @@ nhtfrq=9,9,9,9,9,9
 inithist='ENDOFRUN'
 
 fexcl1='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_PIA','CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_RAINHARD','CS_SNOWCERT','CS_SNOWPOSS',
+       'CS_UN'
 
  mode_defs=
 'mam4_mode1:accum:=', 'A:num_a1:N:num_c1:num_mr:+',
@@ -57,4 +58,4 @@ rad_diag_2=
   'M:mam4_m2_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode2_rrtmg_aitkendust_c141106.nc',
   'M:mam4_m3_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc',
   'M:mam4_mode4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc'
-  
+

doc/ChangeLog

@@ -1,3 +1,226 @@
+
+===============================================================
+
+Tag name: cam6_4_096
+Originator(s): cacraig
+Date: June 12, 2025
+One-line Summary: Update externals to match cesm3_0_alpha06g/beta06
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1321
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+ - Update externals to match alpha06g: https://github.com/ESCOMP/CAM/issues/1320
+
+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: nusbaume
+
+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       components/cice
+M       libraries/FMS
+M       tools/CUPiD
+           - update externals
+
+M       cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam
+           - Needed to add a cosp variable to the fexcl list to fix failing baseline test
+
+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:
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+   - Pre-existing failure due to build-namelist error requiring CLM/CTSM external update
+
+  ERC_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERC_D_Ln9_P512.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+  ERC_D_Ln9_P512.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+  ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details:
+  ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
+  ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
+  ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF) details:
+  ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.f09_f09_mg17.F2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERR_Ln9.ne16pg3_ne16pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s_bwic (Overall: DIFF) details:
+  ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details:
+  SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9.f09_f09_mg17.FSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4 (Overall: DIFF) details:
+  SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+  SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
+  SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
+  SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
+  SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
+  SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
+  SMS_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-nudging (Overall: DIFF) details:
+  SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s (Overall: DIFF) details:
+  SMS_Ln9.f19_f19_mg17.F2000climo.derecho_intel.cam-silhs (Overall: DIFF) details:
+  SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s_nochem (Overall: DIFF) details:
+  SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details:
+     - Namelist differences in externals
+     - Answer changes due to externals updates
+
+derecho/nvhpc/aux_cam:
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: DIFF) details:
+     - Namelist differences in externals
+     - Answer changes due to externals updates
+
+izumi/nag/aux_cam:
+  ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: DIFF) details:
+     - Namelist differences in externals
+     - Answer changes due to externals updates
+
+izumi/gnu/aux_cam:
+  ERS_Ln9_P24x1.mpasa480_mpasa480.F2000climo.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
+  SMS_P48x1_D_Ln9.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
+     - Namelist differences in externals
+     - Answer changes due to externals updates
+
+===============================================================
+===============================================================
+
+Tag name: cam6_4_095
+Originator(s): eaton
+Date: 29 May 2025
+One-line Summary: Update CAM testing. Bugfix for config_component.xml.
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1316
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+. Making progress on (but not resolving):
+
+  Issue #258 - Most converted CESM regression tests are CAM5 - may want to make most CAM7
+  - Add QPC7 tests on mpasa120 and mpasa480 grids
+
+. Modify MPAS testing
+  - merge the outfrq9s_mpasa480_pertlim testmods into outfrq9s_mpasa480.
+    Don't need separate testmods to turn on pertlim.
+
+. Fix MPAS frontogenesisAngle calc to avoid invalid operation (same fix as
+  used by SE).
+
+. Fix #1315 - CAM_NML_USE_CASE bug
+  - fix bug in config_component.xml for B compsets.
+
+. Update cime submodule.
+
+Describe any changes made to build system: none
+
+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: cacraig
+
+List all files eliminated:
+
+cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/*
+. merged these testmods with outfrq9s_mpasa480
+
+List all files added and what they do:
+
+List all existing files that have been modified, and describe the changes:
+
+bld/build-namelist
+. remove duplicate mpas_print_detailed_minmax_vel setting
+
+bld/namelist_files/namelist_defaults_cam.xml
+. remove duplicate mpas_print_detailed_minmax_vel setting
+. set defaults for mpas_print_* to .false..  These prints are every
+  timestep and generate huge logfiles for long production runs.
+. add spun-up IC files for QPC7 using mpasa120 and mpasa480 grids.
+
+cime_config/config_component.xml
+. Fix CAM_NML_USE_CASE setting for HISTC_CAM70 compsets.  This is a bug for
+  the B compsets, but doesn't impact F compsets.
+
+cime_config/testdefs/testlist_cam.xml
+. replace
+  ERS_D_Ln9.mpasa480_mpasa480.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa480
+  by
+  ERC_D_Ln9_P512.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120
+. replace
+  ERS_D_Ln9.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480_pertlim
+  by
+  ERC_D_Ln9.mpasa480_mpasa480_mt232.QPC7.izumi_nag.cam-outfrq9s_mpasa480
+
+cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa480_pertlim/user_nl_cam
+. add pertlim = 1.e-14
+
+cime_config/testdefs/testmods_dirs/cam/outfrq9s_mpasa120/user_nl_clm
+. add flanduse_timeseries = ''
+
+src/dynamics/mpas/dp_coupling.F90
+. add tiny value to frontogenesisAngle calc to avoid invalid operation when
+  both theta_x and theta_y are 0.0.  This mimics what's done in SE dycore.
+
+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_P512.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+ERC_D_Ln9_P512.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+ERC_D_Ln9_P512.mpasa120_mpasa120.QPC7.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
+- new tests - no baselines
+
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+- pre-existing failure due to CLM build-namelist error
+
+derecho/nvhpc/aux_cam: PASS
+
+izumi/nag/aux_cam:
+
+ERC_D_Ln9.mpasa480_mpasa480_mt232.FHS94.izumi_nag.cam-outfrq9s (Overall: NLFAIL) details:
+Summarize any changes to answers, i.e.,
+- what code configurations:
+- what platforms/compilers:
+- nature of change (roundoff; larger than roundoff but same climate; new
+  climate):
+
+If bitwise differences were observed, how did you show they were no worse
+than roundoff?
+
+If this tag changes climate describe the run(s) done to evaluate the new
+climate in enough detail that it(they) could be reproduced, i.e.,
+- source tag (all code used must be in the repository):
+- platform/compilers:
+- configure commandline:
+- build-namelist command (or complete namelist):
+- MSS location of output:
+
+MSS location of control simulations used to validate new climate:
+
+URL for AMWG diagnostics output used to validate new climate:
+
+===============================================================
 ===============================================================
 
 Tag name: cam6_4_095
@@ -82,7 +305,7 @@ 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: 
+derecho/intel/aux_cam:
 
 ERC_D_Ln9_P512.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
 ERC_D_Ln9_P512.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
@@ -151954,127 +152177,6 @@ Changes made:
 	files.
 
 	Support IBM and Compaq. Will compile/run on Cray, but radiation changes
-	(which are highly scalar) make it run very slow. Cray will no longer be
-	supported.
-
-	Atmosphere determines partitioning of rain/snow.
-
-	SPMD mode now works. Support hybrid SPMD/OMP memory running on IBM, Compaq.
-
-===============================================================
-===============================================================
-
-ccm3_8
-Originator: rosinski ( ROSINSKI JIM 1397 ML CGD)
-Date: Fri Aug 20 11:24:07 MDT 1999
-Model: CCM
-Version: CCM3.8
-One-line Summary: Merged netcdfhtape branch to trunk
-Requires change in build system: Yes.  makdep now required.  New Makefile
-Requires change in run script: Yes.  Namelist changes.
-Run through comtest.spectral.csh and comtest.sld.csh: Yes
-Run through csm.test.nqs: no
-Updated the DatasetLog: no
-Changes answers: no (bit-for-bit)
-Changes made:
-
-	o Model now writes netcdf history tapes.
-	o Requires f90 compiler since modules and allocatable arrays are
-	  used.  Code now should be fully f90-compliant.  No more Cray
-	  pointers or user-defined Fortran interfaces to malloc.
-	o Cloud water is a non-advected tracer as opposed to advecting it
-	  and throwing away the results of the advection (mvertens).
-	o Model at least runs on IBM.  Have not done error growth analysis.
-	o Moved time filter and mass fixer to scan2.  This became possible
-	  with the time-split physics.
-	o Precision now specified in code rather than relying on vendor flag
-	  (e.g. -r8). This change has not yet been put in the library code
-	  (e.g. ecmfft), so -r8 flag (or equivalent) is still needed for
-	  these files.
-	o Build procedure now REQUIRES use of the makdep routine provided
-	  in tools/makdep.  The reason is that no standard UNIX tool I
-	  know of can provide the full dependency analysis needed.
-	o Eliminated out-of-core option.  History, radiation, and main
-	  model buffers are now modules.  Integer pointers to buffer
-	  locations are gone, as are /comgrd/ and points.F
-	o Namelist changes:
-
-old namelist                              new namelist
-------------                              ------------
-
- &CCMEXP                                    &CCMEXP
- nlfilt   ! write extra time sample------>  <gone>
-          ! to 1st volume
- stfnum   ! starting file number--------->  <gone>
- incorrad ! abs/ems in core-------------->  <gone>
- incorbuf ! model buffer in core--------->  <gone>
- incorhst ! history buffer in core------->  <gone>
- ndens = [1,2, or 4] ! packing density--->  ndens = [1 or 2]  ! double or float
- primary = 'T', 'Q',...------------------>  fincl1 = 'T', 'Q',...
- auxf    = '1', 'T', 'Q',...,------------>  fincl2 = 'T', 'Q',...
-           '2', 'V', 'U',...------------->  fincl3 = 'V', 'U',...
- exclude = 'PS','PHIS',...--------------->  fexcl1 = 'PS','PHIS',...
- <didn't exist>-------------------------->  fexcl2 = 'CMFMCA','SOLIN',...
- <didn't exist>-------------------------->  xzy = [T or F] ! non-coords order
- /                                          /
-
-
-===============================================================
-===============================================================
-
-ccm3_7
-Originator: erik ( Erik Kluzek)
-Date: Fri May 28 13:38:40 MDT 1999
-Model: CCM
-Version: CCM3.7
-One-line Summary: Prognostic cloud-water and sulfur cycle
-Requires change in build system: Yes
-(new directory scyc)
-Requires change in run script: Yes
-(need to use readtrace=.F. and cldw_adv=.T.)
-Run through comtest.spectral.csh and comtest.sld.csh: Yes
-Run through csm.test.nqs: Yes
-Updated the DatasetLog (for new input data-files): Yes
-Changes answers: yes
-Name of tests cases on NCAR Mass-Store: /JET/csm/prgcld01
-Changes made:
-
-        Prognostic cloud-water and sulfur cycle put on the CCM development trunk.
-Changes are huge, in essense this puts ccm3_6_20_brnchT_scycRad1_13 on the
-trunk.  Standard mode to run is now with 30 levels and with the NOAA Ozone
-dataset. So use: SEP1.T42L30_diffPHIS.0599.nc and noaao3.1990.21999.nc.
-Using these datasets readtrace must be set to FALSE and normal operation
-is with cldw_adv TRUE.  To build you must put the "src/scyc" directory in
-your path (optionally you can checkout the dscyc module which has dummy
-stub routines for the sulfur codes).  The default operation is without any
-of the sulfur cycle stuff turned on.
-
-        Caveat's:  MODEL DOES NOT WORK WITH SPMD MODE!
-                    CSM was tested to ensure it works, but there were
-        changes that haven't had a long simulation done to verify they
-        are working correctly.
-
-        SLD mode was tested to ensure it works, but long simulations
-        were not performed.
-
-        Model tested on SGI, Cray, and Sun. But, the most extensive testing
-        was on the SGI (ute).
-
-        SOM not tested.  Only dom mode was tested.
-
-        A change was put into the LSM for arbitrary initialization. The
-        change is bit-for-bit when not using arbitrary initialization.
-        But, new spin-up datasets have not been created nor long-simulations
-        with the change (the change makes points southward of 60S land ice and
-        initializes them with a snow depth of 1m).
-
-        Current version does not work with the 44 mid-atmosphere model.
-
-        (a fix is on the way soon).
-
-        Sulfur code has it's own version of the solar zenith angle.  This
-        routine is incompatible with the version in csm_share.  This means
-        the model should not be used for Paleo simulations, with sulfur cycle
         turned on.
         (a fix is on the way soon).