Merge pull request #2900 from ekluzek/update_cdeps_with_cam7_nextsw_c…

…day_changes

Update cdeps with cam7 nextsw cday changes

.gitmodules

@@ -92,15 +92,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.53
+fxtag = cdeps1.0.57
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
 
 [submodule "share"]
 path = share
 url = https://github.com/ESCOMP/CESM_share
-fxtag = share1.1.2
+fxtag = share1.1.6
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share

cime_config/testdefs/ExpectedTestFails.xml

@@ -138,6 +138,13 @@
     </phase>
   </test>
 
+  <test name="SSPMATRIXCN_Ly5_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-ciso_monthly">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2913</issue>
+    </phase>
+  </test>
+
   <test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
     <phase name="RUN">
       <status>FAIL</status>

cime_config/testdefs/testlist_clm.xml

@@ -2487,7 +2487,7 @@
       <option name="comment">Include a test of transient lakes</option>
     </options>
   </test>
-  <test name="ERS_L761" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/smallville_dynurban_monthly">
+  <test name="ERS_Ld765" grid="1x1_smallvilleIA" compset="IHistClm50BgcCropQianRs" testmods="clm/smallville_dynurban_monthly">
     <machines>
       <machine name="derecho" compiler="gnu" category="aux_clm"/>
     </machines>

cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm

@@ -0,0 +1,2 @@
+iradsw = -1
+nextsw_cday_calc = "cam7"

cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm

@@ -0,0 +1,2 @@
+iradsw = -1
+nextsw_cday_calc = "cam7"

doc/ChangeLog

@@ -1,4 +1,98 @@
 ===============================================================
+Tag name: ctsm5.3.015
+Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
+Date: Wed 18 Dec 2024 02:09:40 PM MST
+One-line Summary: Update cdeps with cam7 nextsw cday changes
+
+Purpose and description of changes
+----------------------------------
+
+Update CDEPS with changes for CAM7 nextsw_cday handling. This changes answers
+for CPLHIST cases. We also changed the cam7LndTuningMode tests to turn this on
+for DATM to more closely match what CAM7 does.
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+   Fixes: #2897 Update CDEPS to bring in DATM change regarding nextsw_cday changing answers in CPLHIST cases
+
+Notes of particular relevance for users
+---------------------------------------
+
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+   New namelist parameter for DATM: nextsw_cday_calc
+      defaults to cam6, set to cam7 for CPLHIST and specific tests
+      Only applies if iradsw is NOT 0 or 1
+
+       Here is the documention on this in the namelist_definitial XML for DATM:
++      For CPLHIST cases, this should agree with the version of CAM (or other atmosphere
++      model) used to generate the CPLHIST forcings; the valid values for this variable are
++      based on this: 'cam6' is appropriate for cases generated with the driver ordering in
++      CAM6 and earlier, and 'cam7' is appropriate for cases generated with the driver
++      ordering in CAM7 and later.
++
++      For 'cam6', the next radiation timestep is set to the present time plus 2 timesteps
++      when mod(tod+dtime,delta_radsw)==0. For 'cam7', the next radiation timestep is set
++      to the present time plus 1 timestep when mod(tod,delta_radsw)==0.
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Changes to tests or testing:
+    cam7LndTuningMode testmods changed so that iradsw==-1 (hourly) , and nextsw_cday_calc='cam7'
+
+Testing summary: regular
+----------------
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+If the tag used for baseline comparisons was NOT the previous tag, note that here:
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Only for CPLHIST cases, otherwise bit-for-bit
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: Compsets with DATM^CPLHIST
+    - what platforms/compilers: All
+    - nature of change; larger than roundoff/same climate
+
+Other details
+-------------
+
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): cdeps share
+   cdeps to cdeps1.0.57
+   share to share1.1.6
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+   #2900 -- Update cdeps with cam7 nextsw cday changes
+
+===============================================================
+===============================================================
 Tag name: ctsm5.3.014
 Originator(s): multiple (see contributors below)
 Date: Tue 03 Dec 2024 04:31:03 PM MST

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.3.015     erik 12/18/2024 Update cdeps with cam7 nextsw cday changes
        ctsm5.3.014     erik 12/03/2024 Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags
        ctsm5.3.013     erik 11/26/2024 Merge b4b-dev
        ctsm5.3.012  afoster 11/13/2024 update fates tag