Skip to content

Commit 1ee3228

Browse files
cacraigucarcacraigucar
authored
Merge pull request #1473 from kdraeder/cam_greg_ERI
cam6_4_147: Made ERI test check for Gregorian+spinup compset incompatibility
2 parents ec4cbde + 8ed75d5 commit 1ee3228

6 files changed

Lines changed: 110 additions & 3 deletions

File tree

‎cime_config/buildnml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,23 @@ def buildnml(case, caseroot, compname):
4747
RUN_REFDATE = case.get_value("RUN_REFDATE")
4848
RUN_REFTOD = case.get_value("RUN_REFTOD")
4949
COMP_INTERFACE = case.get_value("COMP_INTERFACE")
50+
CALENDAR = case.get_value("CALENDAR")
51+
COMPSET = case.get_value("COMPSET")
52+
53+
# The Gregorian calendar currently can't be used with spinup compsets
54+
# because CAM's stream-handling code can't handle a request for data
55+
# for Feb 29 (possibly specified in a leapday testmod) from a non-leap-year
56+
# in the stream(s) data (specified in a use_case, e.g. 1850_cam_lt.xml).
57+
# This limitation can be removed when CAM's stream-handling is switched to
58+
# using CDEPS, which appears to handle this situation. (See discussion in
59+
# https://github.com/ESCOMP/CAM/issues/1447 for details.)
60+
if CALENDAR.startswith("GREGORIAN"):
61+
spinup_po = re.compile('\d{4}')
62+
spinup = spinup_po.match(COMPSET)
63+
expect(spinup == None,
64+
"Gregorian calendar (modifier _cG) cannot be used with spinup compset \n {}".format(COMPSET)
65+
)
66+
5067

5168
testsrc = os.path.join(srcroot, "components", "cam")
5269
if os.path.exists(testsrc):

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@
10791079
<option name="wallclock">00:20:00</option>
10801080
</options>
10811081
</test>
1082-
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERP_Ln9_P24x2" testmods="cam/outfrq9s_mee_fluxes" supported="false">
1082+
<test compset="FWmaHIST" grid="f10_f10_mg37" name="SMS_D_Ln9" testmods="cam/outfrq9s_mee_fluxes" supported="false">
10831083
<machines>
10841084
<machine name="izumi" compiler="gnu" category="aux_cam"/>
10851085
</machines>

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ if [ "$driver" = "nuopc" ]; then
33
./xmlchange ROF_NCPL=\$ATM_NCPL
44
./xmlchange GLC_NCPL=\$ATM_NCPL
55
fi
6-
./xmlchange RUN_STARTDATE=2012-02-29
6+
./xmlchange RUN_STARTDATE=2008-02-29

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@
2424
hist_nhtfrq = 9
2525
hist_mfilt = 1
2626
hist_ndens = 1
27-
27+
check_finidat_year_consistency = .false.
28+
for_testing_allow_non_annual_changes = .true.

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
!----------------------------------------------------------------------------------
2+
! Users should add all user specific namelist changes below in the form of
3+
! namelist_var = new_namelist_value
4+
! NOTE: namelist variable delt_mosart (the time-step) CAN ONLY be changed by modifying the value
5+
! of the xml variable ROF_NCPL in env_run.xml
6+
!----------------------------------------------------------------------------------
7+
nhtfrq = -24
8+

‎doc/ChangeLog‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,84 @@
1+
2+
===============================================================
3+
4+
Tag name: cam6_4_147
5+
Originator(s): kdraeder, cacraigucar
6+
Date: Jan 28, 2026
7+
One-line Summary: Made ERI test check for Gregorian+spinup compset incompatibility
8+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1473
9+
10+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
11+
- ERI test; consistency of compset and calendar: https://github.com/ESCOMP/CAM/issues/1447
12+
13+
Describe any changes made to build system:
14+
- Now checks that a user is not using the gregorian calendar with a spinup compset since the stream handling
15+
has issues with leap days
16+
17+
Describe any changes made to the namelist: N/A
18+
19+
List any changes to the defaults for the boundary datasets: N/A
20+
21+
Describe any substantial timing or memory changes: N/A
22+
23+
Code reviewed by: cacraigucar
24+
25+
List all files eliminated: N/A
26+
27+
List all files added and what they do:
28+
A cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_mosart
29+
- add output frequency for mosart
30+
31+
List all existing files that have been modified, and describe the changes:
32+
M cime_config/buildnml
33+
- add check to prevent gregorian calendar to be used with spinup compsets
34+
35+
M cime_config/testdefs/testlist_cam.xml
36+
- change test which was using gregorian calendaro with a spinup compset to a working configuration
37+
38+
M cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/shell_commands
39+
M cime_config/testdefs/testmods_dirs/cam/outfrq9s_leapday/user_nl_clm
40+
- mods to better test leapday
41+
42+
If there were any failures reported from running test_driver.sh on any test
43+
platform, and checkin with these failures has been OK'd by the gatekeeper,
44+
then copy the lines from the td.*.status files for the failed tests to the
45+
appropriate machine below. All failed tests must be justified.
46+
47+
derecho/intel/aux_cam:
48+
ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri (Overall: FAIL) details:
49+
- pre-existing failure
50+
- ERI test discovered a bug in CICE: See: https://github.com/ESCOMP/CESM_CICE/issues/34
51+
52+
SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details:
53+
FAIL SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday NLCOMP
54+
FAIL SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday BASELINE /glade/campaign/cesm/community/amwg/cam_base
55+
- Changed namelist settings for the leapday test
56+
57+
derecho/nvhpc/aux_cam:
58+
ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) details:
59+
- pre-existing failure -- exceeds wallclock time limit
60+
NOTE: Jian has determined this is due to changes on derecho with the the last upgrade.
61+
He has reported the issue to CISL. Note cam6_4_128 is the last CAM tag with
62+
baselines to use for comparison but answer changes are expected starting with
63+
cam6_4_130.
64+
65+
End of cesm.log file:
66+
deg0049.hsn.de.hpc.ucar.edu 0: calcsize j,iq,jac, lsfrm,lstoo 2 5 2 19 20
67+
deg0049.hsn.de.hpc.ucar.edu 1: Opened file
68+
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
69+
deg0049.hsn.de.hpc.ucar.edu 1: to write 316
70+
deg0051.hsn.de.hpc.ucar.edu: rank 64 died from signal 15
71+
72+
73+
izumi/nag/aux_cam: all BFB
74+
75+
izumi/gnu/aux_cam:
76+
SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes (Overall: DIFF) details:
77+
FAIL SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes NLCOMP
78+
FAIL SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes BASELINE
79+
- Introduced new test
80+
81+
===============================================================
182
===============================================================
283

384
Tag name: cam6_4_146

0 commit comments

Comments
 (0)