Skip to content

Commit 514ab5b

Browse files
brian-eatonbrian-eaton
authored
Merge pull request #1309 from brian-eaton/tests02
cam6_4_093: Update CAM testing.
2 parents 2967809 + e4b5b17 commit 514ab5b

File tree

20 files changed

+587
-388
lines changed

20 files changed

+587
-388
lines changed

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
path = src/physics/pumas
1717
url = https://github.com/ESCOMP/PUMAS
1818
fxrequired = AlwaysRequired
19-
fxtag = pumas_cam-release_v1.38
19+
fxtag = pumas_cam-release_v1.39
2020
fxDONOTUSEurl = https://github.com/ESCOMP/PUMAS
2121

2222
[submodule "pumas-frozen"]
@@ -144,14 +144,14 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
144144
[submodule "ccs_config"]
145145
path = ccs_config
146146
url = https://github.com/ESMCI/ccs_config_cesm.git
147-
fxtag = ccs_config_cesm1.0.40
147+
fxtag = ccs_config_cesm1.0.40_izumi_update0.1
148148
fxrequired = ToplevelRequired
149149
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
150150

151151
[submodule "cime"]
152152
path = cime
153153
url = https://github.com/ESMCI/cime
154-
fxtag = cime6.1.93
154+
fxtag = cime6.1.97
155155
fxrequired = ToplevelRequired
156156
fxDONOTUSEurl = https://github.com/ESMCI/cime
157157

‎bld/configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,6 +1790,9 @@ $cfg_cppdefs .= " -DPLEV=$nlev -DPCNST=$nadv -DPCOLS=$pcols -DPSUBCOLS=$psubcols
17901790
# Radiatively active constituent number
17911791
$cfg_cppdefs .= " -DN_RAD_CNST=$max_n_rad_cnst";
17921792

1793+
# use iso_c_binding c_bool in RRTMGP (needed for nag-7)
1794+
if ($rad_pkg eq 'rrtmgp') { $cfg_cppdefs .= ' -DRTE_USE_CBOOL'; }
1795+
17931796
# offline driver for FV dycore
17941797
if ($offline_dyn) { $cfg_cppdefs .= ' -DOFFLINE_DYN'; }
17951798

‎bld/namelist_files/namelist_defaults_cam.xml

Lines changed: 217 additions & 222 deletions
Large diffs are not rendered by default.

‎ccs_config

‎cime

