Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,23 @@ def buildnml(case, caseroot, compname):
RUN_REFDATE = case.get_value("RUN_REFDATE")
RUN_REFTOD = case.get_value("RUN_REFTOD")
COMP_INTERFACE = case.get_value("COMP_INTERFACE")
CALENDAR = case.get_value("CALENDAR")
COMPSET = case.get_value("COMPSET")

# The Gregorian calendar currently can't be used with spinup compsets
# because CAM's stream-handling code can't handle a request for data
# for Feb 29 (possibly specified in a leapday testmod) from a non-leap-year
# in the stream(s) data (specified in a use_case, e.g. 1850_cam_lt.xml).
# This limitation can be removed when CAM's stream-handling is switched to
# using CDEPS, which appears to handle this situation. (See discussion in
# https://github.com/ESCOMP/CAM/issues/1447 for details.)
if CALENDAR.startswith("GREGORIAN"):
spinup_po = re.compile('\d{4}')
spinup = spinup_po.match(COMPSET)
expect(spinup == None,
"Gregorian calendar (modifier _cG) cannot be used with spinup compset \n {}".format(COMPSET)
)


testsrc = os.path.join(srcroot, "components", "cam")
if os.path.exists(testsrc):
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERP_Ln9_P24x2" testmods="cam/outfrq9s_mee_fluxes" supported="false">
<test compset="FWmaHIST" grid="f10_f10_mg37" name="SMS_D_Ln9" testmods="cam/outfrq9s_mee_fluxes" supported="false">
<machines>
<machine name="izumi" compiler="gnu" category="aux_cam"/>
</machines>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ if [ "$driver" = "nuopc" ]; then
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
fi
./xmlchange RUN_STARTDATE=2012-02-29
./xmlchange RUN_STARTDATE=2008-02-29
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@
hist_nhtfrq = 9
hist_mfilt = 1
hist_ndens = 1

check_finidat_year_consistency = .false.
for_testing_allow_non_annual_changes = .true.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!----------------------------------------------------------------------------------
! Users should add all user specific namelist changes below in the form of
! namelist_var = new_namelist_value
! NOTE: namelist variable delt_mosart (the time-step) CAN ONLY be changed by modifying the value
! of the xml variable ROF_NCPL in env_run.xml
!----------------------------------------------------------------------------------
nhtfrq = -24

81 changes: 81 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,84 @@

===============================================================

Tag name: cam6_4_147
Originator(s): kdraeder, cacraigucar
Date: Jan 28, 2026
One-line Summary: Made ERI test check for Gregorian+spinup compset incompatibility
Github PR URL: https://github.com/ESCOMP/CAM/pull/1473

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- ERI test; consistency of compset and calendar: https://github.com/ESCOMP/CAM/issues/1447

Describe any changes made to build system:
- Now checks that a user is not using the gregorian calendar with a spinup compset since the stream handling
has issues with leap days

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: cacraigucar

List all files eliminated: N/A

List all files added and what they do:
A cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart
- add output frequency for mosart

List all existing files that have been modified, and describe the changes:
M cime_config/buildnml
- add check to prevent gregorian calendar to be used with spinup compsets

M cime_config/testdefs/testlist_cam.xml
- change test which was using gregorian calendaro with a spinup compset to a working configuration

M cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands
M cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm
- mods to better test leapday

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:
ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri (Overall: FAIL) details:
- pre-existing failure
- ERI test discovered a bug in CICE: See: https://github.com/ESCOMP/CESM_CICE/issues/34

SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details:
FAIL SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday NLCOMP
FAIL SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday BASELINE /glade/campaign/cesm/community/amwg/cam_base
- Changed namelist settings for the leapday test

derecho/nvhpc/aux_cam:
ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) details:
- pre-existing failure -- exceeds wallclock time limit
NOTE: Jian has determined this is due to changes on derecho with the the last upgrade.
He has reported the issue to CISL. Note cam6_4_128 is the last CAM tag with
baselines to use for comparison but answer changes are expected starting with
cam6_4_130.

End of cesm.log file:
deg0049.hsn.de.hpc.ucar.edu 0: calcsize j,iq,jac, lsfrm,lstoo 2 5 2 19 20
deg0049.hsn.de.hpc.ucar.edu 1: Opened file
deg0049.hsn.de.hpc.ucar.edu 1: ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default.G.aux_cam_nvhpc_20260123064354.cam.r.1979-01-01-09000.nc
deg0049.hsn.de.hpc.ucar.edu 1: to write 316
deg0051.hsn.de.hpc.ucar.edu: rank 64 died from signal 15


izumi/nag/aux_cam: all BFB

izumi/gnu/aux_cam:
SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes (Overall: DIFF) details:
FAIL SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes NLCOMP
FAIL SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes BASELINE
- Introduced new test

===============================================================
===============================================================

Tag name: cam6_4_146
Expand Down