Skip to content

Commit e3bfb9a

Browse files
brian-eatonbrian-eaton
authored
Merge pull request #1285 from brian-eaton/tests
cam6_4_087: Update CAM testing.
2 parents e4acacc + a835898 commit e3bfb9a

File tree

17 files changed

+224
-201
lines changed

17 files changed

+224
-201
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ 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.29
147+
fxtag = ccs_config_cesm1.0.39
148148
fxrequired = ToplevelRequired
149149
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
150150

‎bld/configure‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,8 +1252,7 @@ elsif ($phys_pkg eq 'cam4') {
12521252
}
12531253
else {
12541254
# Simple models use cam7-lt vertical grid.
1255-
# $nlev = 58; # - ERROR: No default value found for ncdata
1256-
$nlev = 30; # bit-for-bit baselines for now
1255+
$nlev = 58;
12571256
}
12581257

12591258
# user override

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<ncdata nlev="26" analytic_ic="1" >atm/cam/inic/cam_vcoords_L26_c180105.nc</ncdata>
3535
<ncdata nlev="30" analytic_ic="1" >atm/cam/inic/cam_vcoords_L30_c180105.nc</ncdata>
3636
<ncdata nlev="32" analytic_ic="1" >atm/cam/inic/cam_vcoords_L32_c180105.nc</ncdata>
37+
<ncdata nlev="58" analytic_ic="1" >atm/cam/inic/cam_vcoords_L58_c250227.nc</ncdata>
3738

3839
<!-- Vertical/Horizontal coordinates only - MPAS initial files for analytic cases-->
3940
<ncdata hgrid="mpasa480" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa480_L32_notopo_coords_c240507.nc</ncdata>

‎bld/namelist_files/use_cases/adiabatic.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<start_ymd> 10101 </start_ymd>
6+
7+
<!-- Force PHIS to be set to zero -->
8+
<use_topo_file>.false.</use_topo_file>
9+
10+
<analytic_ic_type>'moist_baroclinic_wave_dcmip2016'</analytic_ic_type>
11+
12+
</namelist_defaults>

‎bld/namelist_files/use_cases/dctest_baro_kessler.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<avgflag_pertape>'I'</avgflag_pertape>
1313
<nhtfrq>-24</nhtfrq>
1414
<fincl1>
15-
'PS','PRECL','Q','CLDLIQ','RAINQM','T','U','V','iCLy','iCL','iCL2','OMEGA','TT_SLOT1','TT_SLOT2','TT_SLOT3','TT_COSB','TT_CCOSB','TT_lCCOSB'
15+
'PS','PRECL','Q','CLDLIQ','RAINQM','T','U','V','iCLy','iCL','iCL2','OMEGA',
16+
'TT_SLOT1','TT_SLOT2','TT_SLOT3','TT_COSB','TT_CCOSB','TT_lCCOSB'
1617
</fincl1>
1718

1819
<analytic_ic_type>'moist_baroclinic_wave_dcmip2016'</analytic_ic_type>

‎bld/namelist_files/use_cases/dctest_frierson.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
<avgflag_pertape>'A'</avgflag_pertape>
1818

1919
<fincl1>
20-
'U:A','T:A','V:A','Q:A','Z3:A','PRECL:A','PRECC:A','PS:A','SST:A','TS:A', 'gray_DTCOND', 'gray_DQCOND', 'gray_EVAPDT', 'gray_EVAPDQ', 'gray_PRECL' , 'gray_PRECC' , 'gray_Tsurf' , 'gray_Qsurf' , 'gray_Cdrag' , 'gray_Zpbl' , 'gray_KVH' , 'gray_KVM' , 'gray_VSE' , 'gray_Zm' , 'gray_Rf' , 'gray_DTV' , 'gray_DUV' , 'gray_DVV' , 'gray_VD01' , 'gray_SHflux', 'gray_LHflux', 'gray_TauU' , 'gray_TauV' , 'gray_QRL' , 'gray_QRS' , 'gray_SWflux', 'gray_LUflux', 'gray_LDflux', 'gray_LWflux', 'gray_LUflux_TOA', 'gray_LDflux_TOA', 'gray_LWflux_TOA'
20+
'U:A','T:A','V:A','Q:A','Z3:A','PRECL:A','PS:A','SST:A','TS:A',
21+
'gray_DTCOND', 'gray_DQCOND', 'gray_EVAPDT',
22+
'gray_EVAPDQ', 'gray_PRECL' , 'gray_PRECC' , 'gray_Tsurf' , 'gray_Qsurf' ,
23+
'gray_Cdrag' , 'gray_Zpbl' , 'gray_KVH' , 'gray_KVM' , 'gray_VSE' ,
24+
'gray_Zm' , 'gray_Rf' , 'gray_DTV' , 'gray_DUV' , 'gray_DVV' ,
25+
'gray_VD01' , 'gray_SHflux', 'gray_LHflux', 'gray_TauU' , 'gray_TauV' ,
26+
'gray_QRL' , 'gray_QRS' , 'gray_SWflux', 'gray_LUflux', 'gray_LDflux',
27+
'gray_LWflux', 'gray_LUflux_TOA', 'gray_LDflux_TOA', 'gray_LWflux_TOA'
2128
</fincl1>
2229

