Merge pull request #1211 from nusbaume/t_sfc_revert

cam6_4_054: Revert t_sfc limiter in RRTMGP

.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_6
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
 

doc/ChangeLog

@@ -1,5 +1,87 @@
 ===============================================================
 
+Tag name: cam6_4_054
+Originator(s): nusbaume
+Date: 9 Jan 2025
+One-line Summary: Revert t_sfc limiter in RRTMGP
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1211
+
+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_6 (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.
+
+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:
+
+Summarize any changes to answers:
+
+===============================================================
+===============================================================
+
 Tag name: cam6_4_053
 Originator(s): fvitt
 Date: 7 Jan 2025
@@ -597,6 +679,7 @@ Summarize any changes to answers: none
 
 ===============================================================
 
+>>>>>>> upstream/cam_development
 Tag name: cam6_4_048
 Originator(s): jedwards4b, peverwhee
 Date: 20 December 2024

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