Skip to content

Commit 3f37963

Browse files
jedwards4bjedwards4b
authored
Merge pull request #325 from jedwards4b/update_compset_names
update 1850 and HIST compset names
2 parents faaa8ef + 43ba720 commit 3f37963

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎datm/cime_config/config_component.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<valid_values>none,clim_1850,clim_2000,clim_2010,hist,SSP1-1.9,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP4-3.4,SSP4-6.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
7575
<default_value>clim_2000</default_value>
7676
<values match="last">
77-
<value compset="^1850_" >clim_1850</value>
77+
<value compset="^1850[CE]?_" >clim_1850</value>
7878
<value compset="^2000_" >clim_2000</value>
7979
<value compset="^2010_" >clim_2010</value>
8080
<value compset="^SSP119_" >SSP1-1.9</value>
@@ -85,7 +85,7 @@
8585
<value compset="^SSP460_" >SSP4-6.0</value>
8686
<value compset="^SSP534_" >SSP5-3.4</value>
8787
<value compset="^SSP585_" >SSP5-8.5</value>
88-
<value compset="^HIST_" >hist</value>
88+
<value compset="^HIST[CE]?_" >hist</value>
8989
<value compset="^20TR_" >hist</value>
9090
<value compset="_DATM%CPLHIST">cplhist</value>
9191
<value compset="_DATM.*_DICE.*_DOCN.*_DROF">none</value>
@@ -100,14 +100,14 @@
100100
<valid_values>none,clim_1850,clim_2000,clim_2010,hist,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
101101
<default_value>clim_2000</default_value>
102102
<values match="last">
103-
<value compset="^1850_" >clim_1850</value>
103+
<value compset="^1850[CE]?_" >clim_1850</value>
104104
<value compset="^2000_" >clim_2000</value>
105105
<value compset="^2010_" >clim_2010</value>
106106
<value compset="^SSP126_" >SSP1-2.6</value>
107107
<value compset="^SSP245_" >SSP2-4.5</value>
108108
<value compset="^SSP370_" >SSP3-7.0</value>
109109
<value compset="^SSP585_" >SSP5-8.5</value>
110-
<value compset="^HIST_" >hist</value>
110+
<value compset="^HIST[CE]?_" >hist</value>
111111
<value compset="^20TR_" >hist</value>
112112
<value compset="_DATM%CPLHIST">cplhist</value>
113113
<value compset="_DATM.*_DICE.*_DOCN.*_DROF">none</value>
@@ -122,13 +122,13 @@
122122
<valid_values>none,clim_1850,clim_2000,clim_2010,hist,SSP2-4.5,SSP3-7.0,SSP5-8.5</valid_values>
123123
<default_value>clim_2000</default_value>
124124
<values match="last">
125-
<value compset="^1850_" >clim_1850</value>
125+
<value compset="^1850[CE]?_" >clim_1850</value>
126126
<value compset="^2000_" >clim_2000</value>
127127
<value compset="^2010_" >clim_2010</value>
128128
<value compset="^SSP245_" >SSP2-4.5</value>
129129
<value compset="^SSP370_" >SSP3-7.0</value>
130130
<value compset="^SSP585_" >SSP5-8.5</value>
131-
<value compset="^HIST_" >hist</value>
131+
<value compset="^HIST[CE]?_" >hist</value>
132132
<value compset="^20TR_" >hist</value>
133133
<!-- Only needed for compsets with active land; only in DATM CLMNCEP mode -->
134134
<value compset="_SLND">none</value>
@@ -167,7 +167,7 @@
167167
<value compset="^SSP460_">SSP4-6.0</value>
168168
<value compset="^SSP534_">SSP5-3.4</value>
169169
<value compset="^SSP585_">SSP5-8.5</value>
170-
<value compset="^HIST" >20tr</value>
170+
<value compset="^HIST[CE]?_" >20tr</value>
171171
<value compset="^20TR" >20tr</value>
172172
<value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">omip.iaf</value>
173173
<value compset="^OMIP_DATM%JRA.*_POP2%[^_]*ECO">omip.jra</value>