2330
<analytic_ic_type>'moist_baroclinic_wave_dcmip2016'</analytic_ic_type>
2431

25-
<ncdata dyn="fv" hgrid="1.9x2.5">atm/cam/inic/fv/FGRAYRAD_f19.cam.i.0051-01-01-00000_c20230510.nc</ncdata>
26-
27-
<test_tracer_names>
28-
'TT_SLOT','TT_GBALL','TT_TANH','TT_EM8','TT_Y2_2','TT_Y32_16'
29-
</test_tracer_names>
30-
3132
</namelist_defaults>

‎ccs_config‎

‎cime_config/config_component.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
<value compset="_CAM.*%SCAMCAMFRC">-scam camfrc</value>
201201

202202
<!-- Simple models -->
203-
<value compset="_CAM%ADIAB">-phys adiabatic</value>
203+
<value compset="_CAM%ADIAB">-phys adiabatic -analytic_ic</value>
204204
<value compset="_CAM%TJ16">-phys tj2016 -analytic_ic</value>
205205
<value compset="_CAM%GRAYRAD">-phys grayrad -analytic_ic</value>
206206
<value compset="_CAM%HS94">-phys held_suarez -analytic_ic</value>
@@ -330,6 +330,7 @@
330330
<value compset="_CAM60%CARMATS%SDYN">carma_trop_strat_sd_cam6</value>
331331
<value compset="_CAM60%SDYN_CLM50" >sd_cam6</value>
332332

