Skip to content

Commit 54af3ee

Browse files
fvittfvitt
authored
Merge pull request #1164 from fvitt/compset_names
cam6_4_041: CAM-Chem compset names
2 parents a12dd47 + 9a26757 commit 54af3ee

File tree

6 files changed

+135
-60
lines changed

6 files changed

+135
-60
lines changed

‎cime‎

Submodule cime updated 55 files

‎cime_config/config_component.xml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
CAM
99
===============
1010
-->
11-
<desc atm="CAM70[%LT][%MT][%CCTS1][%CCTS4]" >CAM cam7 physics:</desc>
12-
<desc atm="CAM60[%1PCT][%4xCO2][%CCTS1][%CCTS2][%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>
13-
<desc atm="CAM50[%CCTS1][%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>
14-
<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>
11+
<desc atm="CAM70[%LT][%MT][%CT1S][%CT4S]" >CAM cam7 physics:</desc>
12+
<desc atm="CAM60[%1PCT][%4xCO2][%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>
13+
<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>
14+
<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>
1515
<desc atm="CAM[%ADIAB][%DABIP04][%TJ16][%GRAYRAD][%HS94][%KESSLER][%RCO2][%SPCAMS][%SPCAMCLBS][%SPCAMM][%SPCAMCLBM]" >CAM simplified and non-versioned physics :</desc>
1616

1717
<!--
@@ -35,9 +35,9 @@
3535
CAM Options
3636
===============
3737
-->
38-
<desc option="CCTS1" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA:</desc>
39-
<desc option="CCTS2" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA and expanded isoprene and terpene oxidation:</desc>
40-
<desc option="CCTS4" >CAM-Chem troposphere/stratosphere simplified chemistry for climate simulations:</desc>
38+
<desc option="CT1S" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA:</desc>
39+
<desc option="CT2S" >CAM-Chem troposphere/stratosphere chemistry with simplified VBS-SOA and expanded isoprene and terpene oxidation:</desc>
40+
<desc option="CT4S" >CAM-Chem troposphere/stratosphere simplified chemistry for climate simulations:</desc>
4141
<desc option="GEOSCHEM" >GEOS-Chem troposphere/stratosphere chemistry :</desc>
4242
<desc option="CFIRE" >CAM-Chem troposphere/stratosphere chem with simplified volatility basis set SOA scheme and fire emissons :</desc>
4343
<desc option="CLB" >CAM CLUBB - turned on by default in CAM60:</desc>
@@ -135,13 +135,13 @@
135135
<value compset="_CAM70">-phys cam7</value>
136136

137137
<!-- Modifiers for CAM runs (%.* includes SCAM runs) -->
138-
<value compset="_CAM.*(%CCTS1|%CFIRE)">-chem trop_strat_mam5_vbs</value>
138+
<value compset="_CAM.*(%CT1S|%CFIRE)">-chem trop_strat_mam5_vbs</value>
139139
<value compset="_CAM60.*%(GEOSCHEM)">-chem geoschem_mam4</value>
140140

141141
<value compset="%MAM7">-chem trop_mam7</value>
142142
<value compset="CAM60%CVBSX">-chem trop_strat_mam5_vbsext</value>
143-
<value compset="CAM60%CCTS2">-chem trop_strat_mam5_ts2</value>
144-
<value compset="CAM.*%CCTS4">-chem trop_strat_mam5_ts4</value>
143+
<value compset="CAM60%CT2S">-chem trop_strat_mam5_ts2</value>
144+
<value compset="CAM.*%CT4S">-chem trop_strat_mam5_ts4</value>
145145
<value compset="_CAM50%CLB">-clubb_sgs</value>
146146
<value compset="CAM%SPCAMS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom </value>
147147
<value compset="CAM%SPCAMCLBS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom -spcam_clubb_sgs </value>
@@ -153,7 +153,7 @@
153153

154154
<!-- Match against "%WC" to set defaults for all WACCM cases. -->
155155
<!-- Later settings of "-chem" take precedence over earlier ones. -->
156-
<value compset="_(CAM50|CAM60)%(WC|CC|CV|CF)">-age_of_air_trcs</value>
156+
<value compset="_(CAM50|CAM60)%(WC|CT|CV|CF)">-age_of_air_trcs</value>
157157
<value compset="_CAM40%WCCM">-chem waccm_ma</value>
158158
<value compset="_(CAM50|CAM60)%WCCM">-chem waccm_ma_mam5</value>
159159
<value compset="_(CAM50|CAM60)%WCMD">-chem waccm_mad_mam5</value>
@@ -169,7 +169,7 @@
169169

