From 5f21959320ab834fdc2a6351153416daf170d425 Mon Sep 17 00:00:00 2001
From: Jesse Nusbaumer <nusbaume@ucar.edu>
Date: Thu, 9 Jan 2025 09:22:22 -0700
Subject: [PATCH] Finalize ChangeLog and update submodules from previous PRs.

---
 cime                   |  2 +-
 components/cice        |  2 +-
 doc/ChangeLog          | 29 ++++++++++++++++++++++++++++-
 src/atmos_phys         |  2 +-
 src/physics/carma/base |  2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/cime b/cime
index b2f271b174..ac8e583108 160000
--- a/cime
+++ b/cime
@@ -1 +1 @@
-Subproject commit b2f271b1742533715a05701b1bdd80a24bb2ad77
+Subproject commit ac8e583108b1ce1f592a6f6436c71d6dc087f447
diff --git a/components/cice b/components/cice
index 787d3ccf3b..e51ab1d3f1 160000
--- a/components/cice
+++ b/components/cice
@@ -1 +1 @@
-Subproject commit 787d3ccf3b242214b0add3e474672f0609efcf2d
+Subproject commit e51ab1d3f12ae2959b7df978f77dc5a1ee0181d3
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6698551623..87cb50a54a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -2,7 +2,7 @@
 
 Tag name: cam6_4_054
 Originator(s): nusbaume
-Date: 7 Jan 2025
+Date: 9 Jan 2025
 One-line Summary: Revert t_sfc limiter in RRTMGP
 Github PR URL: https://github.com/ESCOMP/CAM/pull/1211
 
@@ -39,14 +39,41 @@ 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.
 
+ALL F-compset answers changed (DIFF) due to the new CICE tag.
+
+Also any tests with RRTMGP will also have answer changes due
+to the removal of the surface temperature limiter.
+
 derecho/intel/aux_cam:
 
+  All F-compset tests
+ -NLCOMP and baseline DIFF failures due to the new CICE tag and t_sfc changes
+
+  ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
+ - pre-existing failure -- issue #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:
 
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL)
+ - pre-existing failure -- issue #1220
+ - also had NLCOMP and baseline DIFF failures due to the new CICE tag and t_sfc changes.
+
 izumi/nag/aux_cam:
 
+  DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL)
+ - pre-existing failure -- issue #670
+
 izumi/gnu/aux_cam:
 
+  ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s (Overall: DIFF)
+  ERS_Ln9_P24x1.mpasa480_mpasa480.F2000climo.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF)
+  SMS_P48x1_D_Ln9.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s (Overall: DIFF)
+ - NLCOMP and baseline DIFF failures due to the new CICE tag and t_sfc changes.
+
 CAM tag used for the baseline comparison tests if different than previous
 tag:
 
diff --git a/src/atmos_phys b/src/atmos_phys
index 67927f1511..c3de8468f7 160000
--- a/src/atmos_phys
+++ b/src/atmos_phys
@@ -1 +1 @@
-Subproject commit 67927f15113eb9c5d4a57f2276d67b8ad88c5149
+Subproject commit c3de8468f7b245a939448f4ca6d3ef386584e92d
diff --git a/src/physics/carma/base b/src/physics/carma/base
index bf165cd84e..67418505b4 160000
--- a/src/physics/carma/base
+++ b/src/physics/carma/base
@@ -1 +1 @@
-Subproject commit bf165cd84ef94087d9a5669a5ad47838ab24c0ef
+Subproject commit 67418505b48787bd305a50ffb581f98f0b466cba