Skip to content

Commit

Permalink
Merge pull request #1164 from fvitt/compset_names
Browse files Browse the repository at this point in the history 
cam6_4_041: CAM-Chem compset names
  • Loading branch information
@fvitt
fvitt authored Oct 16, 2024
2 parents a12dd47 + 9a26757 commit 54af3ee
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 60 deletions.
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 55 files
+2 −3 .github/workflows/testing.yml
+1 −7 CIME/BuildTools/configure.py
+54 −26 CIME/ParamGen/paramgen.py
+4 −4 CIME/Servers/__init__.py
+14 −3 CIME/SystemTests/ers.py
+1 −2 CIME/SystemTests/funit.py
+4 −3 CIME/SystemTests/hommebaseclass.py
+4 −4 CIME/SystemTests/mvk.py
+5 −5 CIME/SystemTests/pgn.py
+1 −1 CIME/SystemTests/restart_tests.py
+2 −71 CIME/SystemTests/system_tests_common.py
+4 −4 CIME/SystemTests/tsc.py
+4 −5 CIME/Tools/Makefile
+60 −94 CIME/Tools/list_e3sm_tests
+9 −52 CIME/Tools/xmlchange
+0 −10 CIME/XML/batch.py
+1 −1 CIME/XML/component.py
+0 −22 CIME/XML/compsets.py
+1 −1 CIME/XML/entry_id.py
+21 −65 CIME/XML/env_batch.py
+0 −12 CIME/XML/env_workflow.py
+21 −47 CIME/XML/grids.py
+7 −30 CIME/XML/pes.py
+3 −8 CIME/build.py
+9 −29 CIME/case/case.py
+4 −8 CIME/case/case_cmpgen_namelists.py
+2 −6 CIME/case/case_run.py
+4 −48 CIME/case/case_setup.py
+5 −6 CIME/case/case_st_archive.py
+1 −5 CIME/case/case_submit.py
+1 −2 CIME/case/case_test.py
+15 −9 CIME/code_checker.py
+1 −2 CIME/compare_test_results.py
+3 −0 CIME/data/config/config_tests.xml
+0 −2 CIME/data/config/xml_schemas/config_workflow.xsd
+0 −77 CIME/data/templates/gitignore.template
+0 −100 CIME/gitinterface.py
+47 −66 CIME/hist_utils.py
+1 −1 CIME/non_py/cprnc
+0 −10 CIME/scripts/create_test.py
+365 −270 CIME/scripts/query_config.py
+0 −132 CIME/status.py
+17 −30 CIME/test_scheduler.py
+1 −8 CIME/test_status.py
+1 −2 CIME/tests/test_sys_cime_case.py
+1 −1 CIME/tests/test_sys_create_newcase.py
+3 −25 CIME/tests/test_sys_unittest.py
+1 −1 CIME/tests/test_unit_utils.py
+0 −164 CIME/tests/test_unit_xml_grids.py
+98 −13 CIME/utils.py
+50 −12 docker/Dockerfile
+0 −29 docker/cime.yaml
+0 −9 docker/entrypoint.sh
+3 −3 tools/mapping/gen_mapping_files/runoff_to_ocn/INSTALL
+1 −1 tools/mapping/gen_mapping_files/runoff_to_ocn/tools/makdep.c
42 changes: 21 additions & 21 deletions cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
CAM
===============
-->
<desc atm="CAM70[%LT][%MT][%CCTS1][%CCTS4]" >CAM cam7 physics:</desc>
<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>
<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>
<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>
<desc atm="CAM70[%LT][%MT][%CT1S][%CT4S]" >CAM cam7 physics:</desc>
<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>
<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>
<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>
<desc atm="CAM[%ADIAB][%DABIP04][%TJ16][%GRAYRAD][%HS94][%KESSLER][%RCO2][%SPCAMS][%SPCAMCLBS][%SPCAMM][%SPCAMCLBM]" >CAM simplified and non-versioned physics :</desc>

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

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

<value compset="%MAM7">-chem trop_mam7</value>
<value compset="CAM60%CVBSX">-chem trop_strat_mam5_vbsext</value>
<value compset="CAM60%CCTS2">-chem trop_strat_mam5_ts2</value>
<value compset="CAM.*%CCTS4">-chem trop_strat_mam5_ts4</value>
<value compset="CAM60%CT2S">-chem trop_strat_mam5_ts2</value>
<value compset="CAM.*%CT4S">-chem trop_strat_mam5_ts4</value>
<value compset="_CAM50%CLB">-clubb_sgs</value>
<value compset="CAM%SPCAMS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom </value>
<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>
Expand All @@ -153,7 +153,7 @@

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

