Merge branch 'bishtgautam/cime/lbl-lawrencium' (PR @2012)

Updates libraries for LBL Lawrencium cluster [BFB]
E3SM-Project · Jan 25, 2018 · 1521d38 · 1521d38
2 parents 8943fac + a4329e6
commit 1521d38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/cime/config/acme/machines/config_compilers.xml b/cime/config/acme/machines/config_compilers.xml
@@ -1362,12 +1362,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
@@ -2598,18 +2598,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>
@@ -2661,18 +2661,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>