170170
<value compset="_CAM.*%SDYN">-offline_dyn</value>
171171
<value compset="_CAM\d0%SDYN_CLM">-nlev 56</value>
172-
<value compset="_CAM\d0%CC.*%SDYN">-nlev 56</value>
172+
<value compset="_CAM\d0%CT.*%SDYN">-nlev 56</value>
173173
<value compset="_CAM\d0%WC.*%SDYN">-nlev 88</value>
174174
<value compset="_CAM\d0%WX.*%SDYN">-nlev 145</value>
175175
<value compset="_CAM70%LT">-nlev 58 -model_top lt</value>
@@ -244,8 +244,8 @@
244244
<value compset="2000_CAM60%WCTS" >waccm_tsmlt_2000_cam6</value>
245245
<value compset="2000_CAM60%WCCM" >waccm_ma_2000_cam6</value>
246246
<value compset="2000_CAM60%WCSC" >waccm_sc_2000_cam6</value>
247-
<value compset="2000_CAM60%.*CCTS1" >2000_trop_strat_vbs_cam6</value>
248-
<value compset="2000_CAM60%GEOSCHEM" >2000_geoschem</value>
247+
<value compset="2000_CAM60%.*CT1S" >2000_trop_strat_vbs_cam6</value>
248+
<value compset="2000_CAM60%GEOSCHEM">2000_geoschem</value>
249249
<value compset="2000_CAM60%WXIE" >waccmx_ma_2000_cam6</value>
250250

251251
<value compset="2000_CAM40_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam4</value>
@@ -258,7 +258,7 @@
258258
<value compset="2000_CAM\d0%WC.*_SLND_SICE_DOCN%AQP">aquaplanet_waccm_2000</value>
259259

260260
<value compset="2010_CAM60" >2010_cam6</value>
261-
<value compset="2010_CAM60%.*CCTS1" >2010_trop_strat_vbs_cam6</value>
261+
<value compset="2010_CAM60%.*CT1S" >2010_trop_strat_vbs_cam6</value>
262262
<value compset="2010_CAM60%WCTS" >waccm_tsmlt_2010_cam6</value>
263263
<value compset="2010_CAM60%WCSC" >waccm_sc_2010_cam6</value>
264264
<value compset="2010_CAM60%GEOSCHEM">2010_geoschem</value>
@@ -278,9 +278,9 @@
278278
<value compset="HIST_CAM60%WCCM" >waccm_ma_hist_cam6</value>
279279
<value compset="HIST_CAM60%WCMD" >waccm_ma_hist_cam6</value>
280280
<value compset="HIST_CAM40%WCMD" >waccm_ma_hist_cam4</value>
281-
<value compset="HIST_CAM.*CCTS1" >hist_trop_strat_vbs_cam6</value>
282-
<value compset="HIST_CAM.*CCTS4" >hist_trop_strat_ts4_cam7</value>
283-
<value compset="HIST_CAM60%.*CCTS[12]%NUDG">hist_trop_strat_nudged_cam6</value>
281+
<value compset="HIST(C_|E_|_)CAM.*CT1S">hist_trop_strat_vbs_cam6</value>
282+
<value compset="HISTC_CAM7.*CT4S" >hist_trop_strat_ts4_cam7</value>
283+
<value compset="HIST_CAM60%.*CT[12]S%NUDG">hist_trop_strat_nudged_cam6</value>
284284
<value compset="HIST_CAM60%CVBSX" >hist_trop_strat_vbsext_cam6</value>
285285
<value compset="HIST_CAM60%CFIRE" >hist_trop_strat_vbsfire_cam6</value>
286286
<value compset="HIST_CAM60%GEOSCHEM">hist_geoschem</value>
@@ -309,8 +309,8 @@
309309
<value compset="_CAM60%WCCM%SDYN" >sd_waccm_ma_cam6</value>
310310
<value compset="_CAM60%WCMD%SDYN" >sd_waccm_ma_cam6</value>
311311
<value compset="_CAM40%WCMD%SDYN" >sd_waccm_ma_cam4</value>
312-
<value compset="_CAM60%.*CCTS1%SDYN" >sd_trop_strat_vbs_cam6</value>
313-
<value compset="_CAM60%.*CCTS2%SDYN" >sd_trop_strat2_cam6</value>
312+
<value compset="_CAM60%.*CT1S%SDYN" >sd_trop_strat_vbs_cam6</value>
313+
<value compset="_CAM60%.*CT2S%SDYN" >sd_trop_strat2_cam6</value>
314314
<value compset="_CAM60%SDYN_CLM50" >sd_cam6</value>
315315

