Skip to content

Commit

Permalink
Simplify options and remove CN options fixes ESCOMP#1168 and this par…
Browse files Browse the repository at this point in the history 
…t of ESCOMP#1356
  • Loading branch information
@ekluzek
ekluzek committed Jun 9, 2021
1 parent 7f3ee0e commit 95d46bd
Showing 1 changed file with 10 additions and 27 deletions.
37 changes: 10 additions & 27 deletions cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@

<!-- Descriptions of all the different valid configurations for different model versions -->
<description modifier_mode="1">
<desc lnd="CLM45[%SP][%SP-VIC][%CN][%CNDV][%CN-CROP][%CNDV-CROP][%BGC][%BGC-CROP][%FATES][%BGCDV][%BGCDV-CROP]" >clm4.5:</desc>
<desc lnd="CLM50[%SP][%SP-VIC][%SP-NOANTHRO][%BGC-NOANTHRO][%CN][%BGC][%BGC-CROP][%FATES][%BGCDV][%BGCDV-CROP][%BGC-CROP-CMIP6DECK][%BGC-CROP-CMIP6WACCMDECK][%NWP-SP][%NWP-BGC-CROP]">clm5.0:</desc>
<desc lnd="CLM45[%SP][%SP-VIC][%BGC][%BGC-CROP][%FATES][%BGCDV][%BGCDV-CROP]" >clm4.5:</desc>
<desc lnd="CLM50[%SP][%SP-VIC][%SP-NOANTHRO][%BGC-NOANTHRO][%BGC][%BGC-CROP][%FATES][%BGCDV][%BGCDV-CROP][%BGC-CROP-CMIP6DECK][%BGC-CROP-CMIP6WACCMDECK][%NWP-SP][%NWP-BGC-CROP]">clm5.0:</desc>
<desc lnd="CLM51[%SP][%SP-NOANTHRO][%BGC-NOANTHRO][%BGC][%BGC-CROP][%FATES][%NWP-SP][%NWP-BGC-CROP]">clm5.1:</desc>
<desc option="SP" >Satellite phenology:</desc>
<desc option="CN" >CN: Carbon Nitrogen model</desc>
<desc option="CNDV" >CNDV: CN with Dynamic Vegetation (deprecated)</desc>
<desc option="CN-CROP" >CN with prognostic crop:</desc>
<desc option="CNDV-CROP" >CNDV with prognostic crop: (deprecated)</desc>

<desc option="SP-VIC" >Satellite phenology with VIC hydrology:</desc>
<desc option="SP-NOANTHRO" >Satellite phenology without anthropomorphic influences</desc>
Expand Down Expand Up @@ -168,34 +164,21 @@
<type>char</type>
<default_value></default_value>
<values>
<value compset="_CLM45%[^_]*SP" >-bgc sp</value>
<value compset="_CLM45%[^_]*CN" >-bgc cn</value>
<value compset="_CLM45%[^_]*BGC" >-bgc bgc</value>
<value compset="_CLM45%[^_]*CN-CROP" >-bgc cn -crop</value>
<value compset="_CLM45%[^_]*BGC-CROP" >-bgc bgc -crop</value>
<value compset="_CLM45%[^_]*CNDV" >-bgc cn -dynamic_vegetation</value>
<!--- All versions -->
<value compset="_CLM[^_]*%SP" >-bgc sp</value>
<value compset="_CLM[^_]*BGC" >-bgc bgc</value>
<value compset="_CLM[^_]*BGC-CROP" >-bgc bgc -crop</value>
<value compset="_CLM[^_]*FATES" >-bgc fates -no-megan</value>

<!-- Options specific for CLM4.5 -->
<value compset="_CLM45%[^_]*BGCDV" >-bgc bgc -dynamic_vegetation</value>
<value compset="_CLM45%[^_]*CNDV-CROP" >-bgc cn -dynamic_vegetation -crop</value>
<value compset="_CLM45%[^_]*BGCDV-CROP" >-bgc bgc -dynamic_vegetation -crop</value>
<value compset="_CLM45%[^_]*SP-VIC" >-bgc sp -vichydro </value>
<value compset="_CLM45%[^_]*FATES" >-bgc fates -no-megan</value>

<value compset="_CLM50%[^_]*SP" >-bgc sp</value>
<value compset="_CLM50%[^_]*BGC" >-bgc bgc</value>
<!-- Options specific for CLM5.0 -->
<value compset="_CLM50%[^_]*BGCDV" >-bgc bgc -dynamic_vegetation</value>
<value compset="_CLM50%[^_]*BGC-CROP" >-bgc bgc -crop</value>
<value compset="_CLM50%[^_]*CN" >-bgc cn</value>
<value compset="_CLM50%[^_]*CN-CROP" >-bgc cn -crop</value>
<value compset="_CLM50%[^_]*CNDV" >-bgc cn -dynamic_vegetation</value>
<value compset="_CLM50%[^_]*CNDV-CROP" >-bgc cn -dynamic_vegetation -crop</value>
<value compset="_CLM50%[^_]*BGCDV-CROP" >-bgc bgc -dynamic_vegetation -crop</value>
<value compset="_CLM50%[^_]*SP-VIC" >-bgc sp -vichydro </value>
<value compset="_CLM50%[^_]*FATES" >-bgc fates -no-megan</value>

<value compset="_CLM51%[^_]*SP" >-bgc sp</value>
<value compset="_CLM51%[^_]*BGC" >-bgc bgc</value>
<value compset="_CLM51%[^_]*BGC-CROP" >-bgc bgc -crop</value>
<value compset="_CLM51%[^_]*FATES" >-bgc fates -no-megan</value>
</values>
<group>run_component_ctsm</group>
<file>env_run.xml</file>
Expand Down

0 comments on commit 95d46bd

Please sign in to comment.