Merge branch 'jqyin/machinefiles/fix-eos' (PR #1394)

Fixes the PIO build fail on Eos Switches from cmake/2.8.11.2 to cmake3/3.2.3 Fixes #1338 [BFB]
E3SM-Project · Apr 12, 2017 · 06a73a7 · 06a73a7
2 parents 4390866 + b3d417b
commit 06a73a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cime/cime_config/acme/machines/config_batch.xml b/cime/cime_config/acme/machines/config_batch.xml
@@ -189,7 +189,7 @@
       <directive>-l  nodes={{ num_nodes }}</directive>
     </directives>
     <queues>
-      <queue jobmin="1" jobmax="9999" default="true">batch</queue>
+      <queue walltimemax="00:30:00" jobmin="1" jobmax="9999" default="true">batch</queue>
     </queues>
    </batch_system>
 

diff --git a/cime/cime_config/acme/machines/config_machines.xml b/cime/cime_config/acme/machines/config_machines.xml
@@ -1774,7 +1774,7 @@
 	     <command name="load">cray-parallel-netcdf/1.6.1</command>
 	   </modules>
 	   <modules>
-	     <command name="load">cmake/2.8.11.2</command>
+	     <command name="load">cmake3/3.2.3</command>
 	     <command name="load">python/2.7.9</command>
 	   </modules>
 	   <environment_variables>