Skip to content

Commit

Permalink
addition of valid <default_value> elements to src/drivers/mct/cime_co…
Browse files Browse the repository at this point in the history
…nfig/config_component.xml to ensure that component.get_value returns a value rather than raising an exception. Uniquely define SUPPORTED_BY entry id into MACHINE_SUPPORTED_BY and SOFTWARE_SUPPORTED_BY to correct error in XML parsing.
  • Loading branch information
bertinia committed Aug 10, 2018
1 parent 0037cc0 commit 60b641c
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions driver-mct/cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<desc>Model grid - DO NOT EDIT (for experts only)</desc>
</entry>

<entry id="SUPPORTED_BY">
<entry id="MACHINE_SUPPORTED_BY">
<type>char</type>
<default_value>UNSET</default_value>
<group>case_def</group>
Expand Down Expand Up @@ -384,6 +384,7 @@
<entry id="PAUSE_ACTIVE">
<type>logical</type>
<valid_values>TRUE,FALSE</valid_values>
<default_value>FALSE</default_value>
<group>run_begin_stop_restart</group>
<file>env_run.xml</file>
<desc>
Expand Down Expand Up @@ -626,7 +627,7 @@
Must be explicitly set in env_build.xml for userdefined machine.</desc>
</entry>

<entry id="SUPPORTED_BY">
<entry id="SOFTWARE_SUPPORTED_BY">
<type>char</type>
<valid_values></valid_values>
<default_value></default_value>
Expand Down Expand Up @@ -1910,6 +1911,7 @@

<entry id="NTASKS">
<type>integer</type>
<default_value>1</default_value>
<values>
<value compclass="ATM"> $MAX_MPITASKS_PER_NODE</value>
<value compclass="CPL"> $MAX_MPITASKS_PER_NODE</value>
Expand All @@ -1928,6 +1930,7 @@

<entry id="NTASKS_PER_INST">
<type>integer</type>
<default_value>0</default_value>
<values>
<value compclass="ATM"> 0</value>
<value compclass="OCN"> 0</value>
Expand All @@ -1945,6 +1948,7 @@

<entry id="NTHRDS">
<type>integer</type>
<default_value>1</default_value>
<values>
<value compclass="ATM">1</value>
<value compclass="CPL">1</value>
Expand All @@ -1963,6 +1967,7 @@

<entry id="ROOTPE">
<type>integer</type>
<default_value>0</default_value>
<values>
<value compclass="ATM">0</value>
<value compclass="CPL">0</value>
Expand Down Expand Up @@ -1993,6 +1998,7 @@

<entry id="NINST">
<type>integer</type>
<default_value>1</default_value>
<values>
<value compclass="ATM">1</value>
<value compclass="OCN">1</value>
Expand Down Expand Up @@ -2030,6 +2036,7 @@

<entry id="PSTRID">
<type>integer</type>
<default_value>1</default_value>
<values>
<value compclass="ATM">1</value>
<value compclass="CPL">1</value>
Expand Down Expand Up @@ -2256,6 +2263,7 @@
stride in compute comm of io tasks for each component, if this value is -99 it will
be computed based on PIO_NUMTASKS and number of compute tasks
</desc>
<default_value>-99</default_value>
<values>
<value compclass="ATM"></value>
<value compclass="CPL"></value>
Expand All @@ -2271,6 +2279,7 @@

<entry id="PIO_REARRANGER">
<type>integer</type>
<default_value>1</default_value>
<valid_values>1,2</valid_values>
<group>run_pio</group>
<file>env_run.xml</file>
Expand All @@ -2291,6 +2300,7 @@

<entry id="PIO_ROOT">
<type>integer</type>
<default_value>1</default_value>
<group>run_pio</group>
<file>env_run.xml</file>
<desc>pio root processor relative to component root</desc>
Expand All @@ -2309,6 +2319,7 @@

<entry id="PIO_NUMTASKS">
<type>integer</type>
<default_value>-99</default_value>
<group>run_pio</group>
<file>env_run.xml</file>
<desc>
Expand Down Expand Up @@ -2579,6 +2590,7 @@

<entry id="DATA_ASSIMILATION">
<type>logical</type>
<default_value>FALSE</default_value>
<valid_values>TRUE,FALSE</valid_values>
<group>external_tools</group>
<file>env_run.xml</file>
Expand Down

0 comments on commit 60b641c

Please sign in to comment.