update config component to handle new compset names

ESCOMP · Jul 5, 2024 · 302680a · 302680a
1 parent 62110ab
commit 302680a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -215,14 +215,14 @@
       <value compset="1850_CAM60%WCTS"   >waccm_tsmlt_1850_cam6</value>
       <value compset="1850_CAM60%WCCM"   >waccm_ma_1850_cam6</value>
       <value compset="1850_CAM60%WCSC"   >waccm_sc_1850_cam6</value>
-      <value compset="1850_CAM70%LT"     >1850_cam_lt</value>
-      <value compset="1850_CAM70%MT"     >1850_cam_mt</value>
+      <value compset="1850[C]?_CAM70%LT"     >1850_cam_lt</value>
+      <value compset="1850[C]?_CAM70%MT"     >1850_cam_mt</value>
 
       <value compset="2000_CAM40%TMOZ"   >2000_cam4_trop_chem</value>
       <value compset="2000_CAM40%WXIE"   >waccmxie_ma_2000_cam4</value>
       <value compset="2000_CAM40%WX_"    >waccmx_ma_2000_cam4</value>
 
-      <value compset="2000_CAM70"        >2000_cam6</value>
+      <value compset="2000[C]?_CAM70"        >2000_cam6</value>
       <value compset="2000_CAM60"        >2000_cam6</value>
       <value compset="2000_CAM60%WCTS"   >waccm_tsmlt_2000_cam6</value>
       <value compset="2000_CAM60%WCCM"   >waccm_ma_2000_cam6</value>
@@ -377,7 +377,7 @@
     <type>char</type>
     <default_value>2000</default_value>
     <values match="last">
-      <value compset="^1850_">1850</value>
+      <value compset="^1850[C]?_">1850</value>
       <value compset="^2010_">2010</value>
       <value compset="^HIST_">1850</value>
       <value compset="^SSP"  >2015</value>
@@ -392,7 +392,7 @@
     <default_value>2000</default_value>
     <values match="last">
       <value compset="^2010_">2010</value>
-      <value compset="^1850_">1850</value>
+      <value compset="^1850[C]?_">1850</value>
       <value compset="^HIST_">2015</value>
       <value compset="^SSP"  >2101</value>
     </values>
@@ -422,10 +422,10 @@
       <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[C]?_"  >$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>
+      <value compset="^1850[C]?_"  >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
     </values>
     <group>run_component_cam</group>
     <file>env_run.xml</file>