Merge branch ACME-Climate/ndk/cime/cori-knl-modadjust-for-gnu (PR #1447)

Module adjustments for cori-knl using GNU compiler
E3SM-Project · May 4, 2017 · d842a3c · d842a3c
2 parents 34de300 + 13133de
commit d842a3c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
@@ -1997,7 +1997,7 @@
     </mach>
   </grid>
   <grid name="a%360x720cru">
-    <mach name="redsky">
+    <mach name="redsky|cori-knl">
       <pes compset="any" pesize="any">
         <comment>none</comment>
         <ntasks>

diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
@@ -361,8 +361,8 @@
       <cmd_path lang="csh">module</cmd_path>
       <modules>
 	<!--command name="rm">PrgEnv-intel</command-->
-	<command name="rm">PrgEnv-cray</command>
-	<command name="rm">PrgEnv-gnu</command>
+	<!--command name="rm">PrgEnv-cray</command-->
+	<!--command name="rm">PrgEnv-gnu</command-->
 	<command name="rm">intel</command>
 	<command name="rm">cce</command>
         <command name="rm">gcc</command>
@@ -394,15 +394,19 @@
       </modules>
 
       <modules compiler="cray">
+	<command name="rm">PrgEnv-intel</command>
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.0</command>
+	<command name="rm">cce</command>
+	<command name="load">cce/8.5.4</command>
       </modules>
       <modules compiler="gnu">
+	<command name="rm">PrgEnv-intel</command>
 	<command name="load">PrgEnv-gnu</command>
-	<command name="switch">gcc gcc/6.2.0</command>
+	<command name="rm">gcc</command>
+	<command name="load">gcc/6.3.0</command>
       </modules>
       <modules compiler="!intel">
-	<command name="switch">cray-libsci/16.09.1</command>
+	<command name="load">cray-libsci/16.09.1</command>
       </modules>
 
       <modules>