316316
<value compset="2000_CAM%DABIP04" >dabi_p2004</value>
@@ -437,7 +437,7 @@
437437
<value compset="^SSP126_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</value>
438438
<value compset="^SSP245_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</value>
439439
<value compset="^SSP370_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc</value>
440-
<value compset="^HIST_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
440+
<value compset="^HIST" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
441441
<value compset="^2000_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
442442
<value compset="^2010_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
443443
<value compset="^1850_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>

‎cime_config/config_compsets.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218

219219
<compset>
220220
<alias>FCSCAM</alias>
221-
<lname>2000_CAM60%SCAM%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
221+
<lname>2000_CAM60%SCAM%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
222222
<science_support grid="T42_T42"/>
223223
</compset>
224224

@@ -293,7 +293,7 @@
293293

294294
<compset>
295295
<alias>QPC2000climo</alias>
296-
<lname>2000_CAM60%CCTS1_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
296+
<lname>2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
297297
</compset>
298298

299299
<compset>
@@ -407,11 +407,11 @@
407407

408408
<compset>
409409
<alias>FC2000climo</alias>
410-
<lname>2000_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
410+
<lname>2000_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
411411
</compset>
412412
<compset>
413413
<alias>FC2000climo_HCO</alias>
414-
<lname>2000_CAM60%CCTS1%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
414+
<lname>2000_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
415415
</compset>
416416
<compset>
417417
<alias>FC2000climo_GC</alias>
@@ -420,11 +420,11 @@
420420

421421
<compset>
422422
<alias>FC2010climo</alias>
423-
<lname>2010_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
423+
<lname>2010_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
424424
</compset>
425425
<compset>
426426
<alias>FC2010climo_HCO</alias>
427-
<lname>2010_CAM60%CCTS1%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
427+
<lname>2010_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
428428
</compset>
429429
<compset>
430430
<alias>FC2010climo_GC</alias>
@@ -433,24 +433,24 @@
433433

434434
<compset>
435435
<alias>FCHIST</alias>
436-
<lname>HIST_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
436+
<lname>HIST_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
437437
</compset>
438438
<compset>
439439
<alias>FCHIST_GC</alias>
440440
<lname>HIST_CAM60%GEOSCHEM%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
441441
</compset>
442442

443443
<compset>
444-
<alias>FCLTHIST</alias>
445-
<lname>HIST_CAM70%LT%CCTS1_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
444+
<alias>FHISTC_LTt1s</alias>
445+
<lname>HISTC_CAM70%LT%CT1S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
446446
</compset>
447447
<compset>
448-
<alias>FCMTHIST</alias>
449-
<lname>HIST_CAM70%MT%CCTS1_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
448+
<alias>FHISTC_MTt1s</alias>
449+
<lname>HISTC_CAM70%MT%CT1S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
450450
</compset>
451451
<compset>
452-
<alias>FCts4MTHIST</alias>
453-
<lname>HIST_CAM70%MT%CCTS4_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
452+
<alias>FHISTC_MTt4s</alias>
453+
<lname>HISTC_CAM70%MT%CT4S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
454454
</compset>
455455
<compset>
456456
<alias>FCvbsxHIST</alias>
@@ -462,12 +462,12 @@
462462
</compset>
463463
<compset>
464464
<alias>FCHIST_HCO</alias>
465-
<lname>HIST_CAM60%CCTS1%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
465+
<lname>HIST_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
466466
</compset>
467467

468468
<compset>
469469
<alias>FCnudged</alias>
470-
<lname>HIST_CAM60%CCTS1%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
470+
<lname>HIST_CAM60%CT1S%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
471471
</compset>
472472
<compset>
473473
<alias>FCnudged_GC</alias>
@@ -476,28 +476,28 @@
476476

477477
<compset>
478478
<alias>FCts2nudged</alias>
479-
<lname>HIST_CAM60%CCTS2%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
479+
<lname>HIST_CAM60%CT2S%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
480480
</compset>
481481
<compset>
482482
<alias>FCnudged_HCO</alias>
483-
<lname>HIST_CAM60%CCTS1%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
483+
<lname>HIST_CAM60%CT1S%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
484484
</compset>
485485
<compset>
486486
<alias>FCts2nudged_HCO</alias>
487-
<lname>HIST_CAM60%CCTS2%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
487+
<lname>HIST_CAM60%CT2S%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
488488
</compset>
489489

490490
<compset>
491491
<alias>FCSD</alias>
492-
<lname>HIST_CAM60%CCTS1%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
492+
<lname>HIST_CAM60%CT1S%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
493493
</compset>
494494
<compset>
495495
<alias>FCts2SD</alias>
496-
<lname>HIST_CAM60%CCTS2%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
496+
<lname>HIST_CAM60%CT2S%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
497497
</compset>
498498
<compset>
499499
<alias>FCSD_HCO</alias>
500-
<lname>HIST_CAM60%CCTS1%SDYN%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
500+
<lname>HIST_CAM60%CT1S%SDYN%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
501501
</compset>
502502

