From 5472351309915ae710092943b49a5cfeca34b169 Mon Sep 17 00:00:00 2001
From: Francis Vitt <fvitt@ucar.edu>
Date: Fri, 21 Apr 2017 16:39:55 -0600
Subject: [PATCH 1/2] Use ESMF7 on yellowstone and cheyenne

        modified:   config/cesm/machines/config_compilers.xml
        modified:   config/cesm/machines/config_machines.xml
---
 config/cesm/machines/config_compilers.xml |  2 ++
 config/cesm/machines/config_machines.xml  | 25 +++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/config/cesm/machines/config_compilers.xml b/config/cesm/machines/config_compilers.xml
index 3a5a0d0471b..02d5eda3227 100644
--- a/config/cesm/machines/config_compilers.xml
+++ b/config/cesm/machines/config_compilers.xml
@@ -995,6 +995,8 @@ using a fortran linker.
   <PFUNIT_PATH>$ENV{CESMDATAROOT}/tools/pFUnit/pFUnit3.2.8_cheyenne_Intel17.0.1_MPI_openMP</PFUNIT_PATH>
   <!-- Bug in the intel/17.0.1 compiler requires this, remove this line when compiler is updated -->
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <ESMF_LIBDIR DEBUG="FALSE">/glade/u/home/fvitt/esmf_7_0_0_intel17/esmf/lib/libO/Linux.intel.64.mpi.default</ESMF_LIBDIR>
+  <ESMF_LIBDIR DEBUG="TRUE" >/glade/u/home/fvitt/esmf_7_0_0_intel17/esmf/lib/libg/Linux.intel.64.mpi.default</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="laramie">
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 6b25f04610e..6350eaf8da4 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -251,6 +251,23 @@
 	<command name="load">intel/17.0.1</command>
 	<command name="load">mkl</command>
       </modules>
+<!-- esmf_libs does not seem to be compatible with intel/17.0.1 on cheyenne
+      <modules compiler="intel">
+	<command name="load">esmf_libs</command>
+      </modules>
+      <modules compiler="intel" mpilib="!mpi-serial" debug="true">
+	<command name="load">esmf-7.0.0-defio-mpi-g</command>
+      </modules>
+      <modules compiler="intel" mpilib="!mpi-serial" debug="false">
+	<command name="load">esmf-7.0.0-defio-mpi-O</command>
+      </modules>
+      <modules compiler="intel" mpilib="mpi-serial" debug="true">
+	<command name="load">esmf-7.0.0-ncdfio-uni-g</command>
+      </modules>
+      <modules compiler="intel" mpilib="mpi-serial" debug="false">
+	<command name="load">esmf-7.0.0-ncdfio-uni-O</command>
+      </modules>
+ -->
       <modules compiler="gnu">
 	<command name="load">gnu/6.3.0</command>
       </modules>
@@ -1694,16 +1711,16 @@
 	<command name="load">esmf</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" debug="true">
-	<command name="load">esmf-6.3.0rp1-defio-mpi-g</command>
+	<command name="load">esmf-7.0.0-ncdfio-mpi-g</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" debug="false">
-	<command name="load">esmf-6.3.0rp1-defio-mpi-O</command>
+	<command name="load">esmf-7.0.0-defio-mpi-O</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" debug="true">
-	<command name="load">esmf-6.3.0rp1-ncdfio-uni-g</command>
+	<command name="load">esmf-7.0.0-ncdfio-uni-g</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" debug="false">
-	<command name="load"> esmf-6.3.0rp1-ncdfio-uni-O</command>
+	<command name="load">esmf-7.0.0-ncdfio-uni-O</command>
       </modules>
       <modules compiler="pgi">
 	<command name="load">pgi/15.10</command>

From 5c479821ac7db9b302ecfb8fa17dd2351c4bf19d Mon Sep 17 00:00:00 2001
From: Francis Vitt <fvitt@ucar.edu>
Date: Thu, 27 Apr 2017 13:10:56 -0600
Subject: [PATCH 2/2] Use system installed esmf libs on cheyenne

        modified:   config/cesm/machines/config_compilers.xml
        modified:   config/cesm/machines/config_machines.xml
---
 config/cesm/machines/config_compilers.xml | 2 --
 config/cesm/machines/config_machines.xml  | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/config/cesm/machines/config_compilers.xml b/config/cesm/machines/config_compilers.xml
index 02d5eda3227..3a5a0d0471b 100644
--- a/config/cesm/machines/config_compilers.xml
+++ b/config/cesm/machines/config_compilers.xml
@@ -995,8 +995,6 @@ using a fortran linker.
   <PFUNIT_PATH>$ENV{CESMDATAROOT}/tools/pFUnit/pFUnit3.2.8_cheyenne_Intel17.0.1_MPI_openMP</PFUNIT_PATH>
   <!-- Bug in the intel/17.0.1 compiler requires this, remove this line when compiler is updated -->
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <ESMF_LIBDIR DEBUG="FALSE">/glade/u/home/fvitt/esmf_7_0_0_intel17/esmf/lib/libO/Linux.intel.64.mpi.default</ESMF_LIBDIR>
-  <ESMF_LIBDIR DEBUG="TRUE" >/glade/u/home/fvitt/esmf_7_0_0_intel17/esmf/lib/libg/Linux.intel.64.mpi.default</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="laramie">
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 6350eaf8da4..d8992f13717 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -250,9 +250,6 @@
       <modules compiler="intel">
 	<command name="load">intel/17.0.1</command>
 	<command name="load">mkl</command>
-      </modules>
-<!-- esmf_libs does not seem to be compatible with intel/17.0.1 on cheyenne
-      <modules compiler="intel">
 	<command name="load">esmf_libs</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" debug="true">
@@ -267,7 +264,6 @@
       <modules compiler="intel" mpilib="mpi-serial" debug="false">
 	<command name="load">esmf-7.0.0-ncdfio-uni-O</command>
       </modules>
- -->
       <modules compiler="gnu">
 	<command name="load">gnu/6.3.0</command>
       </modules>