Skip to content

Commit d6e9af3

Browse files
rljacobrljacob
authored
Merge branch 'thorntonpe/lnd/fix_naming' (PR #6276)
Correct component naming and version to replace clm4.5 with elm in the case description, written to README.case for each created case. Fixes #6245 Reported-by: Rob Jacob [email protected] [BFB]
2 parents ddfd7fb + 832e852 commit d6e9af3

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎components/elm/cime_config/config_component.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<value compset="1950(?:SOI)?_EAM%CMIP6-[LH]R[^_]*_ELM%[^_]*BC">-phys elm -cppdefs '-DMODAL_AER -DAPPLY_POST_DECK_BUGFIXES'</value>
2323
<value compset="2010(?:SOI)?_EAM%CMIP6-[LH]R[^_]*_ELM%[^_]*BC">-phys elm -cppdefs '-DMODAL_AER -DAPPLY_POST_DECK_BUGFIXES'</value>
2424
</values>
25-
<group>build_component_clm</group>
25+
<group>build_component_elm</group>
2626
<file>env_build.xml</file>
2727
<desc>Provides option(s) for the ELM configure utility.
28-
CLM_CONFIG_OPTS are normally set as compset variables (e.g., -bgc cn)
28+
ELM_CONFIG_OPTS are normally set as compset variables (e.g., -bgc cn)
2929
and in general should not be modified for supported compsets.
3030
It is recommended that if you want to modify this value for your experiment,
3131
you should use your own user-defined component sets via using create_newcase
@@ -95,15 +95,15 @@
9595
<value compset="20TR(?:SOI)?_EAM%AR5sf_ELM">20thC_CMIP6_transient</value>
9696

9797
</values>
98-
<group>run_component_clm</group>
98+
<group>run_component_elm</group>
9999
<file>env_run.xml</file>
100100
<desc>ELM namelist use_case.
101101
Determines the use-case that will be sent to the ELM build-namelist utility.
102102
This is normally set by the component set. This is an advanced flag and should only be
103103
used by expert users.</desc>
104104
</entry>
105105

106-
<!-- CLM_BLDNML_OPTS is not additive, we must list all possible combinations -->
106+
<!-- ELM_BLDNML_OPTS is not additive, we must list all possible combinations -->
107107
<!-- ERROR: the node below is never matched, see bug 2025 -->
108108
<entry id="ELM_BLDNML_OPTS">
109109
<type>char</type>
@@ -139,7 +139,7 @@
139139
<value compset="_ELM50%[^_]*SP" >-bgc sp</value>
140140
<value compset="_ELM50%[^_]*BGC" >-bgc bgc</value>
141141
</values>
142-
<group>run_component_clm</group>
142+
<group>run_component_elm</group>
143143
<file>env_run.xml</file>
144144
<desc>ELM build-namelist options</desc>
145145
</entry>
@@ -161,12 +161,12 @@
161161
<value compset="_ELM.*_BGC%BDRC">diagnostic</value>
162162
<value compset="20TR.*_DATM.*_BGC%BC" >constant</value>
163163
</values>
164-
<group>run_component_clm</group>
164+
<group>run_component_elm</group>
165165
<file>env_run.xml</file>
166166
<desc>Determines how ELM will determine where CO2 is set.
167167
If value is constant, it will be set to CCSM_CO2_PPMV,
168168
if value is either diagnostic or prognostic, the atmosphere model
169-
MUST send it to ELM. CLM_CO2_TYPE is normally set by the specific
169+
MUST send it to ELM. ELM_CO2_TYPE is normally set by the specific
170170
compset, since it HAS to be coordinated with settings for the
171171
atmospheric model. Do not modify this variable. If you want to modify for
172172
your experiment, use your own user-defined component set
@@ -176,10 +176,10 @@
176176
<entry id="ELM_NAMELIST_OPTS">
177177
<type>char</type>
178178
<default_value></default_value>
179-
<group>run_component_clm</group>
179+
<group>run_component_elm</group>
180180
<file>env_run.xml</file>
181181
<desc>ELM-specific namelist settings for -namelist option in the ELM
182-
build-namelist. CLM_NAMELIST_OPTS is normally set as a compset variable
182+
build-namelist. ELM_NAMELIST_OPTS is normally set as a compset variable
183183
and in general should not be modified for supported compsets.
184184
It is recommended that if you want to modify this value for your experiment,
185185
you should use your own user-defined component sets via using create_newcase
@@ -191,7 +191,7 @@
191191
<type>char</type>
192192
<valid_values>on,off</valid_values>
193193
<default_value>off</default_value>
194-
<group>run_component_clm</group>
194+
<group>run_component_elm</group>
195195
<file>env_run.xml</file>
196196
<desc>Turn on any settings for accellerating the model spinup.
197197
</desc>
@@ -200,10 +200,10 @@
200200
<entry id="ELM_USRDAT_NAME">
201201
<type>char</type>
202202
<default_value>UNSET</default_value>
203-
<group>run_component_clm</group>
203+
<group>run_component_elm</group>
204204
<file>env_run.xml</file>
205205
<desc>Dataset name for user-created datasets. This is used as the argument
206-
in Buildconf/clm.buildnml to build-namelist -clm_usr_name. An example of
206+
in Buildconf/elm.buildnml to build-namelist -elm_usr_name. An example of
207207
such a dataset would be 1x1pt_boulderCO_c090722. The default value is UNSET.
208208
This is an advanced flag and should only be used by expert users.</desc>
209209
</entry>
@@ -217,34 +217,34 @@
217217
<value compset="4804.*_ELM.*_CISM1">off</value>
218218
<value compset="_ELM.+MALI" >on</value>
219219
</values>
220-
<group>run_component_clm</group>
220+
<group>run_component_elm</group>
221221
<file>env_run.xml</file>
222222
<desc>Flag to the ELM build-namelist command to force ELM to do a
223223
cold start (finidat will be set to blanks).
224224
A value of on forces the model to spin up from a cold-start
225225
(arbitrary initial conditions). Setting this value in the xml file will take
226-
precedence over any settings for finidat in the $CASEROOT/user_clm_clm file.</desc>
226+
precedence over any settings for finidat in the $CASEROOT/user_elm file.</desc>
227227
</entry>
228228

229229
<description>
230-
<desc compset="_ELM" >clm4.5 physics:</desc>
231-
<desc compset="_ELM%[^_]*SP" >clm4.5 Satellite phenology:</desc>
232-
<desc compset="_ELM%[^_]*SPBC" >clm4.5 Satellite phenology with black carbon deposition:</desc>
233-
<desc compset="_ELM%[^_]*CN" >clm4.5 cn:</desc>
234-
<desc compset="_ELM%[^_]*CNDV" >clm4.5 cn with dynamic vegetation:</desc>
235-
<desc compset="_ELM%[^_]*BGC" >clm4.5 bgc (cn and methane):</desc>
236-
<desc compset="_ELM%[^_]*CROP" >clm4.5 prognostic crop:</desc>
237-
<desc compset="_ELM%[^_]*VIC" >clm4.5 vic hydrology:</desc>
238-
<desc compset="_ELM%[^_]*FATES" >clm4.5 FATES (Functionally Assembled Terr. Ecosystem Simulator): (experimental)</desc>
239-
<desc compset="_ELM%[^_]*BGCDV" >clm4.5 BGC (CN with vertically resolved soil BGC, based on Century with Methane) with dynamic veg</desc>
240-
<desc compset="_ELM%[^_]*CRDCTCBC" >alm1.0 C only, nutirent competition via relative demand, ctc soil cascade with black carbon deposition:</desc>
241-
<desc compset="_ELM%[^_]*CNRDCTCBC" >alm1.0 C-N, nutirent competition via relative demand, ctc soil cascade with black carbon deposition:</desc>
242-
<desc compset="_ELM%[^_]*CNPRDCTCBC" >alm1.0 C-N-P, nutirent competition via relative demand, ctc soil cascade with black carbon deposition:</desc>
243-
<desc compset="_ELM%[^_]*CNECACTCBC" >alm1.0 C-N, nutirent competition via equilibrium chemistry approximation, ctc soil cascade with black carbon deposition:</desc>
244-
<desc compset="_ELM%[^_]*CNPECACTCBC">alm1.0 C-N-P, nutirent competition via equilibrium chemistry approximation, ctc soil cascade with black carbon deposition:</desc>
245-
<desc compset="_ELM50" >clm5.0 physics:</desc>
246-
<desc compset="_ELM50%[^_]*SP" >clm5.0 Satellite phenology:</desc>
247-
<desc compset="_ELM50%[^_]*BGC" >clm5.0 bgc (cn and methane):</desc>
230+
<desc compset="_ELM" >ELM with :</desc>
231+
<desc compset="_ELM%SP" >Satellite phenology :</desc>
232+
<desc compset="_ELM%[^_]*SPBC" >Satellite phenology with black carbon deposition :</desc>
233+
<desc compset="_ELM%[^_]*CN" >CN :</desc>
234+
<desc compset="_ELM%[^_]*CNDV" >CN with dynamic vegetation :</desc>
235+
<desc compset="_ELM%[^_]*BGC" >BGC (CN and methane) :</desc>
236+
<desc compset="_ELM%[^_]*CROP" >prognostic crop :</desc>
237+
<desc compset="_ELM%[^_]*VIC" >VIC hydrology :</desc>
238+
<desc compset="_ELM%[^_]*FATES" >FATES (Functionally Assembled Terr. Ecosystem Simulator) (experimental) :</desc>
239+
<desc compset="_ELM%[^_]*BGCDV" >BGC (CN with vertically resolved soil BGC, based on Century with Methane) with dynamic veg :</desc>
240+
<desc compset="_ELM%[^_]*CRDCTCBC" >C only, nutrient competition via relative demand, ctc soil cascade with black carbon deposition :</desc>
241+
<desc compset="_ELM%[^_]*CNRDCTCBC" >C-N, nutrient competition via relative demand, ctc soil cascade with black carbon deposition :</desc>
242+
<desc compset="_ELM%[^_]*CNPRDCTCBC" >C-N-P, nutrient competition via relative demand, ctc soil cascade with black carbon deposition :</desc>
243+
<desc compset="_ELM%[^_]*CNECACTCBC" >C-N, nutrient competition via equilibrium chemistry approximation, ctc soil cascade with black carbon deposition :</desc>
244+
<desc compset="_ELM%[^_]*CNECACNTBC" >C-N, nutrient competition via equilibrium chemistry approximation, cnt soil cascade black carbon deposition :</desc>
245+
<desc compset="_ELM%[^_]*CNPECACTCBC">C-N-P, nutrient competition via equilibrium chemistry approximation, ctc soil cascade with black carbon deposition :</desc>
246+
<desc compset="_ELM%[^_]*CNPECACNTBC">C-N-P, nutrient competition via equilibrium chemistry approximation, cnt soil cascade with black carbon deposition :</desc>
247+
<desc compset="_ELM%[^_]*CNPRDCTCBCTOP" >C-N-P, nutrient competition via relative demand, ctc soil cascade with black carbon deposition and subgrid solar radiation parameterization :</desc>
248248
</description>
249249

250250
<help>

0 commit comments

Comments
 (0)