From 365b08899389cdda8cbe0ec64d4964169569a190 Mon Sep 17 00:00:00 2001
From: noel <ndkeen@lbl.gov>
Date: Thu, 20 Apr 2017 22:29:06 -0700
Subject: [PATCH 1/2] Adjust the loading/removing of modules to allow building
 on cori-knl with GNU compiler.  Not yet sure why we need to do things in a
 certain order.

Also updated GNU compiler version to current default of 6.3
---
 config/acme/machines/config_machines.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
index f1c1279cb6d5..55428f74c140 100644
--- 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>

From 13133dee509bcb4550063d6e898af45562ceb5aa Mon Sep 17 00:00:00 2001
From: noel <ndkeen@lbl.gov>
Date: Mon, 24 Apr 2017 14:19:11 -0700
Subject: [PATCH 2/2] For cori-knl, add another node (from 64 MPI's to 128) for
 the a%360x720cru layout. This helped this test pass for GNU.

---
 config/acme/allactive/config_pesall.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index 13ca84f06399..a10073ef7f01 100644
--- 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>