Merge pull request #2676 from samsrabin/fix-nag-bld-2659

Rework crop_calendars suite and cropMonthOutput

cime_config/testdefs/ExpectedTestFails.xml

@@ -163,13 +163,6 @@
     </phase>
   </test>
 
-  <test name="SMS_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI">
-    <phase name="SHAREDLIB_BUILD">
-      <status>FAIL</status>
-      <issue>#2659</issue>
-    </phase>
-  </test>
-
   <!-- fates test suite failures -->
 
   <test name="ERS_D_Ld3.f45_f45_mg37.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdLUH2">

cime_config/testdefs/testlist_clm.xml

@@ -3560,7 +3560,7 @@
     </options>
   </test>
 
-  <test name="SMS_Lm25" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/RxCropCalsNoAdapt">
+  <test name="SMS_Ld733" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsNoAdapt">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
     </machines>
@@ -3569,18 +3569,26 @@
     </options>
   </test>
 
-  <test name="SMS_Lm25" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/RxCropCalsAdaptGGCMI">
+  <test name="SMS_D_Ld733" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+    </options>
+  </test>
+
+  <test name="SMS_D_Ld65" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/cropMonthOutput--clm/RxCropCalsAdaptGGCMI">
+    <machines>
       <machine name="izumi" compiler="nag" category="crop_calendars"/>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
     </machines>
     <options>
-      <option name="wallclock">01:00:00</option>
+      <option name="wallclock">00:30:00</option>
     </options>
   </test>
 
-  <test name="ERP_D_P128x1_Ld26" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
+  <test name="ERP_D_P128x1_Ld26" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/crop--clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
@@ -3590,7 +3598,7 @@
     </options>
   </test>
 
-  <test name="PEM_D_P128x1_Ld26" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
+  <test name="PEM_D_P128x1_Ld26" grid="f10_f10_mg37" compset="IHistClm60BgcCrop" testmods="clm/crop--clm/midDecStart--clm/RxCropCalsAdaptGGCMI">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="crop_calendars"/>

cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm

@@ -14,7 +14,7 @@ hist_fincl2  += 'DYN_COL_SOIL_ADJUSTMENTS_C'
 ! That's needed for the mxsowings and mxharvests axes to make sense.
 ! However, for testing purposes, it makes sense to save more frequently.
 hist_fincl3 = 'SDATES', 'SDATES_PERHARV', 'SYEARS_PERHARV', 'HDATES', 'GRAINC_TO_FOOD_PERHARV', 'GRAINC_TO_FOOD_ANN', 'GRAINN_TO_FOOD_PERHARV', 'GRAINN_TO_FOOD_ANN', 'GRAINC_TO_SEED_PERHARV', 'GRAINC_TO_SEED_ANN', 'GRAINN_TO_SEED_PERHARV', 'GRAINN_TO_SEED_ANN', 'HDATES', 'GDDHARV_PERHARV', 'GDDACCUM_PERHARV', 'HUI_PERHARV', 'SOWING_REASON_PERHARV', 'HARVEST_REASON_PERHARV', 'SWINDOW_STARTS', 'SWINDOW_ENDS', 'GDD20_BASELINE', 'GDD20_SEASON_START', 'GDD20_SEASON_END'
-hist_nhtfrq(3) = -24
-hist_mfilt(3) = 1
+hist_nhtfrq = -24,-8,-24
+hist_mfilt  = 1,1,1
 hist_type1d_pertape(3) = 'PFTS'
-hist_dov2xy(3) = .false.
+hist_dov2xy    = .true.,.false.,.false.

doc/ChangeLog

@@ -1,4 +1,75 @@
 ===============================================================
+Tag name: ctsm5.2.022
+Originator(s): samrabin (Sam Rabin, UCAR/TSS, [email protected])
+Date: Wed Aug 14 12:24:27 MDT 2024
+One-line Summary: Rework crop_calendars suite and cropMonthOutput
+
+Purpose and description of changes
+----------------------------------
+
+- Changes cropMonthOutput testmod so that h2 files are actually monthly instead of daily
+- Changes a nag test to use debug mode (fixing a build error) and run for shorter (fixing cputime exceedance)
+- Reworks RxCropCals* testmods to not include crop testmod
+
+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.)
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+[Remove any lines that don't apply. Remove entire section if nothing applies.]
+
+List of CTSM issues fixed (include CTSM Issue # and description):
+- Fixes ESCOMP/CTSM#2659: Test build failure: SMS_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI (https://github.com/ESCOMP/CTSM/issues/2659)
+
+
+Notes of particular relevance for developers:
+---------------------------------------------
+NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide
+
+Changes to tests or testing:
+- Changes answers to all cropMonthOutput tests due to changed h2 file frequency. Also affects frequency of one other test.
+
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline:
+  - Only in testmods, not production runs
+
+
+Other details
+-------------
+
+Pull Requests that document the changes (include PR ids):
+- ESCOMP/CTSM#2676: Rework crop_calendars suite and cropMonthOutput (https://github.com/ESCOMP/CTSM/pull/2676)
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.021
 Originator(s): rgknox (Ryan Knox,LAWRENCE BERKELEY NATIONAL LABORATORY,510-495-2153)
 Date: Tue 13 Aug 2024 03:22:34 PM MDT

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.2.022 samrabin 08/14/2024 Rework crop_calendars suite and cropMonthOutput
        ctsm5.2.021   rgknox 08/13/2024 Adding on-the-fly parameter settings for prescribed N and P in FATES
        ctsm5.2.020   slevis 08/12/2024 MEGAN updates (MEGAN-CLM6)
        ctsm5.2.019     erik 08/11/2024 Add in an additional dust emission method Leung_2023, by default off