Merge branch 'jgfouca/update_to_cime_5.3.0.34' into next (PR #1788)

Merge #6 for the PR.
E3SM-Project · Oct 5, 2017 · 8726e88 · 8726e88
2 parents c99f89e + 96d8ec7
commit 8726e88
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml
@@ -2543,16 +2543,16 @@
       <command name="load">trilinos/11.10.2</command>
       <command name="load">esmf</command>
     </modules>
-    <modules compiler="intel" mpilib="!mpi-serial" debug="true">
+    <modules compiler="intel" mpilib="!mpi-serial" DEBUG="TRUE">
       <command name="load">esmf-6.3.0rp1-defio-mpi-g</command>
     </modules>
-    <modules compiler="intel" mpilib="!mpi-serial" debug="false">
+    <modules compiler="intel" mpilib="!mpi-serial" DEBUG="FALSE">
       <command name="load">esmf-6.3.0rp1-defio-mpi-O</command>
     </modules>
-    <modules compiler="intel" mpilib="mpi-serial" debug="true">
+    <modules compiler="intel" mpilib="mpi-serial" DEBUG="TRUE">
       <command name="load">esmf-6.3.0rp1-ncdfio-uni-g</command>
     </modules>
-    <modules compiler="intel" mpilib="mpi-serial" debug="false">
+    <modules compiler="intel" mpilib="mpi-serial" DEBUG="FALSE">
       <command name="load"> esmf-6.3.0rp1-ncdfio-uni-O</command>
     </modules>
     <modules compiler="pgi">
@@ -2583,7 +2583,7 @@
     <env name="MP_STDOUTMODE">unordered</env>
     <env name="MP_RC_USE_LMC">yes</env>
   </environment_variables>
-  <environment_variables debug="true">
+  <environment_variables DEBUG="TRUE">
     <env name="MP_EAGER_LIMIT">0</env>
   </environment_variables>
 </machine>

diff --git a/cime/config/xml_schemas/env_mach_specific.xsd b/cime/config/xml_schemas/env_mach_specific.xsd
@@ -5,7 +5,7 @@
 <xs:attribute name="version" type="xs:decimal"/>
 <xs:attribute name="lang" type="xs:NCName"/>
 <xs:attribute name="compiler" type="xs:string"/>
-<xs:attribute name="debug" type="xs:boolean"/>
+<xs:attribute name="DEBUG" type="upperBoolean"/>
 <xs:attribute name="mpilib" type="xs:string"/>
 <xs:attribute name="SMP_PRESENT" type="xs:string"/>
 <xs:attribute name="value" type="xs:string"/>
@@ -17,6 +17,17 @@
 <xs:element name="type" type="xs:NCName"/>
 <xs:element name="desc" type="xs:string"/>
 
+<!--  simple types -->
+<!-- For historical and user-interface reasons, we have uppercase TRUE and
+            FALSE all over the place. This means we have to define an enumeration
+     instead of using "xs:boolean". -->
+<xs:simpleType name="upperBoolean">
+  <xs:restriction base="xs:token">
+    <xs:enumeration value="TRUE"/>
+    <xs:enumeration value="FALSE"/>
+  </xs:restriction>
+</xs:simpleType>
+
 <!-- complex elements -->
 
   <xs:element name="file">
@@ -63,7 +74,7 @@
         <xs:element maxOccurs="unbounded" ref="command"/>
       </xs:sequence>
       <xs:attribute ref="compiler" />
-      <xs:attribute ref="debug" />
+      <xs:attribute ref="DEBUG" />
       <xs:attribute ref="mpilib"/>
     </xs:complexType>
   </xs:element>
@@ -78,7 +89,7 @@
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="env"/>
       </xs:sequence>
-      <xs:attribute ref="debug"/>
+      <xs:attribute ref="DEBUG"/>
       <xs:attribute ref="mpilib"/>
       <xs:attribute ref="compiler"/>
       <xs:attribute ref="unit_testing"/>
@@ -88,6 +99,10 @@
   <xs:element name="env">
     <xs:complexType mixed="true">
       <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attribute ref="DEBUG"/>
+      <xs:attribute ref="mpilib"/>
+      <xs:attribute ref="compiler"/>
+      <xs:attribute ref="SMP_PRESENT"/>
     </xs:complexType>
   </xs:element>
 
@@ -96,7 +111,7 @@
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="resource"/>
       </xs:sequence>
-      <xs:attribute ref="debug"/>
+      <xs:attribute ref="DEBUG"/>
       <xs:attribute ref="mpilib"/>
       <xs:attribute ref="compiler"/>
       <xs:attribute ref="unit_testing"/>