503503
<compset>
@@ -667,15 +667,15 @@
667667
<entries>
668668
<entry id="RUN_STARTDATE">
669669
<values match="last">
670-
<value compset="HIST_CAM">1979-01-01</value>
670+
<value compset="HIST(C_|E_|_)CAM">1979-01-01</value>
671671
<value compset="HIST_CAM60%WCTS_CLM50%BGC-CROP">1950-01-01</value>
672672
<value compset="HIST_CAM40%WX">2000-01-01</value>
673673
<value compset="HIST_CAM60%WCMD">2005-01-01</value>
674674
<value compset="HIST_CAM60%WCMD%SDYN" grid="a%1.9x2.5">1980-01-01</value>
675675
<value compset="HIST_CAM60%WCSC">1850-01-01</value>
676-
<value compset="HIST_CAM60%CCTS[12]">2010-01-01</value>
676+
<value compset="HIST_CAM60%CT[12]S">2010-01-01</value>
677677
<value compset="HIST_CAM60%GEOSCHEM">2015-01-01</value>
678-
<value compset="HIST_CAM60%CCTS[12]" grid="a%ne0np4CONUS">2013-01-01</value>
678+
<value compset="HIST_CAM60%CT[12]S" grid="a%ne0np4CONUS">2013-01-01</value>
679679
<value compset="HIST_CAM60%CVBSX">1995-01-01</value>
680680
<value compset="HIST_CAM60%CFIRE">1995-01-01</value>
681681
<value compset="RCP[2468]_CAM\d+">2005-01-01</value>

‎cime_config/config_pes.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@
416416
<nthrds_cpl>1</nthrds_cpl>
417417
</nthrds>
418418
</pes>
419-
<pes pesize="any" compset="_CAM\d0%(CC|CV|CF|WC)">
419+
<pes pesize="any" compset="_CAM\d0%(CT|CV|CF|WC)">
420420
<comment>none</comment>
421421
<ntasks>
422422
<ntasks_atm>-8</ntasks_atm>
@@ -435,7 +435,7 @@
435435
<nthrds_cpl>1</nthrds_cpl>
436436
</nthrds>
437437
</pes>
438-
<pes pesize="any" compset="_CAM70%MT%CC">
438+
<pes pesize="any" compset="_CAM70%MT%CT">
439439
<comment>none</comment>
440440
<ntasks>
441441
<ntasks_atm>-8</ntasks_atm>
@@ -512,7 +512,7 @@
512512
<rootpe_cpl>0</rootpe_cpl>
513513
</rootpe>
514514
</pes>
515-
<pes pesize="any" compset="_CAM.*%(CC|WC|CV|CF)">
515+
<pes pesize="any" compset="_CAM.*%(CT|WC|CV|CF)">
516516
<comment>none</comment>
517517
<ntasks>
518518
<ntasks_atm>-50</ntasks_atm>
@@ -833,7 +833,7 @@
833833
<rootpe_cpl>0</rootpe_cpl>
834834
</rootpe>
835835
</pes>
836-
<pes pesize="any" compset="_CAM\d0%(CC|CV|CF|WC|WX)">
836+
<pes pesize="any" compset="_CAM\d0%(CT|CV|CF|WC|WX)">
837837
<comment>none</comment>
838838
<ntasks>
839839
<ntasks_atm>-4</ntasks_atm>
@@ -1389,7 +1389,7 @@
13891389
</grid>
13901390
<grid name="a%0.9x1.25">
13911391
<mach name="cheyenne">
1392-
<pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
1392+
<pes pesize="any" compset="_(CAM50|CAM60)%(CT|CV|CF|WC)">
13931393
<comment>none</comment>
13941394
<ntasks>
13951395
<ntasks_atm>384</ntasks_atm>
@@ -1418,7 +1418,7 @@
14181418
</pes>
14191419
</mach>
14201420
<mach name="derecho">
1421-
<pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
1421+
<pes pesize="any" compset="_(CAM50|CAM60)%(CT|CV|CF|WC)">
14221422
<comment>none</comment>
14231423
<ntasks>
14241424
<ntasks_atm>-8</ntasks_atm>
@@ -1476,7 +1476,7 @@
14761476
</pes>
14771477
</mach>
14781478
<mach name="cheyenne">
1479-
<pes pesize="any" compset="_CAM60%(CC|WC)">
1479+
<pes pesize="any" compset="_CAM60%(CT|WC)">
14801480
<comment>none</comment>
14811481
<ntasks>
14821482
<ntasks_atm>768</ntasks_atm>

0 commit comments

Comments
 (0)