<value compset="_CAM.*%SDYN">-offline_dyn</value>
<value compset="_CAM\d0%SDYN_CLM">-nlev 56</value>
<value compset="_CAM\d0%CC.*%SDYN">-nlev 56</value>
<value compset="_CAM\d0%CT.*%SDYN">-nlev 56</value>
<value compset="_CAM\d0%WC.*%SDYN">-nlev 88</value>
<value compset="_CAM\d0%WX.*%SDYN">-nlev 145</value>
<value compset="_CAM70%LT">-nlev 58 -model_top lt</value>
Expand Down Expand Up @@ -244,8 +244,8 @@
<value compset="2000_CAM60%WCTS" >waccm_tsmlt_2000_cam6</value>
<value compset="2000_CAM60%WCCM" >waccm_ma_2000_cam6</value>
<value compset="2000_CAM60%WCSC" >waccm_sc_2000_cam6</value>
<value compset="2000_CAM60%.*CCTS1" >2000_trop_strat_vbs_cam6</value>
<value compset="2000_CAM60%GEOSCHEM" >2000_geoschem</value>
<value compset="2000_CAM60%.*CT1S" >2000_trop_strat_vbs_cam6</value>
<value compset="2000_CAM60%GEOSCHEM">2000_geoschem</value>
<value compset="2000_CAM60%WXIE" >waccmx_ma_2000_cam6</value>

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

<value compset="2010_CAM60" >2010_cam6</value>
<value compset="2010_CAM60%.*CCTS1" >2010_trop_strat_vbs_cam6</value>
<value compset="2010_CAM60%.*CT1S" >2010_trop_strat_vbs_cam6</value>
<value compset="2010_CAM60%WCTS" >waccm_tsmlt_2010_cam6</value>
<value compset="2010_CAM60%WCSC" >waccm_sc_2010_cam6</value>
<value compset="2010_CAM60%GEOSCHEM">2010_geoschem</value>
Expand All @@ -278,9 +278,9 @@
<value compset="HIST_CAM60%WCCM" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM60%WCMD" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM40%WCMD" >waccm_ma_hist_cam4</value>
<value compset="HIST_CAM.*CCTS1" >hist_trop_strat_vbs_cam6</value>
<value compset="HIST_CAM.*CCTS4" >hist_trop_strat_ts4_cam7</value>
<value compset="HIST_CAM60%.*CCTS[12]%NUDG">hist_trop_strat_nudged_cam6</value>
<value compset="HIST(C_|E_|_)CAM.*CT1S">hist_trop_strat_vbs_cam6</value>
<value compset="HISTC_CAM7.*CT4S" >hist_trop_strat_ts4_cam7</value>
<value compset="HIST_CAM60%.*CT[12]S%NUDG">hist_trop_strat_nudged_cam6</value>
<value compset="HIST_CAM60%CVBSX" >hist_trop_strat_vbsext_cam6</value>
<value compset="HIST_CAM60%CFIRE" >hist_trop_strat_vbsfire_cam6</value>
<value compset="HIST_CAM60%GEOSCHEM">hist_geoschem</value>
Expand Down Expand Up @@ -309,8 +309,8 @@
<value compset="_CAM60%WCCM%SDYN" >sd_waccm_ma_cam6</value>
<value compset="_CAM60%WCMD%SDYN" >sd_waccm_ma_cam6</value>
<value compset="_CAM40%WCMD%SDYN" >sd_waccm_ma_cam4</value>
<value compset="_CAM60%.*CCTS1%SDYN" >sd_trop_strat_vbs_cam6</value>
<value compset="_CAM60%.*CCTS2%SDYN" >sd_trop_strat2_cam6</value>
<value compset="_CAM60%.*CT1S%SDYN" >sd_trop_strat_vbs_cam6</value>
<value compset="_CAM60%.*CT2S%SDYN" >sd_trop_strat2_cam6</value>
<value compset="_CAM60%SDYN_CLM50" >sd_cam6</value>

<value compset="2000_CAM%DABIP04" >dabi_p2004</value>
Expand Down Expand Up @@ -437,7 +437,7 @@
<value compset="^SSP126_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</value>
<value compset="^SSP245_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</value>
<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>
<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>
<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>
<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>
<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>
<value compset="^1850_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
Expand Down
48 changes: 24 additions & 24 deletions cime_config/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@

<compset>
<alias>FCSCAM</alias>
<lname>2000_CAM60%SCAM%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
<lname>2000_CAM60%SCAM%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
<science_support grid="T42_T42"/>
</compset>

Expand Down Expand Up @@ -293,7 +293,7 @@

<compset>
<alias>QPC2000climo</alias>
<lname>2000_CAM60%CCTS1_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
<lname>2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
</compset>

<compset>
Expand Down Expand Up @@ -407,11 +407,11 @@

<compset>
<alias>FC2000climo</alias>
<lname>2000_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>2000_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FC2000climo_HCO</alias>
<lname>2000_CAM60%CCTS1%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>2000_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FC2000climo_GC</alias>
Expand All @@ -420,11 +420,11 @@

<compset>
<alias>FC2010climo</alias>
<lname>2010_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>2010_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FC2010climo_HCO</alias>
<lname>2010_CAM60%CCTS1%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>2010_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FC2010climo_GC</alias>
Expand All @@ -433,24 +433,24 @@

<compset>
<alias>FCHIST</alias>
<lname>HIST_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCHIST_GC</alias>
<lname>HIST_CAM60%GEOSCHEM%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
</compset>

