Getting ECP master to build on Summit

ecp_master_patch_summit_and_summitcpu_changes_101419_01.patch

diff --git a/cime/config/e3sm/machines/config_compilers.xml b/cime/config/e3s
m/machines/config_compilers.xml
index 35ff773..257b85f 100644
--- a/cime/config/e3sm/machines/config_compilers.xml
+++ b/cime/config/e3sm/machines/config_compilers.xml
@@ -1793,6 +1793,34 @@ ntel/x86_64/2013/composer_xe_2013/composer_xe_201
3_sp1.3.174/mkl/include </base>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
+<compiler MACH="summit-cpu" COMPILER="ibm">
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX  </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append> -qzerosize -qfree=f90 -qxlf2003=polymorphic</append>
+    <append> -qspillsize=2500 -qextname=flush </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append>-lxlopt -lxl -lxlsmp -L$ENV{NETCDF_C_PATH}/lib -lnetcdf -
L$ENV{NETCDF_FORTRAN_PATH}/lib -lnetcdff -L$ENV{ESSL_PATH}/lib64 -lessl -L$ENV{N
ETLIB_LAPACK_PATH}/lib -llapack</append>
+    <append MPILIB="!mpi-serial"> -L$ENV{PNETCDF_PATH}/lib -lpnetcdf 
-L$ENV{HDF5_PATH}/lib -lhdf5_hl -lhdf5 </append>
+    <append>  -Wl,--relax -Wl,--allow-multiple-definition </append>
+  </LDFLAGS>
+  <MPICC> mpicc </MPICC>
+  <MPICXX> mpiCC </MPICXX>
+  <MPIFC> mpif90 </MPIFC>
+  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
+  <SCC> xlc_r </SCC>
+  <SFC> xlf90_r </SFC>
+  <SCXX> xlc++_r </SCXX>
+  <NETCDF_C_PATH>$ENV{NETCDF_C_PATH}</NETCDF_C_PATH>
+  <NETCDF_FORTRAN_PATH>$ENV{NETCDF_FORTRAN_PATH}</NETCDF_FORTRAN_PATH
>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
+</compiler>
+
 <compiler MACH="summit" COMPILER="pgi">
   <CFLAGS>
     <append DEBUG="FALSE"> -O2 -Mvect=nosimd </append>
diff --git a/cime/config/e3sm/machines/config_machines.xml b/cime/config/e3sm
/machines/config_machines.xml
index 35a22ed..e58e0a3 100644
--- a/cime/config/e3sm/machines/config_machines.xml
+++ b/cime/config/e3sm/machines/config_machines.xml
@@ -2917,7 +2917,7 @@
       <!-- Sometimes,same versions of libraries are not available for different
 compilers, hence the split below -->
       <modules compiler="ibm" mpilib="!mpi-serial">
         <command name="load">spectrum-mpi</command>
-        <command name="load">parallel-netcdf/1.8.0</command>
+        <command name="load">parallel-netcdf/1.8.1</command>
         <command name="load">hdf5/1.10.3</command>
       </modules>
       <modules compiler="pgi.*" mpilib="!mpi-serial">
@@ -2927,7 +2927,7 @@
       </modules>
       <modules compiler="gnu" mpilib="!mpi-serial">
         <command name="load">spectrum-mpi</command>
-        <command name="load">parallel-netcdf/1.8.0</command>
+        <command name="load">parallel-netcdf/1.8.1</command>
         <command name="load">hdf5/1.10.3</command>
       </modules>
     </module_system>
@@ -3017,20 +3017,20 @@
       <command name="load">cuda</command>
     </modules>
     <modules compiler="ibm">
-      <command name="load">xl/16.1.1-1</command>
+      <command name="load">xl/16.1.1-3</command>
     </modules>
     <modules compiler="gnu">
       <command name="load">gcc/6.4.0</command>
     </modules>
 
     <modules>
-      <command name="load">netcdf</command>
-      <command name="load">netcdf-fortran</command>
+      <command name="load">netcdf/4.6.1</command>
+      <command name="load">netcdf-fortran/4.4.4</command>
     </modules>
     <!-- mpi lib settings -->
     <!-- Sometimes,same versions of libraries are not available for different c
ompilers, hence the split below -->
     <modules compiler="ibm" mpilib="!mpi-serial">
-      <command name="load">spectrum-mpi</command>
+      <command name="load">spectrum-mpi/10.3.0.1-20190611</command>
     </modules>
     <modules compiler="pgi.*" mpilib="!mpi-serial">
       <command name="load">spectrum-mpi</command>
@@ -3043,8 +3043,8 @@
     </modules>
 
     <modules>
-      <command name="load">parallel-netcdf</command>
-      <command name="load">hdf5</command>
+      <command name="load">parallel-netcdf/1.8.1</command>
+      <command name="load">hdf5/1.10.3</command>
     </modules>
 
   </module_system>