From ae2824904ed59436c3ea2b0dc130c8d237cb0bb4 Mon Sep 17 00:00:00 2001
From: bertinia <aliceb@ucar.edu>
Date: Fri, 10 Aug 2018 17:57:59 -0600
Subject: [PATCH 1/3] addition of valid <default_value> elements to
 src/drivers/mct/cime_config/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.

---
 cime_config/config_component.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 3bd2a9c7ca03..46a963bfb4d6 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

From c4e9c3576b83ef2866368924dee6438844a38659 Mon Sep 17 00:00:00 2001
From: bertinia <aliceb@ucar.edu>
Date: Mon, 13 Aug 2018 16:23:32 -0600
Subject: [PATCH 2/3] more cleanup in response to review

---
 cime_config/config_component.xml | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 46a963bfb4d6..e3ba8f1b2bf2 100644
--- a/cime_config/config_component.xml
+++ b/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,7 +2309,6 @@
 
   <entry id="PIO_NUMTASKS">
     <type>integer</type>
-    <default_value>-99</default_value>
     <group>run_pio</group>
     <file>env_run.xml</file>
     <desc>
@@ -2327,6 +2316,7 @@
       number of tasks
     </desc>
     <values>
+      <value>-99</value>
       <value compclass="ATM">-99</value>
       <value compclass="CPL">-99</value>
       <value compclass="OCN">-99</value>

From 23274b55a7510dbfa4d5d8ddbae3cedc4f5bcc9e Mon Sep 17 00:00:00 2001
From: bertinia <aliceb@ucar.edu>
Date: Tue, 14 Aug 2018 09:41:03 -0600
Subject: [PATCH 3/3] revert drivers/mct/cime_config/config_component.xml to
 previous version with the exception of removing the extra SUPPORTED_BY
 element

---
 cime_config/config_component.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index e3ba8f1b2bf2..4a38793d4a99 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -384,7 +384,6 @@
   <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>
@@ -1903,7 +1902,6 @@
   <entry id="NTASKS">
     <type>integer</type>
     <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>
@@ -1922,7 +1920,6 @@
   <entry id="NTASKS_PER_INST">
     <type>integer</type>
     <values>
-      <value>0</value>
       <value compclass="ATM"> 0</value>
       <value compclass="OCN"> 0</value>
       <value compclass="WAV"> 0</value>
@@ -1940,7 +1937,6 @@
   <entry id="NTHRDS">
     <type>integer</type>
     <values>
-      <value>1</value>
       <value compclass="ATM">1</value>
       <value compclass="CPL">1</value>
       <value compclass="OCN">1</value>
@@ -1959,7 +1955,6 @@
   <entry id="ROOTPE">
     <type>integer</type>
     <values>
-      <value>0</value>
       <value compclass="ATM">0</value>
       <value compclass="CPL">0</value>
       <value compclass="OCN">0</value>
@@ -1989,7 +1984,6 @@
 
   <entry id="NINST">
     <type>integer</type>
-    <default_value>1</default_value>
     <values>
       <value compclass="ATM">1</value>
       <value compclass="OCN">1</value>
@@ -2028,7 +2022,6 @@
   <entry id="PSTRID">
     <type>integer</type>
     <values>
-      <value>1</value>
       <value compclass="ATM">1</value>
       <value compclass="CPL">1</value>
       <value compclass="OCN">1</value>
@@ -2255,7 +2248,6 @@
      be computed based on PIO_NUMTASKS and number of compute tasks
     </desc>
     <values>
-      <value>-99</value>
       <value compclass="ATM"></value>
       <value compclass="CPL"></value>
       <value compclass="OCN"></value>
@@ -2294,7 +2286,6 @@
     <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>
@@ -2316,7 +2307,6 @@
       number of tasks
     </desc>
     <values>
-      <value>-99</value>
       <value compclass="ATM">-99</value>
       <value compclass="CPL">-99</value>
       <value compclass="OCN">-99</value>
@@ -2580,7 +2570,6 @@
 
   <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>