333+
<value compset="CAM%ADIAB" >adiabatic</value>
333334
<value compset="CAM%HS94" >held_suarez_1994</value>
334335
<value compset="CAM%TJ16" >dctest_tj2016</value>
335336
<value compset="CAM%GRAYRAD" >dctest_frierson</value>

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 44 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -463,16 +463,6 @@
463463
<option name="wallclock">00:30:00</option>
464464
</options>
465465
</test>
466-
<!-- 339 tsm ter tbl -->
467-
<test compset="FADIAB" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/terminator">
468-
<machines>
469-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
470-
</machines>
471-
<options>
472-
<option name="comment" >339 tsm, ter</option>
473-
<option name="wallclock">00:30:00</option>
474-
</options>
475-
</test>
476466
<!-- 368 -->
477467
<test compset="QPC6" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s">
478468
<machines>
@@ -1012,76 +1002,7 @@
10121002
<option name="wallclock">00:20:00</option>
10131003
</options>
10141004
</test>
1015-
<!-- 700 -->
1016-
<test compset="FADIAB" grid="ne5_ne5_mg37" name="ERI_D_Ln18" testmods="cam/outfrq3s_bwic">
1017-
<machines>
1018-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1019-
</machines>
1020-
<options>
1021-
<option name="comment" >700 tsm, ter, tbr</option>
1022-
<option name="wallclock">00:30:00</option>
1023-
</options>
1024-
</test>
1025-
<!-- 702 -->
1026-
<test compset="FADIAB" grid="ne5pg3_ne5pg3_mg37" name="ERI_D_Ln18" testmods="cam/outfrq3s_bwic">
1027-
<machines>
1028-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1029-
</machines>
1030-
<options>
1031-
<option name="comment" >702 tsm, ter, tbr</option>
1032-
<option name="wallclock">00:30:00</option>
1033-
</options>
1034-
</test>
1035-
<!-- 704 tsm ter tbl -->
1036-
<test compset="FADIAB" grid="ne5pg3_ne5pg3_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s">
1037-
<machines>
1038-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1039-
</machines>
1040-
<options>
1041-
<option name="comment" >704 tsm, ter</option>
1042-
<option name="wallclock">00:30:00</option>
1043-
</options>
1044-
</test>
1045-
<!-- 705 tsm -->
1046-
<test compset="FADIAB" grid="ne5_ne5_mg37" name="SMS_D_Ln9_P1x1" testmods="cam/outfrq3s">
1047-
<machines>
1048-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1049-
</machines>
1050-
<options>
1051-
<option name="comment" >705 tsm</option>
1052-
<option name="wallclock">00:30:00</option>
1053-
</options>
1054-
</test>
1055-
<!-- 705 teq -->
1056-
<test compset="FADIAB" grid="ne5_ne5_mg37" name="PEM_D_Ln9" testmods="cam/outfrq3s">
1057-
<machines>
1058-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1059-
</machines>
1060-
<options>
1061-
<option name="comment" >705 teq</option>
1062-
<option name="wallclock">00:30:00</option>
1063-
</options>
1064-
</test>
1065-
<!-- 706 tsm teq -->
1066-
<test compset="FADIAB" grid="ne5pg3_ne5pg3_mg37" name="PEM_D_Ln9" testmods="cam/outfrq3s">
1067-
<machines>
1068-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1069-
</machines>
1070-
<options>
1071-
<option name="comment" >706 tsm, teq</option>
1072-
<option name="wallclock">00:30:00</option>
1073-
</options>
1074-
</test>
1075-
<!-- 707 tsm teq -->
1076-
<test compset="FADIAB" grid="ne5pg2_ne5pg2_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s">
1077-
<machines>
1078-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1079-
</machines>
1080-
<options>
1081-
<option name="comment" >707 tsm, ter</option>
1082-
<option name="wallclock">00:30:00</option>
1083-
</options>
1084-
</test>
1005+
10851006
<!-- 711 ter -->
10861007
<test compset="QPC5" grid="ne5_ne5_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s_ttrac">
10871008
<machines>
@@ -1326,16 +1247,6 @@
13261247
<option name="wallclock">01:00:00</option>
13271248
</options>
13281249
</test>
1329-
<!-- 730 -->
1330-
<test compset="FADIAB" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/terminator">
1331-
<machines>
1332-
<machine name="derecho" compiler="intel" category="aux_cam"/>
1333-
</machines>
1334-
<options>
1335-
<option name="comment" >730 tsm, ter</option>
1336-
<option name="wallclock">00:30:00</option>
1337-
</options>
1338-
</test>
13391250
<!-- 735 -->
13401251
<test compset="QPC5HIST" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase">
13411252
<machines>
@@ -1394,40 +1305,62 @@
13941305
</options>
13951306
</test>
13961307

1397-
<test compset="FHS94" grid="mpasa480z32_mpasa480" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase">
1308+
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="MGP_D_Ln9" testmods="cam/outfrq3s">
13981309
<machines>
1399-
<machine name="derecho" compiler="intel" category="prealpha"/>
1310+
<machine name="derecho" compiler="intel" category="aux_pumas"/>
14001311
</machines>
14011312
<options>
1402-
<option name="wallclock">00:30:00</option>
1313+
<option name="wallclock">01:00:00</option>
1314+
<option name="comment"> Ensuring PUMAS and MG3 config options give the same answers.</option>
14031315
</options>
14041316
</test>
14051317

1406-
<test compset="FHS94" grid="mpasa480z32_mpasa480" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase">
1318+
<!-- CAM Simple Models -->
1319+
1320+
<test compset="FADIAB" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9_P1x1" testmods="cam/outfrq9s">
14071321
<machines>
14081322
<machine name="izumi" compiler="nag" category="aux_cam"/>
14091323
</machines>
14101324
<options>
1411-
<option name="wallclock">00:30:00</option>
1325+
<option name="comment" >Adiabatic, analytic ICs</option>
1326+
<option name="wallclock">00:10:00</option>
14121327
</options>
14131328
</test>
14141329

1415-
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="MGP_D_Ln9" testmods="cam/outfrq3s">
1330+
<test compset="FHS94" grid="mpasa480_mpasa480_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s">
14161331
<machines>
1417-
<machine name="derecho" compiler="intel" category="aux_pumas"/>
1332+
<machine name="izumi" compiler="nag" category="aux_cam"/>
14181333
</machines>
14191334
<options>
1420-
<option name="wallclock">01:00:00</option>
1421-
<option name="comment"> Ensuring PUMAS and MG3 config options give the same answers.</option>
1335+
<option name="wallclock">00:10:00</option>
14221336
</options>
14231337
</test>
14241338

