more cleanup in response to review

E3SM-Project · Aug 13, 2018 · 068a4ea · 068a4ea
1 parent 60b641c
commit 068a4ea
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/driver-mct/cime_config/config_component.xml b/driver-mct/cime_config/config_component.xml
@@ -136,7 +136,7 @@
     <desc>Model grid - DO NOT EDIT (for experts only)</desc>
   </entry>
 
-  <entry id="MACHINE_SUPPORTED_BY">
+  <entry id="SUPPORTED_BY">
     <type>char</type>
     <default_value>UNSET</default_value>
     <group>case_def</group>
@@ -627,15 +627,6 @@
     Must be explicitly set in env_build.xml for userdefined machine.</desc>
   </entry>
 
-  <entry id="SOFTWARE_SUPPORTED_BY">
-    <type>char</type>
-    <valid_values></valid_values>
-    <default_value></default_value>
-    <group>build_def</group>
-    <file>env_build.xml</file>
-    <desc>email address of person (or group) that supports the build and port for this machine (do not edit)></desc>
-  </entry>
-
   <entry id="MPILIB">
     <type>char</type>
     <valid_values></valid_values>
@@ -1911,8 +1902,8 @@
 
   <entry id="NTASKS">
     <type>integer</type>
-    <default_value>1</default_value>
     <values>
+      <value>1</value>
       <value compclass="ATM"> $MAX_MPITASKS_PER_NODE</value>
       <value compclass="CPL"> $MAX_MPITASKS_PER_NODE</value>
       <value compclass="OCN"> $MAX_MPITASKS_PER_NODE</value>
@@ -1930,8 +1921,8 @@
 
   <entry id="NTASKS_PER_INST">
     <type>integer</type>
-    <default_value>0</default_value>
     <values>
+      <value>0</value>
       <value compclass="ATM"> 0</value>
       <value compclass="OCN"> 0</value>
       <value compclass="WAV"> 0</value>
@@ -1948,8 +1939,8 @@
 
   <entry id="NTHRDS">
     <type>integer</type>
-    <default_value>1</default_value>
     <values>
+      <value>1</value>
       <value compclass="ATM">1</value>
       <value compclass="CPL">1</value>
       <value compclass="OCN">1</value>
@@ -1967,8 +1958,8 @@
 
   <entry id="ROOTPE">
     <type>integer</type>
-    <default_value>0</default_value>
     <values>
+      <value>0</value>
       <value compclass="ATM">0</value>
       <value compclass="CPL">0</value>
       <value compclass="OCN">0</value>
@@ -2036,8 +2027,8 @@
 
   <entry id="PSTRID">
     <type>integer</type>
-    <default_value>1</default_value>
     <values>
+      <value>1</value>
       <value compclass="ATM">1</value>
       <value compclass="CPL">1</value>
       <value compclass="OCN">1</value>
@@ -2263,8 +2254,8 @@
      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>-99</value>
       <value compclass="ATM"></value>
       <value compclass="CPL"></value>
       <value compclass="OCN"></value>
@@ -2279,7 +2270,6 @@
 
   <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>
@@ -2300,11 +2290,11 @@
 
   <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>
     <values>
+      <value>1</value>
       <value component="ATM">1</value>
       <value component="CPL">1</value>
       <value component="OCN">1</value>
@@ -2319,14 +2309,14 @@
 
   <entry id="PIO_NUMTASKS">
     <type>integer</type>
-    <default_value>-99</default_value>
     <group>run_pio</group>
     <file>env_run.xml</file>
     <desc>
       pio number of io tasks, if this value is -99 it will be computed based on PIO_STRIDE and
       number of tasks
     </desc>
     <values>
+      <value>-99</value>
       <value compclass="ATM">-99</value>
       <value compclass="CPL">-99</value>
       <value compclass="OCN">-99</value>