Use system installed esmf libs on cheyenne

modified: config/cesm/machines/config_compilers.xml modified: config/cesm/machines/config_machines.xml
ESMCI · Apr 27, 2017 · 5c47982 · 5c47982
1 parent 5472351
commit 5c47982
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git 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
@@ -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>