From 8c33802404ede88f22e7b7c149f43e63c2362f24 Mon Sep 17 00:00:00 2001
From: Jesse Nusbaumer <nusbaume@ucar.edu>
Date: Sun, 22 Dec 2024 13:39:04 -0700
Subject: [PATCH 1/5] Revert "limit t_sfc to valid temperature range"

This reverts commit 6229b1a6c648667e301e02ed31d7c070bf2f97c3.
---
 src/physics/rrtmgp/rrtmgp_inputs.F90 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/physics/rrtmgp/rrtmgp_inputs.F90 b/src/physics/rrtmgp/rrtmgp_inputs.F90
index 191b6ff8a0..4f73ae9029 100644
--- a/src/physics/rrtmgp/rrtmgp_inputs.F90
+++ b/src/physics/rrtmgp/rrtmgp_inputs.F90
@@ -178,8 +178,6 @@ subroutine rrtmgp_set_state( &
    tref_max = kdist_sw%get_temp_max()
    t_rad = merge(t_rad, tref_min, t_rad > tref_min)
    t_rad = merge(t_rad, tref_max, t_rad < tref_max)
-   t_sfc = merge(t_sfc, tref_min, t_sfc > tref_min)
-   t_sfc = merge(t_sfc, tref_max, t_sfc < tref_max)
 
    ! Construct arrays containing only daylight columns
    do i = 1, nday

From b851c072ca524133c0210aab10a1ae33905042e5 Mon Sep 17 00:00:00 2001
From: Jesse Nusbaumer <nusbaume@ucar.edu>
Date: Sun, 22 Dec 2024 13:45:08 -0700
Subject: [PATCH 2/5] Update CICE tag to fix bad surface temperature values.

---
 .gitmodules     | 2 +-
 components/cice | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 0176e8431c..0ceaa9a13f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
 [submodule "cice"]
 path = components/cice
 url = https://github.com/ESCOMP/CESM_CICE
-fxtag = cesm_cice6_5_0_12
+fxtag = cesm3_cice6_6_0_5
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
 
diff --git a/components/cice b/components/cice
index f14ec8339b..787d3ccf3b 160000
--- a/components/cice
+++ b/components/cice
@@ -1 +1 @@
-Subproject commit f14ec8339bc5bc4a7a0664da5e247b5cfda531a1
+Subproject commit 787d3ccf3b242214b0add3e474672f0609efcf2d

From 726f965bf9610b506fdb15fcc75a72fb3367982e Mon Sep 17 00:00:00 2001
From: Jesse Nusbaumer <nusbaume@ucar.edu>
Date: Sun, 22 Dec 2024 14:11:06 -0700
Subject: [PATCH 3/5] Initial ChangeLog update.

---
 doc/ChangeLog | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index cf2aa2517d..50a1d3983b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,59 @@
 ===============================================================
 
+Tag name: cam6_4_0XX
+Originator(s): nusbaume
+Date: 22 December 2024
+One-line Summary: Revert t_sfc limiter in RRTMGP
+Github PR URL: https://github.com/ESCOMP/CAM/pull/XXXX
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+#1188 - Revert t_sfc limiter
+  - Also updates the CICE tag to fix the original bad temperatures problem.
+
+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: cacraig, peverwhee
+
+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
+  - Update CICE tag to cesm3_cice6_6_0_5 (Github issue #1185)
+
+M       src/physics/rrtmgp/rrtmgp_inputs.F90
+  - Revert t_sfc limiter in RRTMGP (Github PR #1184)
+
+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:
+
+derecho/nvhpc/aux_cam:
+
+izumi/nag/aux_cam:
+
+izumi/gnu/aux_cam:
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers:
+
+===============================================================
+
 Tag name: cam6_4_048
 Originator(s): jedwards4b, peverwhee
 Date: 20 December 2024

From a5ed0a514c5e6a2e9b905565fcd1c4a4b60a55e7 Mon Sep 17 00:00:00 2001
From: Jesse Nusbaumer <nusbaume@ucar.edu>
Date: Tue, 7 Jan 2025 13:28:36 -0700
Subject: [PATCH 4/5] Update CICE tag to cesm3_cice6_6_0_6.

---
 .gitmodules            | 2 +-
 cime                   | 2 +-
 src/atmos_phys         | 2 +-
 src/physics/carma/base | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e83e1f6a5c..752c3bf4f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
 [submodule "cice"]
 path = components/cice
 url = https://github.com/ESCOMP/CESM_CICE
-fxtag = cesm3_cice6_6_0_5
+fxtag = cesm3_cice6_6_0_6
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
 
diff --git a/cime b/cime
index ac8e583108..b2f271b174 160000
--- a/cime
+++ b/cime
@@ -1 +1 @@
-Subproject commit ac8e583108b1ce1f592a6f6436c71d6dc087f447
+Subproject commit b2f271b1742533715a05701b1bdd80a24bb2ad77
diff --git a/src/atmos_phys b/src/atmos_phys
index c3de8468f7..67927f1511 160000
--- a/src/atmos_phys
+++ b/src/atmos_phys
@@ -1 +1 @@
-Subproject commit c3de8468f7b245a939448f4ca6d3ef386584e92d
+Subproject commit 67927f15113eb9c5d4a57f2276d67b8ad88c5149
diff --git a/src/physics/carma/base b/src/physics/carma/base
index 67418505b4..bf165cd84e 160000
--- a/src/physics/carma/base
+++ b/src/physics/carma/base
@@ -1 +1 @@
-Subproject commit 67418505b48787bd305a50ffb581f98f0b466cba
+Subproject commit bf165cd84ef94087d9a5669a5ad47838ab24c0ef

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 5/5] 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