Final updates

doc/ChangeLog

@@ -2,27 +2,59 @@
 
 Tag name: cam6_4_019
 Originator(s): katec, cacraig, vlarson, bstephens82, huebleruwm, zarzycki, JulioTBacmeister, jedwards4b
-Date: 10 August 2024
+Date: 12 August 2024
 One-line Summary: New CLUBB external, new GPU/nvhpc test suite, new CDEPS external
 Github PR URL: https://github.com/ESCOMP/CAM/pull/1086
 
 Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+ - New CLUBB external with fixes to support GPU testing #1036
+ - part of cam6_4_019: Add GPU regression test suite #1048
 
-Describe any changes made to build system: update git-fleximod
+Describe any changes made to build system: none
 
-Describe any changes made to the namelist: none
+Describe any changes made to the namelist:
+ - Add default vaules for a few new CLUBB namelist parameters: clubb_bv_efold, clubb_wpxp_Ri_exp, and clubb_z_displace
 
 List any changes to the defaults for the boundary datasets: none
 
 Describe any substantial timing or memory changes: none
 
-Code reviewed by: cacraigucar
+Code reviewed by: cacraigucar, sjsprecious, adamrher, bstephens82
 
-List all files eliminated: none
+List all files eliminated:
+	cime/config/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_comands
+	cime/config/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam
+	cime/config/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm
+	- Removed as part of GPU test updates
 
-List all files added and what they do:
+List all files added and what they do: None
 
 List all existing files that have been modified, and describe the changes:
+	.gitmodules
+	- Point to new CLUBB external (clubb_4ncar_20240605_73d60f6_gpufixes_posinf)
+	and new CDEPS external (cdeps1.0.45)
+
+	cime/config/testdefs/testlist_cam.xml
+	- Add nvhpc gpu test on Derecho, remove Casper tests
+
+	cime/config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands
+	cime/config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands
+	- Change NTASKS for Derecho gpus
+
+	cime/config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/
+	- Directory renamed to cime/config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols760
+	- Files updated to reflect the change
+
+	doc/ChangeLog_template
+	- Added space for new derecho/nvhpc required tests
+
+	src/physics/cam/clubb_intr.F90
+	src/physics/cam/subcol_SILHS.F90
+	- Updates to support the new external
+
+	test/system/archive_baseline.sh
+	test/system/test_driver.sh
+	- Updates to require CAM_FC compiler specification on Derecho (either intel or nvhpc)
 
 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,
@@ -91,13 +123,30 @@ ERS_Ln9_G4-a100-openacc.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s
 - Expected baseline compare fail due to no baselines stored for GPU tests that didn't exist previously
 
 izumi/nag/aux_cam:
+DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
+- pre-existing failure - issue #670
+
+ERC_D_Ln9.f10_f10_mg37.QPC6.izumi_nag.cam-outfrq3s_am (Overall: DIFF) details:
+ERC_D_Ln9.f10_f10_mg37.QPC6.izumi_nag.cam-outfrq3s_cospsathist (Overall: DIFF) details:
+ERC_D_Ln9.f10_f10_mg37.QPC6.izumi_nag.cam-outfrq3s (Overall: DIFF) details:
+ERC_D_Ln9.f10_f10_mg37.QPWmaC6.izumi_nag.cam-outfrq3s (Overall: DIFF) details:
+ERI_D_Ln18.f19_f19_mg17.QPC6.izumi_nag.cam-ghgrmp_e8 (Overall: DIFF) details:
+ERP_Ln9.ne5pg3_ne5pg3_mg37.QPC6.izumi_nag.cam-outfrq9s_clubbmf (Overall: DIFF) details:
+SMS_D_Ln9.f10_f10_mg37.QPC6.izumi_nag.cam-outfrq3s_ba (Overall: DIFF) details:
+SMS_P48x1_D_Ln3.f09_f09_mg17.QPC6HIST.izumi_nag.cam-outfrq3s_co2cycle_usecase (Overall: DIFF) details:
+- Expected differences due to the new CLUBB external (See PR for discussion)
 
 izumi/gnu/aux_cam:
+ERP_D_Ln9.C48_C48_mg17.QPC6.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
+ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp (Overall: DIFF) details:
+- Expected differences due to the new CLUBB external (See PR for discussion)
 
 CAM tag used for the baseline comparison tests if different than previous
-tag:
+tag: cam6_4_018
 
-Summarize any changes to answers: BFB, as expected
+Summarize any changes to answers:
+	All compsets that use CLUBB (cam6+) will have slight answer changes. Discussion in PR.
+	Nvhpc gpu tests have no stored baseline for comparison.
 
 ===============================================================