1425-
<!-- CAM Simple Models -->
1339+
<test compset="FKESSLER" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln27" testmods="cam/outfrq9s">
1340+
<machines>
1341+
<machine name="izumi" compiler="nag" category="aux_cam"/>
1342+
</machines>
1343+
<options>
1344+
<option name="wallclock">00:10:00</option>
1345+
</options>
1346+
</test>
14261347

1427-
<test compset="FKESSLER" grid="f19_f19_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
1348+
<test compset="FTJ16" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s">
14281349
<machines>
1429-
<machine name="izumi" compiler="nag" category="prealpha"/>
1350+
<machine name="izumi" compiler="gnu" category="aux_cam"/>
1351+
</machines>
1352+
<options>
1353+
<option name="wallclock">00:10:00</option>
1354+
</options>
1355+
</test>
1356+
1357+
<test compset="FGRAYRAD" grid="ne3pg3_ne3pg3_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s">
1358+
<machines>
1359+
<machine name="izumi" compiler="gnu" category="aux_cam"/>
14301360
</machines>
1361+
<options>
1362+
<option name="wallclock">00:10:00</option>
1363+
</options>
14311364
</test>
14321365

14331366
<test compset="FHIST_DARTC6" grid="f09_f09_mg17" name="SMS_C80_P128x1_Lh1" testmods="cam/dartcambigens">
@@ -1753,6 +1686,15 @@
17531686
<option name="comment">CAM7 mid top ~80 km</option>
17541687
</options>
17551688
</test>
1689+
<test compset="QPC7" grid="ne30pg2_ne30pg2_mt232" name="ERC_D_Ln9" testmods="cam/outfrq9s">
1690+
<machines>
1691+
<machine name="derecho" compiler="intel" category="aux_cam"/>
1692+
</machines>
1693+
<options>
1694+
<option name="wallclock">00:20:00</option>
1695+
<option name="comment">CAM7-LT aquaplanet</option>
1696+
</options>
1697+
</test>
17561698
<test compset="FHISTC_MTso" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
17571699
<machines>
17581700
<machine name="derecho" compiler="intel" category="prealpha"/>
@@ -1980,13 +1922,6 @@
19801922
</options>
19811923
</test>
19821924

1983-
<!-- Test of finite volume CAM-SE grid with CSLAM tracer advection -->
1984-
<test compset="FKESSLER" grid="ne5pg3_ne5pg3_mg37" name="ERS_Ln27" testmods="cam/outfrq9s" supported="false">
1985-
<machines>
1986-
<machine name="izumi" compiler="nag" category="aux_cam"/>
1987-
</machines>
1988-
</test>
1989-
19901925
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
19911926
<!-- FV3CAM COMPSETS for testing only -->
19921927
<!-- (unsupported) -->
@@ -2777,37 +2712,4 @@
27772712
</options>
27782713
</test>
27792714

2780-
<test compset="FHS94" grid="ne5_ne5_mg37" name="ERP_Ln9" testmods="cam/outfrq9s">
2781-
<machines>
2782-
<machine name="izumi" compiler="gnu" category="aux_cam"/>
2783-
</machines>
2784-
</test>
2785-
2786-
<test compset="FADIAB" grid="ne5_ne5_mg37" name="ERS_Ln9" testmods="cam/outfrq9s">
2787-
<machines>
2788-
<machine name="izumi" compiler="nag" category="aux_cam"/>
2789-
</machines>
2790-
</test>
2791-
2792-
2793-
<test compset="FADIAB" grid="ne0TESTONLYne5x4_ne0TESTONLYne5x4_mg37" name="ERS_Ln9" testmods="cam/outfrq3s_refined" supported="false">
2794-
<machines>
2795-
<machine name="derecho" compiler="intel" category="aux_cam"/>
2796-
</machines>
2797-
<options>
2798-
<option name="wallclock">00:10:00</option>
2799-
</options>
2800-
</test>
2801-
2802-
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
2803-
<!-- Release tests -->
2804-
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
2805-
2806-
2807-
<test compset="FTJ16" grid="f09_f09_mg17" name="ERP_Ln9" testmods="cam/outfrq9s">
2808-
<machines>
2809-
<machine name="derecho" compiler="intel" category="prealpha"/>
2810-
</machines>
2811-
</test>
2812-
28132715
</testlist>

‎cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ ndens=1,1,1,1,1,1
33
nhtfrq=3,3,3,3,3,3
44
inithist='ENDOFRUN'
55
fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA',
6-
'CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_SNOWCERT','CS_SNOWPOSS'
6+
'CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_RAINHARD','CS_SNOWCERT','CS_SNOWPOSS'

0 commit comments

Comments
 (0)