From a4329e64c076a65703108122f94ea8cf99128e8d Mon Sep 17 00:00:00 2001
From: Gautam Bisht <gbisht@lbl.gov>
Date: Mon, 8 Jan 2018 15:28:49 -0800
Subject: [PATCH] Update LBL Lawrencium machine file

Updates libraries for LBL Lawrencium cluster

[BFB]
---
 cime/config/acme/machines/config_compilers.xml |  2 ++
 cime/config/acme/machines/config_machines.xml  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cime/config/acme/machines/config_compilers.xml b/cime/config/acme/machines/config_compilers.xml
index bd10f39c035e..1a024811ea7a 100644
--- a/cime/config/acme/machines/config_compilers.xml
+++ b/cime/config/acme/machines/config_compilers.xml
@@ -1336,12 +1336,14 @@ for mct, etc.
         <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
 	<ADD_SLIBS> -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
 	<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
+        <LAPACK_LIBDIR>/global/software/sl-6.x86_64/modules/intel/2016.1.150/lapack/3.6.0-intel/lib</LAPACK_LIBDIR>
 </compiler>
 
 <compiler COMPILER="intel" MACH="lawrencium-lr3">
         <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
 	<ADD_SLIBS> -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
 	<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
+        <LAPACK_LIBDIR>/global/software/sl-6.x86_64/modules/intel/2016.1.150/lapack/3.6.0-intel/lib</LAPACK_LIBDIR>
 </compiler>
 
 
diff --git a/cime/config/acme/machines/config_machines.xml b/cime/config/acme/machines/config_machines.xml
index c4db3bbbef26..1ce85565f630 100644
--- a/cime/config/acme/machines/config_machines.xml
+++ b/cime/config/acme/machines/config_machines.xml
@@ -2443,18 +2443,18 @@
     <modules>
       <command name="purge"/>
       <command name="load">cmake</command>
-      <command name="load">perl xml-libxml switch python/2.7.11</command>
+      <command name="load">perl xml-libxml switch python/2.7</command>
     </modules>
     <modules compiler="intel">
-      <command name="load">intel/2015.6.233</command>
+      <command name="load">intel/2016.4.072</command>
       <command name="load">mkl</command>
     </modules>
     <modules compiler="intel" mpilib="mpi-serial">
-      <command name="load">netcdf/4.4.0-intel-s</command>
+      <command name="load">netcdf/4.4.1.1-intel-s</command>
     </modules>
     <modules compiler="intel" mpilib="!mpi-serial">
       <command name="load">openmpi</command>
-      <command name="load">netcdf/4.4.0-intel-p</command>
+      <command name="load">netcdf/4.4.1.1-intel-p</command>
     </modules>
      </module_system>
 </machine>
@@ -2506,18 +2506,18 @@
     <modules>
       <command name="purge"/>
       <command name="load">cmake</command>
-      <command name="load">perl xml-libxml switch python/2.7.11</command>
+      <command name="load">perl xml-libxml switch python/2.7</command>
     </modules>
     <modules compiler="intel">
-      <command name="load">intel/2015.6.233</command>
+      <command name="load">intel/2016.4.072</command>
       <command name="load">mkl</command>
     </modules>
     <modules compiler="intel" mpilib="mpi-serial">
-      <command name="load">netcdf/4.4.0-intel-s</command>
+      <command name="load">netcdf/4.4.1.1-intel-s</command>
     </modules>
     <modules compiler="intel" mpilib="!mpi-serial">
       <command name="load">openmpi</command>
-      <command name="load">netcdf/4.4.0-intel-p</command>
+      <command name="load">netcdf/4.4.1.1-intel-s</command>
     </modules>
      </module_system>
 </machine>