Skip to content

Commit 83f5c66

Browse files
authored
Merge pull request #1436 from cacraigucar/cam_alpha07g
Update externals to match CESM alpha07g
2 parents 4c480c8 + 437cc5d commit 83f5c66

File tree

7 files changed

+69
-12
lines changed

7 files changed

+69
-12
lines changed

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,21 +138,21 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
138138
[submodule "cime"]
139139
path = cime
140140
url = https://github.com/ESMCI/cime
141-
fxtag = cime6.1.126
141+
fxtag = cime6.1.135
142142
fxrequired = ToplevelRequired
143143
fxDONOTUSEurl = https://github.com/ESMCI/cime
144144

145145
[submodule "cmeps"]
146146
path = components/cmeps
147147
url = https://github.com/ESCOMP/CMEPS.git
148-
fxtag = cmeps1.1.16
148+
fxtag = cmeps1.1.23
149149
fxrequired = ToplevelRequired
150150
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
151151

152152
[submodule "cdeps"]
153153
path = components/cdeps
154154
url = https://github.com/ESCOMP/CDEPS.git
155-
fxtag = cdeps1.0.80
155+
fxtag = cdeps1.0.83
156156
fxrequired = ToplevelRequired
157157
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
158158

@@ -173,7 +173,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
173173
[submodule "cice"]
174174
path = components/cice
175175
url = https://github.com/ESCOMP/CESM_CICE
176-
fxtag = cesm3_cice6_6_0_13
176+
fxtag = cesm3_cice6_6_1_6
177177
fxrequired = ToplevelRequired
178178
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
179179

cime_config/testdefs/testlist_cam.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@
14871487
<option name="comment">Zonal Mean Nudged</option>
14881488
</options>
14891489
</test>
1490-
<test compset="FCnudged" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s">
1490+
<test compset="FCnudged" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_P1536x1" testmods="cam/outfrq9s">
14911491
<machines>
14921492
<machine name="derecho" compiler="intel" category="prealpha"/>
14931493
<machine name="derecho" compiler="intel" category="camchem"/>
@@ -1497,7 +1497,7 @@
14971497
<option name="comment">"Nudged CAM-Chem on a regionally refined grid"</option>
14981498
</options>
14991499
</test>
1500-
<test compset="FHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s" supported="false">
1500+
<test compset="FHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_P1536x1" testmods="cam/outfrq9s" supported="false">
15011501
<machines>
15021502
<machine name="derecho" compiler="intel" category="prealpha"/>
15031503
<machine name="derecho" compiler="intel" category="cam_refined"/>
@@ -1689,7 +1689,7 @@
16891689
<machine name="derecho" compiler="intel" category="camchem"/>
16901690
</machines>
16911691
</test>
1692-
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s">
1692+
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="SMS_D_Ln9_P1536x1" testmods="cam/outfrq9s">
16931693
<machines>
16941694
<machine name="derecho" compiler="intel" category="aux_cam"/>
16951695
<machine name="derecho" compiler="intel" category="camchem"/>
@@ -1699,7 +1699,7 @@
16991699
<option name="comment">"Free running CAM-Chem on a reginally refined grid"</option>
17001700
</options>
17011701
</test>
1702-
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="ERS_Lh3_P1280x1" testmods="cam/outfrq3h">
1702+
<test compset="FCHIST" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" name="ERS_Lh3_P1536x1" testmods="cam/outfrq3h">
17031703
<machines>
17041704
<machine name="derecho" compiler="intel" category="camchem"/>
17051705
</machines>

doc/ChangeLog

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,60 @@
1+
2+
===============================================================
3+
4+
Tag name: cam6_4_129
5+
Originator(s): cacraig
6+
Date: Nov 18, 2025
7+
One-line Summary: Update externals to match cesm3_0_alpha07g
8+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1436
9+
10+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
11+
- Update externals to match alpha07g externals: https://github.com/ESCOMP/CAM/issues/1418
12+
- ne0CONUSne30x8 prealpha test failing: https://github.com/ESCOMP/CAM/issues/1434
13+
14+
Describe any changes made to build system: N/A
15+
16+
Describe any changes made to the namelist: N/A
17+
18+
List any changes to the defaults for the boundary datasets: N/A
19+
20+
Describe any substantial timing or memory changes: N/A
21+
22+
Code reviewed by: jimmielin
23+
24+
List all files eliminated: N/A
25+
26+
List all files added and what they do: N/A
27+
28+
List all existing files that have been modified, and describe the changes:
29+
M .gitmodules
30+
M cime
31+
M components/cdeps
32+
M components/cice
33+
M components/cmeps
34+
- update externals to match alpha07g
35+
36+
M cime_config/testdefs/testlist_cam.xml
37+
- Increase nodes for CONUS tests
38+
39+
If there were any failures reported from running test_driver.sh on any test
40+
platform, and checkin with these failures has been OK'd by the gatekeeper,
41+
then copy the lines from the td.*.status files for the failed tests to the
42+
appropriate machine below. All failed tests must be justified.
43+
44+
** All test suites have namelist changes
45+
46+
derecho/intel/aux_cam: all BFB except:
47+
SMS_D_Ln9_P1536x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
48+
- new baseline due to change in processor count in directory name
49+
50+
derecho/nvhpc/aux_cam:
51+
- timing issue - will increase timing in next tag
52+
53+
izumi/nag/aux_cam: all BFB
54+
55+
izumi/gnu/aux_cam: all BFB
56+
57+
===============================================================
158
===============================================================
259

360
Tag name: cam6_4_128

0 commit comments

Comments
 (0)