‎cime_config/config_component.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
CAM
99
===============
1010
-->
11-
<desc atm="CAM70[%LT][%MT][%WA][%WX][%CSO][%CT1S][%CT4S][%CT0MA][%CT1MA][%CT4MA]" >CAM cam7 physics:</desc>
11+
<desc atm="CAM70[%LT][%MT][%WA][%WX][%CSO][%CT1S][%CT4S][%CT0MA][%CT1MA][%CT4MA][%PORT]" >CAM cam7 physics:</desc>
1212
<desc atm="CAM60[%1PCT][%4xCO2][%CARMATS][%CARMAWM][%CT1S][%CT2S][%CFIRE][%CVBSX][%NUDG][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE][%WXIED][%HEMCO][%GEOSCHEM][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam6 physics:</desc>
1313
<desc atm="CAM50[%CT1S][%CLB][%PORT][%RCO2][%MAM7][%SCAM][%SDYN][%WCSC][%WCTS][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam5 physics:</desc>
1414
<desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WX][%WXIE][%WXIED][%WCCM][%WCMD][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam4 physics:</desc>

‎cime_config/config_compsets.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,11 @@
334334
<lname>2000_CAM60%PORT_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
335335
</compset>
336336

337+
<compset>
338+
<alias>PC7</alias>
339+
<lname>HIST_CAM70%LT%PORT_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
340+
</compset>
341+
337342
<!-- ****************************** -->
338343
<!-- CAM untested compsets -->
339344
<!-- ****************************** -->

‎cime_config/testdefs/testlist_cam.xml

Lines changed: 41 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -310,17 +310,6 @@
310310
</options>
311311
</test>
312312

313-
<!-- CAM Stand alone -->
314-
<!-- 012 -->
315-
<test compset="PC4" grid="f19_f19_mg17" name="SMS_D_Ld5" testmods="cam/cam4_port5d">
316-
<machines>
317-
<machine name="derecho" compiler="intel" category="aux_cam"/>
318-
</machines>
319-
<options>
320-
<option name="wallclock">00:10:00</option>
321-
<option name="comment" >012 tsm</option>
322-
</options>
323-
</test>
324313
<!-- 111 tsm, ter, tbr, tbl, changed to QPC6/f19 -->
325314
<test compset="QPC6" grid="f19_f19_mg17" name="ERI_D_Ln18" testmods="cam/ghgrmp_e8">
326315
<machines>
@@ -351,34 +340,32 @@
351340
<option name="wallclock">00:30:00</option>
352341
</options>
353342
</test>
354-
<!-- 301 -->
343+
355344
<test compset="QPC5" grid="f10_f10_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal1">
356345
<machines>
357346
<machine name="izumi" compiler="nag" category="aux_cam"/>
358347
<machine name="izumi" compiler="nag" category="prealpha"/>
359348
</machines>
360349
<options>
361-
<option name="comment" >301 plb</option>
350+
<option name="comment" >phys_loadbalance=1; 5 test tracers; end of year</option>
362351
<option name="wallclock">00:30:00</option>
363352
</options>
364353
</test>
365-
<!-- 303 -->
366354
<test compset="QPC5" grid="f10_f10_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal3">
367355
<machines>
368356
<machine name="izumi" compiler="nag" category="aux_cam"/>
369357
</machines>
370358
<options>
371-
<option name="comment" >303 plb</option>
359+
<option name="comment" >phys_loadbalance=3; 5 test tracers; end of year</option>
372360
<option name="wallclock">00:30:00</option>
373361
</options>
374362
</test>
375-
<!-- 304 -->
376363
<test compset="QPC5" grid="f10_f10_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal0">
377364
<machines>
378365
<machine name="izumi" compiler="nag" category="aux_cam"/>
379366
</machines>
380367
<options>
381-
<option name="comment" >304 plb</option>
368+
<option name="comment" >phys_loadbalance=0; 5 test tracers; end of year</option>
382369
<option name="wallclock">00:30:00</option>
383370
</options>
384371
</test>
@@ -1033,66 +1020,6 @@
10331020
<option name="wallclock">00:30:00</option>
10341021
</options>
10351022
</test>
1036-
<!-- 701 -->
1037-
<test compset="QPC5" grid="ne5_ne5_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal0">
1038-
<machines>
1039-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1040-
</machines>
1041-
<options>
1042-
<option name="comment" >701 teq</option>
1043-
<option name="wallclock">00:30:00</option>
1044-
</options>
1045-
</test>
1046-
<!-- 702 -->
1047-
<test compset="QPC5" grid="ne5_ne5_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal1">
1048-
<machines>
1049-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1050-
</machines>
1051-
<options>
1052-
<option name="comment" >702 teq</option>
1053-
<option name="wallclock">00:30:00</option>
1054-
</options>
1055-
</test>
1056-
<!-- 703 -->
1057-
<test compset="QPC5" grid="ne5_ne5_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal3">
1058-
<machines>
1059-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1060-
</machines>
1061-
<options>
1062-
<option name="comment" >703 teq</option>
1063-
<option name="wallclock">00:30:00</option>
1064-
</options>
1065-
</test>
1066-
<!-- 711 teq -->
1067-
<test compset="QPC5" grid="ne5pg3_ne5pg3_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal0">
1068-
<machines>
1069-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1070-
</machines>
1071-
<options>
1072-
<option name="comment" >711 teq</option>
1073-
<option name="wallclock">00:30:00</option>
1074-
</options>
1075-
</test>
1076-
<!-- 712 teq -->
1077-
<test compset="QPC5" grid="ne5pg3_ne5pg3_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal1">
1078-
<machines>
1079-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1080-
</machines>
1081-
<options>
1082-
<option name="comment" >712 teq</option>
1083-
<option name="wallclock">00:30:00</option>
1084-
</options>
1085-
</test>
1086-
<!-- 713 teq -->
1087-
<test compset="QPC5" grid="ne5pg3_ne5pg3_mg37" name="PLB_D_Ln9" testmods="cam/ttrac_loadbal3">
1088-
<machines>
1089-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1090-
</machines>
1091-
<options>
1092-
<option name="comment" >713 teq</option>
1093-
<option name="wallclock">00:30:00</option>
1094-
</options>
1095-
</test>
10961023
<!-- 720 -->
10971024
<test compset="QPC4" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase">
10981025
<machines>
@@ -1113,16 +1040,6 @@
11131040
<option name="wallclock">00:30:00</option>
11141041
</options>
11151042
</test>
1116-
<!-- 011 -->
1117-
<test compset="PC5" grid="f45_f45_mg37" name="SMS_D_Ld2" testmods="cam/outfrq24h_port">
1118-
<machines>
1119-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1120-
</machines>
1121-
<options>
1122-
<option name="comment" >011 tsm</option>
1123-
<option name="wallclock">00:30:00</option>
1124-
</options>
1125-
</test>
11261043
<test compset="QPC6" grid="ne3_ne3_mg37" name="SCT_D_Ln7" testmods="cam/scm_prep_c6">
11271044
<machines>
11281045
<machine name="izumi" compiler="gnu" category="aux_cam"/>
@@ -1322,7 +1239,7 @@
13221239
<machine name="izumi" compiler="nag" category="aux_cam"/>
13231240
</machines>
13241241
<options>
1325-
<option name="comment" >Adiabatic, analytic ICs</option>
1242+
<option name="comment" >Dry adiabatic (no physics forcings), analytic ICs</option>
13261243
<option name="wallclock">00:10:00</option>
13271244
</options>
13281245
</test>
@@ -1332,6 +1249,7 @@
13321249
<machine name="izumi" compiler="nag" category="aux_cam"/>
13331250
</machines>
13341251
<options>
1252+
<option name="comment" >Dry Held-Suarez forcing (Held and Suarez, 1994)</option>
13351253
<option name="wallclock">00:10:00</option>
13361254
</options>
13371255
</test>
@@ -1341,6 +1259,7 @@
13411259
<machine name="izumi" compiler="nag" category="aux_cam"/>
13421260
</machines>
13431261
<options>
1262+
<option name="comment" >Moist Kessler forcing, baroclinic wave IC, terminator chemistry</option>
13441263
<option name="wallclock">00:10:00</option>
13451264
</options>
13461265
</test>
@@ -1350,6 +1269,7 @@
13501269
<machine name="izumi" compiler="gnu" category="aux_cam"/>
13511270
</machines>
13521271
<options>
1272+
<option name="comment" >Moist Held-Suarez forcing (Thatcher and Jablonowski, 2016)</option>
13531273
<option name="wallclock">00:10:00</option>
13541274
</options>
13551275
</test>
@@ -1359,6 +1279,7 @@
13591279
<machine name="izumi" compiler="gnu" category="aux_cam"/>
13601280
</machines>
13611281
<options>
1282+
<option name="comment" >Frierson forcing (Frierson, 2006) </option>
13621283
<option name="wallclock">00:10:00</option>
13631284
</options>
13641285
</test>
@@ -1641,40 +1562,32 @@
16411562
<option name="wallclock">00:20:00</option>
16421563
</options>
16431564
</test>
1644-
<test compset="FHISTC_LTso" grid="ne30pg3_ne30pg3_mt232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
1645-
<machines>
1646-
<machine name="derecho" compiler="intel" category="prealpha"/>
1647-
</machines>
1648-
<options>
1649-
<option name="wallclock">00:20:00</option>
1650-
<option name="comment">CAM7 low top ~40 km</option>
1651-
</options>
1652-
</test>
1653-
<test compset="FHISTC_LTso" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
1565+
<test compset="FHISTC_LTso" grid="ne30pg3_ne30pg3_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s">
16541566
<machines>
16551567
<machine name="derecho" compiler="intel" category="aux_cam"/>
1568+
<machine name="derecho" compiler="intel" category="prealpha"/>
16561569
</machines>
16571570
<options>
16581571
<option name="wallclock">00:30:00</option>
16591572
<option name="comment">CAM7 low top ~40 km</option>
16601573
</options>
16611574
</test>
1662-
<test compset="FHISTC_LTso" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
1575+
<test compset="FHISTC_LTso" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9" testmods="cam/cosp_rad_diags">
16631576
<machines>
1664-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1577+
<machine name="izumi" compiler="nag" category="aux_cam"/>
16651578
</machines>
16661579
<options>
16671580
<option name="wallclock">00:30:00</option>
1668-
<option name="comment">CAM7 low top ~40 km</option>
1581+
<option name="comment">CAM7-LT, cosp, radiation diagnostics</option>
16691582
</options>
16701583
</test>
1671-
<test compset="FHISTC_LTso" grid="ne3pg3_ne3pg3_mg37" name="ERR_D_Ln9" testmods="cam/outfrq9s">
1584+
<test compset="FHISTC_LTso" grid="ne16pg3_ne16pg3_mt232" name="ERR_Ln9" testmods="cam/outfrq9s_bwic">
16721585
<machines>
1673-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1586+
<machine name="derecho" compiler="intel" category="aux_cam"/>
16741587
</machines>
16751588
<options>
16761589
<option name="wallclock">00:30:00</option>
1677-
<option name="comment">CAM7 low top ~40 km with archiving</option>
1590+
<option name="comment">CAM7-LT, archiving, resubmit</option>
16781591
</options>
16791592
</test>
16801593
<test compset="FHISTC_LTso" grid="mpasa480_mpasa480" name="ERS_D_Ln9" testmods="cam/outfrq9s_mpasa480">
@@ -2668,6 +2581,18 @@
26682581
<option name="comment" >WACCM TSMLT MAM4</option>
26692582
</options>
26702583
</test>
2584+
2585+
<!-- PORT (offline radiation driver) -->
2586+
2587+
<test compset="PC4" grid="f19_f19_mg17" name="SMS_D_Ld5" testmods="cam/cam4_port5d">
2588+
<machines>
2589+
<machine name="derecho" compiler="intel" category="aux_cam"/>
2590+
</machines>
2591+
<options>
2592+
<option name="wallclock">00:10:00</option>
2593+
<option name="comment" >012 tsm</option>
2594+
</options>
2595+
</test>
26712596
<test compset="PC4" grid="f19_f19_mg17" name="SMS" testmods="cam/cam4_port">
26722597
<machines>
26732598
<machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2687,6 +2612,15 @@
26872612
<option name="wallclock">00:10:00</option>
26882613
</options>
26892614
</test>
2615+
<test compset="PC5" grid="f45_f45_mg37" name="SMS_D_Ld2" testmods="cam/outfrq24h_port">
2616+
<machines>
2617+
<machine name="izumi" compiler="nag" category="aux_cam"/>
2618+
</machines>
2619+
<options>
2620+
<option name="comment" >011 tsm</option>
2621+
<option name="wallclock">00:30:00</option>
2622+
</options>
2623+
</test>
26902624
<test compset="PC5" grid="f45_f45_mg37" name="SMS_D" testmods="cam/cam5_port_f45">
26912625
<machines>
26922626
<machine name="izumi" compiler="nag" category="prealpha"/>
@@ -2712,13 +2646,13 @@
27122646
<option name="wallclock">00:30:00</option>
27132647
</options>
27142648
</test>
2715-
<test compset="PC6" grid="f09_f09_mg17" name="SMS_Ld5" testmods="cam/cam6_port_f09_rrtmgp">
2649+
<test compset="PC7" grid="ne3pg3_ne3pg3_mt232" name="SMS_D_Ln3" testmods="cam/pc7_ne3pg3">
27162650
<machines>
27172651
<machine name="izumi" compiler="gnu" category="aux_cam"/>
27182652
</machines>
27192653
<options>
2720-
<option name="wallclock">00:30:00</option>
2721-
<option name="comment">CAM6 PORT w/ RRTMGP</option>
2654+
<option name="wallclock">00:10:00</option>
2655+
<option name="comment">CAM7-LT PORT</option>
27222656
</options>
27232657
</test>
27242658

‎cime_config/testdefs/testmods_dirs/cam/cam6_port_f09_rrtmgp/user_nl_cam

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/shell_commands

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
CAM_CONFIG_OPTS=`./xmlquery CAM_CONFIG_OPTS --value`
2+
if [[ $CAM_CONFIG_OPTS != *"-cosp"* ]]; then
3+
./xmlchange -append CAM_CONFIG_OPTS="-cosp"
4+
fi
5+
./xmlchange ROF_NCPL=\$ATM_NCPL
6+
./xmlchange GLC_NCPL=\$ATM_NCPL
7+
./xmlchange RUN_STARTDATE="19950101"

0 commit comments

Comments
 (0)