‎docn/cime_config/config_component.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -159,19 +159,19 @@
159159
<value compset="DOCN%DOM" grid="a%0.9x1.25.*_oi%0.9x1.25" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc</value>
160160
<value compset="DOCN%DOM" grid="a%0.47x0.63.*_oi%0.47x0.63" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_clim_c061106.nc</value>
161161
<value compset="DOCN%DOM" grid="a%0.23x0.31.*_oi%0.23x0.31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_c110526.nc</value>
162-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)" grid=".+" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1x1_1850_2021_c120422.nc</value>
163-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)" grid="a%T31.*_oi%T31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_48x96_1850_2021_c120422.nc</value>
164-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)" grid="a%1.9x2.5.*_oi%1.9x2.5" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_1850_2021_c120422.nc</value>
165-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)" grid="a%0.9x1.25.*_oi%0.9x1.25" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_1850_2021_c120422.nc</value>
166-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)" grid="a%0.47x0.63.*_oi%0.47x0.63" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_1850_2021_c120422.nc</value>
167-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)" grid="a%0.23x0.31.*_oi%0.23x0.31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_1850_2021_c120422.nc</value>
168-
<value compset="1850_" grid=".+" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1x1_clim_pi_c101029.nc</value>
162+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)" grid=".+" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1x1_1850_2021_c120422.nc</value>
163+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)" grid="a%T31.*_oi%T31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_48x96_1850_2021_c120422.nc</value>
164+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)" grid="a%1.9x2.5.*_oi%1.9x2.5" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_1850_2021_c120422.nc</value>
165+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)" grid="a%0.9x1.25.*_oi%0.9x1.25" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_1850_2021_c120422.nc</value>
166+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)" grid="a%0.47x0.63.*_oi%0.47x0.63" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_1850_2021_c120422.nc</value>
167+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)" grid="a%0.23x0.31.*_oi%0.23x0.31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_1850_2021_c120422.nc</value>
168+
<value compset="1850[CE]?_" grid=".+" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1x1_clim_pi_c101029.nc</value>
169169
<value compset="1850S_" grid=".+" >$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_1850_clim_c20190125.nc</value>
170-
<value compset="1850_" grid="a%T31.*_oi%T31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_48x96_clim_pi_c101028.nc</value>
171-
<value compset="1850_" grid="a%1.9x2.5.*_oi%1.9x2.5" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_clim_pi_c101028.nc</value>
172-
<value compset="1850_" grid="a%0.9x1.25.*_oi%0.9x1.25" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_pi_c101028.nc</value>
173-
<value compset="1850_" grid="a%0.47x0.63.*_oi%0.47x0.63" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_clim_pi_c101028.nc</value>
174-
<value compset="1850_" grid="a%0.23x0.31.*_oi%0.23x0.31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_pi_c101028.nc</value>
170+
<value compset="1850[CE]?_" grid="a%T31.*_oi%T31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_48x96_clim_pi_c101028.nc</value>
171+
<value compset="1850[CE]?_" grid="a%1.9x2.5.*_oi%1.9x2.5" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_clim_pi_c101028.nc</value>
172+
<value compset="1850[CE]?_" grid="a%0.9x1.25.*_oi%0.9x1.25" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_pi_c101028.nc</value>
173+
<value compset="1850[CE]?_" grid="a%0.47x0.63.*_oi%0.47x0.63" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_clim_pi_c101028.nc</value>
174+
<value compset="1850[CE]?_" grid="a%0.23x0.31.*_oi%0.23x0.31" >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_pi_c101028.nc</value>
175175
<value compset="1950_" grid=".+" >$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_1950_clim_c20180910.nc</value>
176176
<value compset="2010S_" grid="a%ne30np4.*_oi%oEC60to30v3" >$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_2010_clim_c20190821.nc</value>
177177
</values>
@@ -206,7 +206,7 @@
206206
<valid_values></valid_values>
207207
<default_value>1</default_value>
208208
<values match="last">
209-
<value compset="(AMIP_|20TR_|HIST_|5505_|PIPD_|%TSCH)">1850</value>
209+
<value compset="(AMIP_|20TR_|HIST[CE]?_|5505_|PIPD_|%TSCH)">1850</value>
210210
</values>
211211
<group>run_component_cam_sstice</group>
212212
<file>env_run.xml</file>
@@ -228,7 +228,7 @@
228228
<valid_values></valid_values>
229229
<default_value>0</default_value>
230230
<values match="last">
231-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)">1850</value>
231+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)">1850</value>
232232
</values>
233233
<group>run_component_cam_sstice</group>
234234
<file>env_run.xml</file>
@@ -244,7 +244,7 @@
244244
<valid_values></valid_values>
245245
<default_value>0</default_value>
246246
<values match="last">
247-
<value compset="(AMIP_|HIST_|20TR_|5505_|PIPD_|%TSCH)">2021</value>
247+
<value compset="(AMIP_|HIST[CE]?_|20TR_|5505_|PIPD_|%TSCH)">2021</value>
248248
</values>
249249
<group>run_component_cam_sstice</group>
250250
<file>env_run.xml</file>

0 commit comments

Comments
 (0)