fixes

ESMCI · Aug 15, 2017 · f993df0 · f993df0
1 parent 787e7b0
commit f993df0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/config/xml_schemas/env_mach_pes.xsd b/config/xml_schemas/env_mach_pes.xsd
@@ -2,7 +2,7 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <!-- attributes -->
   <xs:attribute name="id" type="xs:NCName"/>
-  <xs:attribute name="value" type="xs:integer"/>
+  <xs:attribute name="value" type="xs:string"/>
   <xs:attribute name="version" type="xs:decimal"/>
 
   <!-- simple elements -->

diff --git a/scripts/lib/CIME/XML/env_mach_pes.py b/scripts/lib/CIME/XML/env_mach_pes.py
@@ -81,7 +81,7 @@ def get_total_nodes(self, total_tasks, max_thread_count):
 
     def get_spare_nodes(self, num_nodes):
         force_spare_nodes = self.get_value("FORCE_SPARE_NODES")
-        if force_spare_nodes is not None:
+        if force_spare_nodes != -999:
             return force_spare_nodes
 
         if self.get_value("ALLOCATE_SPARE_NODES"):

diff --git a/src/drivers/mct/cime_config/config_component.xml b/src/drivers/mct/cime_config/config_component.xml
@@ -1889,6 +1889,7 @@
 
   <entry id="FORCE_SPARE_NODES">
     <type>integer</type>
+    <default_value>-999</default_value>
     <group>mach_pes</group>
     <file>env_mach_pes.xml</file>
     <desc>Force this exact number of spare nodes to be allocated</desc>