Merge branch ACME-Climate/aarondonahue/cime/LC_20171024 (PR #1865)

Machine file change for Livermore Computing compatibility with new CIME [BFB]
ESMCI · Oct 25, 2017 · 7b49896 · 7b49896
2 parents 9aafd17 + eaba981
commit 7b49896
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
@@ -1353,10 +1353,10 @@
            <executable>srun</executable>
          </mpirun>
 	 <module_system type="generic">
-	   <cmd_path lang="sh">use</cmd_path>
-	   <cmd_path lang="csh">use</cmd_path>
            <init_path lang="csh">/usr/global/tools/dotkit/init.csh</init_path>
            <init_path lang="sh">/usr/global/tools/dotkit/init.sh</init_path>
+	   <cmd_path lang="sh">use</cmd_path>
+	   <cmd_path lang="csh">use</cmd_path>
 	   <modules compiler="pgi">
 	     <command name="-q">pgi-14.3</command>
 	     <command name="-q">mvapich2-pgi-1.7</command>
@@ -1409,10 +1409,10 @@
            <executable>srun</executable>
          </mpirun>
 	 <module_system type="generic">
-	   <cmd_path lang="sh">use</cmd_path>
-	   <cmd_path lang="csh">use</cmd_path>
            <init_path lang="csh">/usr/global/tools/dotkit/init.csh</init_path>
            <init_path lang="sh">/usr/global/tools/dotkit/init.sh</init_path>
+	   <cmd_path lang="sh">use</cmd_path>
+	   <cmd_path lang="csh">use</cmd_path>
 	   <modules compiler="pgi">
 	     <command name="-q">pgi-14.3</command>
 	     <command name="-q">mvapich2-pgi-1.7</command>