<compset>
<alias>FCLTHIST</alias>
<lname>HIST_CAM70%LT%CCTS1_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<alias>FHISTC_LTt1s</alias>
<lname>HISTC_CAM70%LT%CT1S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCMTHIST</alias>
<lname>HIST_CAM70%MT%CCTS1_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<alias>FHISTC_MTt1s</alias>
<lname>HISTC_CAM70%MT%CT1S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCts4MTHIST</alias>
<lname>HIST_CAM70%MT%CCTS4_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<alias>FHISTC_MTt4s</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCvbsxHIST</alias>
Expand All @@ -462,12 +462,12 @@
</compset>
<compset>
<alias>FCHIST_HCO</alias>
<lname>HIST_CAM60%CCTS1%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>FCnudged</alias>
<lname>HIST_CAM60%CCTS1%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT1S%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCnudged_GC</alias>
Expand All @@ -476,28 +476,28 @@

<compset>
<alias>FCts2nudged</alias>
<lname>HIST_CAM60%CCTS2%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT2S%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCnudged_HCO</alias>
<lname>HIST_CAM60%CCTS1%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT1S%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCts2nudged_HCO</alias>
<lname>HIST_CAM60%CCTS2%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT2S%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>FCSD</alias>
<lname>HIST_CAM60%CCTS1%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT1S%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCts2SD</alias>
<lname>HIST_CAM60%CCTS2%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT2S%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCSD_HCO</alias>
<lname>HIST_CAM60%CCTS1%SDYN%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<lname>HIST_CAM60%CT1S%SDYN%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand Down Expand Up @@ -667,15 +667,15 @@
<entries>
<entry id="RUN_STARTDATE">
<values match="last">
<value compset="HIST_CAM">1979-01-01</value>
<value compset="HIST(C_|E_|_)CAM">1979-01-01</value>
<value compset="HIST_CAM60%WCTS_CLM50%BGC-CROP">1950-01-01</value>
<value compset="HIST_CAM40%WX">2000-01-01</value>
<value compset="HIST_CAM60%WCMD">2005-01-01</value>
<value compset="HIST_CAM60%WCMD%SDYN" grid="a%1.9x2.5">1980-01-01</value>
<value compset="HIST_CAM60%WCSC">1850-01-01</value>
<value compset="HIST_CAM60%CCTS[12]">2010-01-01</value>
<value compset="HIST_CAM60%CT[12]S">2010-01-01</value>
<value compset="HIST_CAM60%GEOSCHEM">2015-01-01</value>
<value compset="HIST_CAM60%CCTS[12]" grid="a%ne0np4CONUS">2013-01-01</value>
<value compset="HIST_CAM60%CT[12]S" grid="a%ne0np4CONUS">2013-01-01</value>
<value compset="HIST_CAM60%CVBSX">1995-01-01</value>
<value compset="HIST_CAM60%CFIRE">1995-01-01</value>
<value compset="RCP[2468]_CAM\d+">2005-01-01</value>
Expand Down
14 changes: 7 additions & 7 deletions cime_config/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
<pes pesize="any" compset="_CAM\d0%(CC|CV|CF|WC)">
<pes pesize="any" compset="_CAM\d0%(CT|CV|CF|WC)">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
Expand All @@ -435,7 +435,7 @@
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
<pes pesize="any" compset="_CAM70%MT%CC">
<pes pesize="any" compset="_CAM70%MT%CT">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
Expand Down Expand Up @@ -512,7 +512,7 @@
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
<pes pesize="any" compset="_CAM.*%(CC|WC|CV|CF)">
<pes pesize="any" compset="_CAM.*%(CT|WC|CV|CF)">
<comment>none</comment>
<ntasks>
<ntasks_atm>-50</ntasks_atm>
Expand Down Expand Up @@ -833,7 +833,7 @@
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
<pes pesize="any" compset="_CAM\d0%(CC|CV|CF|WC|WX)">
<pes pesize="any" compset="_CAM\d0%(CT|CV|CF|WC|WX)">
<comment>none</comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
Expand Down Expand Up @@ -1389,7 +1389,7 @@
</grid>
<grid name="a%0.9x1.25">
<mach name="cheyenne">
<pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
<pes pesize="any" compset="_(CAM50|CAM60)%(CT|CV|CF|WC)">
<comment>none</comment>
<ntasks>
<ntasks_atm>384</ntasks_atm>
Expand Down Expand Up @@ -1418,7 +1418,7 @@
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
<pes pesize="any" compset="_(CAM50|CAM60)%(CT|CV|CF|WC)">
<comment>none</comment>
<ntasks>
<ntasks_atm>-8</ntasks_atm>
Expand Down Expand Up @@ -1476,7 +1476,7 @@
</pes>
</mach>
<mach name="cheyenne">
<pes pesize="any" compset="_CAM60%(CC|WC)">
<pes pesize="any" compset="_CAM60%(CT|WC)">
<comment>none</comment>
<ntasks>
<ntasks_atm>768</ntasks_atm>
Expand Down
Loading

0 comments on commit 54af3ee

Please sign in to comment.