From cb9b02d831097aae7b80795a1f416d99741841e0 Mon Sep 17 00:00:00 2001
From: Balwinder Singh <balwindersingh@gmail.com>
Date: Wed, 17 Apr 2019 10:44:03 -0700
Subject: [PATCH] Removes GNU compiler entries

---
 .../config/e3sm/machines/config_compilers.xml | 20 +----------------
 cime/config/e3sm/machines/config_machines.xml | 22 ++-----------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/cime/config/e3sm/machines/config_compilers.xml b/cime/config/e3sm/machines/config_compilers.xml
index 716de1583165..a3c4dd26c1db 100644
--- a/cime/config/e3sm/machines/config_compilers.xml
+++ b/cime/config/e3sm/machines/config_compilers.xml
@@ -1066,7 +1066,7 @@ for mct, etc.
     <append DEBUG="FALSE"> -O2 </append>
     <append DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv -init=snan</append>
   </FFLAGS>
-  <NETCDF_PATH> $ENV{NETCDF_HOME}</NETCDF_PATH>
+  <NETCDF_PATH>$ENV{NETCDF_HOME}</NETCDF_PATH>
   <PNETCDF_PATH>$ENV{PNETCDF_HOME}</PNETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
   <SLIBS>
@@ -1096,24 +1096,6 @@ for mct, etc.
   </LDFLAGS>
 </compiler>
 
-<compiler MACH="compy" COMPILER="gnu">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH> $ENV{NETCDF_HOME}</NETCDF_PATH>
-  <PNETCDF_PATH>$ENV{PNETCDF_HOME}</PNETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <LDFLAGS>
-    <append> -lpmi -L$NETCDF_PATH/lib -lnetcdf -lnetcdff -L$ENV{MKL_PATH}/lib/intel64/ -lmkl_rt $ENV{PNETCDF_LIBRARIES}</append>
-  </LDFLAGS>
-</compiler>
-
 <compiler MACH="cori-haswell" COMPILER="intel">
   <CONFIG_ARGS>
     <base> --host=Linux </base>
diff --git a/cime/config/e3sm/machines/config_machines.xml b/cime/config/e3sm/machines/config_machines.xml
index 5ded475ec65c..1035d6a0c2d7 100644
--- a/cime/config/e3sm/machines/config_machines.xml
+++ b/cime/config/e3sm/machines/config_machines.xml
@@ -1977,8 +1977,8 @@
     <DESC>PNL E3SM Intel Xeon Gold 6148(Skylake) nodes, OS is Linux, SLURM</DESC>
     <NODENAME_REGEX>compy</NODENAME_REGEX>
     <OS>LINUX</OS>
-    <COMPILERS>intel,pgi,gnu</COMPILERS>
-    <MPILIBS>mvapich2,openmpi</MPILIBS>
+    <COMPILERS>intel,pgi</COMPILERS>
+    <MPILIBS>mvapich2</MPILIBS>
     <CIME_OUTPUT_ROOT>/compyfs/$USER/e3sm_scratch</CIME_OUTPUT_ROOT>
     <DIN_LOC_ROOT>/compyfs/inputdata</DIN_LOC_ROOT>
     <DIN_LOC_ROOT_CLMFORC>/compyfs/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
@@ -2003,18 +2003,6 @@
         <arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
       </arguments>
     </mpirun>
-    <mpirun mpilib="intelmpi">
-      <executable>mpirun</executable>
-      <arguments>
-        <arg name="num_tasks">-n {{ total_tasks }}</arg>
-      </arguments>
-    </mpirun>
-    <mpirun mpilib="openmpi">
-      <executable>mpirun</executable>
-      <arguments>
-        <arg name="num_tasks">-n {{ total_tasks }}</arg>
-      </arguments>
-    </mpirun>
     <module_system type="module">
       <init_path lang="perl">/share/apps/modules/init/perl.pm</init_path>
       <init_path lang="python">/share/apps/modules/init/python.py</init_path>
@@ -2033,15 +2021,9 @@
       <modules compiler="pgi">
         <command name="load">pgi/18.10</command>
       </modules>
-      <modules compiler="gnu">
-        <command name="load">gcc/8.1.0</command>
-      </modules>
       <modules mpilib="mvapich2">
         <command name="load">mvapich2/2.3.1</command>
       </modules>
-      <modules mpilib="openmpi">
-        <command name="load">openmpi/3.1.3</command>
-      </modules>
       <modules>
         <command name="load">netcdf/4.6.3</command>
 	<command name="load">pnetcdf/1.9.0</command>