Merge pull request #1289 from peverwhee/always-calc-swnet

Fixes for failing restart tests

Author: cacraigucar

cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam

@@ -3,4 +3,4 @@ ndens=1,1,1,1,1,1
 nhtfrq=3,3,3,3,3,3
 inithist='ENDOFRUN'
 fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA',
-       'CS_RAINPOSS','CS_RAINPROB','CS_SNOWCERT','CS_SNOWPOSS'
+       'CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_SNOWCERT','CS_SNOWPOSS'

doc/ChangeLog

@@ -1,3 +1,71 @@
+
+===============================================================
+
+Tag name: cam6_4_081
+Originator(s): peverwhee, cacraig
+Date: March 26, 2025
+One-line Summary: Fixes for failing restart tests
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1289
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+     - Fixes failing cosp test which was writing out a task dependent cosp variable
+     - Always sets cam_out%netsw, not only when shortwave radiation call was made
+     - Two restart_test have answer changes due to moving mountain update in cam6_4_078:
+         https://github.com/ESCOMP/CAM/issues/1284 (turned out to not be due to the moving mountain update)
+
+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
+
+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       cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam
+          - Remove task dependent variable from cosp output file
+
+M       src/physics/rrtmgp/radiation.F90
+          - Always set cam_out%netsw
+
+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:
+  ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
+  SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
+  SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
+     - pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856)
+
+  SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
+     - pre-existing failures due to build-namelist error requiring CLM/CTSM external update
+
+  ERC_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) details:
+  ERP_D_Ln9.ne30pg3_ne30pg3_mt232.QPC7.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) details:
+     - namelist had one field removed and baseline comparison said was BFB except the field lists differed (due to
+       variable being removed from output list)
+
+  ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+     - baseline change due to always setting cam_out%netsw
+
+derecho/nvhpc/aux_cam: all BFB
+
+izumi/nag/aux_cam:
+   ERC_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-outfrq3s_cosp (Overall: DIFF) details:
+     - namelist had one field removed and baseline comparison said was BFB except the field lists differed (due to
+       variable being removed from output list)
+
+izumi/gnu/aux_cam: all BFB
+
+===============================================================
 ===============================================================
 
 Tag name: cam6_4_080

src/physics/rrtmgp/radiation.F90

@@ -1420,6 +1420,8 @@ subroutine radiation_tend( &
    qrs(:ncol,:) = qrs(:ncol,:) * state%pdel(:ncol,:)
    qrl(:ncol,:) = qrl(:ncol,:) * state%pdel(:ncol,:)
 
+   cam_out%netsw(:ncol) = fsns(:ncol)
+
    if (.not. present(rd_out)) then
       deallocate(rd)
    end if
@@ -1496,8 +1498,6 @@ subroutine set_sw_diags()
       rd%fsnsc(:ncol) = fcns(:ncol,pverp)   ! net sw clearsky flux at surface
       rd%fsntc(:ncol) = fcns(:ncol,ktopcam) ! net sw clearsky flux at top
 
-      cam_out%netsw(:ncol) = fsns(:ncol)
-
       ! Output fluxes at 200 mb
       call vertinterp(ncol, pcols, pverp, state%pint, 20000._r8, fns,  rd%fsn200)
       call vertinterp(ncol, pcols, pverp, state%pint, 20000._r8, fcns, rd%fsn200c)