Skip to content

Commit adb43aa

Browse files
brian-eatonSteve Goldhaber
authored and
Steve Goldhaber
committed
ESCOMP tag: cam6_4_076
Merge pull request ESCOMP#1246 from brian-eaton/masks cam6_4_076: Change cam7 testing to use MOM t232 mask. ESCOMP commit: 068d59b
1 parent 4d98e8d commit adb43aa

File tree

5 files changed

+147
-4
lines changed

5 files changed

+147
-4
lines changed

components/cdeps

Submodule cdeps updated 45 files

doc/ChangeLog

+143
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,148 @@
11
===============================================================
22

3+
Tag name: cam6_4_076
4+
Originator(s): eaton
5+
Date: 17 March 2025
6+
One-line Summary: updates to grid masks; update externals
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1246
8+
9+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
10+
11+
Resolves #1236 - Change our testing from using the POP land/ocean mask to
12+
the MOM t232 land/ocean mask
13+
- The cam7 tests using the ne30pg3_ne30pg3_mg17 grid have been updated to
14+
use ne30pg3_ne30pg3_mt232.
15+
- One test used the f19_f19 grid which used the gx1v6 mask. That test is
16+
updated to use f19_f19_mg17.
17+
18+
. Update compset names: FHISTC_LTso, FHISTC_MTso, QPC7
19+
20+
. Update externals
21+
22+
Describe any changes made to build system: none
23+
24+
Describe any changes made to the namelist: none
25+
26+
List any changes to the defaults for the boundary datasets: none
27+
28+
Describe any substantial timing or memory changes: not checked
29+
30+
Code reviewed by: adamrher, cacraigucar
31+
32+
List all files eliminated: none
33+
34+
List all files added and what they do: none
35+
36+
List all existing files that have been modified, and describe the changes:
37+
38+
.gitmodules
39+
- update ccs_config_cesm1.0.21 to ccs_config_cesm1.0.29
40+
- update cime6.1.58 to cime6.1.72
41+
- update cmeps1.0.33 to cmeps1.0.39
42+
- update cdeps1.0.61 to cdeps1.0.69
43+
44+
cime_config/config_compsets.xml
45+
. FLTHIST changed to FHISTC_LTso
46+
. FMTHIST changed to FHISTC_MTso
47+
. QPLT changed to QPC7
48+
. QPMT removed
49+
50+
cime_config/testdefs/testlist_cam.xml
51+
. update mask in ne30pg3 grids used for cam7 tests:
52+
- tests of FLTHIST, FMTHIST, FHISTC_MTt1s, FHISTC_MTt4s, QPLT, and QPMT
53+
using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_mt232
54+
. There is one test using the f19_f19 grid. This grid is using the gx1v6
55+
mask which will be removed. Update test to use f19_f19_mg17 grid.
56+
. Update the compset names.
57+
58+
If there were any failures reported from running test_driver.sh on any test
59+
platform, and checkin with these failures has been OK'd by the gatekeeper,
60+
then copy the lines from the td.*.status files for the failed tests to the
61+
appropriate machine below. All failed tests must be justified.
62+
63+
derecho/intel/aux_cam:
64+
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
65+
SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
66+
- pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856)
67+
68+
SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
69+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
70+
- pre-existing failures due to build-namelist error requiring CLM/CTSM external update
71+
72+
ERC_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF)
73+
ERC_D_Ln9.f19_f19_mg17.QPMOZ.derecho_intel.cam-outfrq3s (Overall: DIFF)
74+
ERC_D_Ln9.f19_f19_mg17.QPX2000.derecho_intel.cam-outfrq3s (Overall: DIFF)
75+
ERC_D_Ln9.ne16_ne16_mg17.QPC5HIST.derecho_intel.cam-outfrq3s_usecase (Overall: DIFF)
76+
ERC_D_Ln9_P144x1.ne16pg3_ne16pg3_mg17.QPC6HIST.derecho_intel.cam-outfrq3s_ttrac_usecase (Overall: DIFF)
77+
ERI_D_Ln18.f45_f45_mg37.QPC41850.derecho_intel.cam-co2rmp_usecase (Overall: DIFF)
78+
ERP_D_Ln9_P64x2.f09_f09_mg17.QSC6.derecho_intel.cam-outfrq9s (Overall: DIFF)
79+
ERP_Ld3.f09_f09_mg17.FWHIST.derecho_intel.cam-reduced_hist1d (Overall: DIFF)
80+
ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h (Overall: DIFF)
81+
ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF)
82+
ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s (Overall: DIFF)
83+
ERP_Ln9.f09_f09_mg17.F2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF)
84+
ERP_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-outfrq9s (Overall: DIFF)
85+
ERP_Ln9.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s (Overall: DIFF)
86+
ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s (Overall: DIFF)
87+
ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF)
88+
ERP_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF)
89+
ERS_D_Ln9.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480_pertlim (Overall: DIFF)
90+
ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF)
91+
ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s (Overall: DIFF)
92+
ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF)
93+
SCT_D_Ln7.ne3_ne3_mg37.QPC5.derecho_intel.cam-scm_prep (Overall: DIFF)
94+
SMS_D_Ld2.f19_f19_mg17.QPC5HIST.derecho_intel.cam-volc_usecase (Overall: DIFF)
95+
SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF)
96+
SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
97+
SMS_D_Ln9.f09_f09_mg17.FSD.derecho_intel.cam-outfrq9s (Overall: DIFF)
98+
SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF)
99+
SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4 (Overall: DIFF)
100+
SMS_D_Ln9.f19_f19_mg17.QPC2000climo.derecho_intel.cam-outfrq3s_usecase (Overall: DIFF)
101+
SMS_D_Ln9.f19_f19_mg17.QPC5M7.derecho_intel.cam-outfrq9s (Overall: DIFF)
102+
SMS_D_Ln9.ne16_ne16_mg17.QPX2000.derecho_intel.cam-outfrq9s (Overall: DIFF)
103+
SMS_D_Ln9.ne16pg3_ne16pg3_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF)
104+
SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
105+
SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
106+
SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
107+
SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
108+
SMS_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-nudging (Overall: DIFF) details:
109+
SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s (Overall: DIFF) details:
110+
SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s_nochem (Overall: DIFF) details:
111+
SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details:
112+
- Diffs due to externals updates
113+
114+
ERP_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF)
115+
ERP_D_Ln9.ne30pg3_ne30pg3_mt232.QPC7.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF)
116+
ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF)
117+
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
118+
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF)
119+
SMS_Ln9.f19_f19_mg17.F2000climo.derecho_intel.cam-silhs (Overall: DIFF)
120+
- Diffs due to new masks, no baselines for comparisons
121+
122+
derecho/nvhpc/aux_cam:
123+
124+
ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: DIFF)
125+
- Diffs due to externals updates
126+
127+
izumi/nag/aux_cam: All PASS.
128+
129+
izumi/gnu/aux_cam:
130+
131+
ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF)
132+
ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC7.izumi_gnu.cam-outfrq9s (Overall: DIFF)
133+
ERR_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF)
134+
- no baselines for comparison due to compset name change
135+
136+
CAM tag used for the baseline comparison tests if different than previous
137+
tag:
138+
139+
Summarize any changes to answers: Answer changes expected due to updated
140+
intel and nvhpc compilers in ccs_config external. NAG and GNU testing
141+
are BFB.
142+
143+
===============================================================
144+
===============================================================
145+
3146
Tag name: cam6_4_075
4147
Originator(s): PeterHjortLauritzen, bstephens82, brian-eaton, swrneale, jimmielin
5148
Date: March 7, 2025

0 commit comments

Comments
 (0)