Merge pull request #315 from Katetc/master

Changes required to support the new Hobart configuration
CESM-Development · Aug 1, 2016 · c5555c7 · c5555c7
2 parents c269ab9 + 734e4b4
commit c5555c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/cime_config/cesm/machines/config_compilers.xml b/cime_config/cesm/machines/config_compilers.xml
@@ -843,7 +843,6 @@ for mct, etc.
 </compiler>
 
 <compiler MACH="hobart">
- <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
  <MPI_LIB_NAME MPILIB="mvapich2"> mpich</MPI_LIB_NAME>
  <LAPACK_LIBDIR> /usr/lib64 </LAPACK_LIBDIR>
  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
@@ -857,6 +856,9 @@ for mct, etc.
  <ADD_LDFLAGS> -Wl,-rpath,$(COMPILER_PATH)/mkl/lib/intel64 </ADD_LDFLAGS>
  <ADD_LDFLAGS> -Wl,-rpath,$(MPI_PATH)/lib</ADD_LDFLAGS>
  <ADD_SLIBS MPILIB="mvapich2"> -mkl=cluster </ADD_SLIBS>
+ <ADD_LDFLAGS> -lifcore</ADD_LDFLAGS>
+ <ADD_CFLAGS> -lifcore</ADD_CFLAGS>
+ <ADD_FFLAGS> -lifcore</ADD_FFLAGS>
  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_Intel_3_0</PFUNIT_PATH>
   <ADD_FFLAGS MPILIB="mpi-serial"> -mcmodel medium </ADD_FFLAGS>
 </compiler>

diff --git a/cime_config/cesm/machines/config_machines.xml b/cime_config/cesm/machines/config_machines.xml
@@ -577,10 +577,7 @@
     <DESC>"NCAR CGD Linux Cluster 48 pes/node, batch system is PBS"</DESC>
     <NODENAME_REGEX>hobart</NODENAME_REGEX>
     <COMPILERS>intel,pgi,nag,gnu</COMPILERS>
-    <MPILIBS compiler="nag">openmpi</MPILIBS>
-    <MPILIBS compiler="intel">mvapich2</MPILIBS>
-    <MPILIBS compiler="pgi">mvapich2</MPILIBS>
-    <MPILIBS compiler="gnu">mvapich2</MPILIBS>
+    <MPILIBS>mvapich2</MPILIBS>
     <RUNDIR>/scratch/cluster/$USER/$CASE/run</RUNDIR>
     <EXEROOT>/scratch/cluster/$USER/$CASE/bld</EXEROOT>
     <CESMSCRATCHROOT>/scratch/cluster/$USER</CESMSCRATCHROOT>
@@ -621,22 +618,22 @@
 	<command name="load">compiler/intel/15.0.2.164</command>
       </modules>
       <modules compiler="intel" mpilib="mvapich2">
-	<command name="load">  tool/parallel-netcdf/1.6.1/intel/mvapich2  </command>
+	<command name="load">  tool/parallel-netcdf/1.7.0/intel/mvapich2  </command>
       </modules>
       <modules compiler="pgi">
 	<command name="load">compiler/pgi/15.1</command>
       </modules>
       <modules  compiler="pgi" mpilib="mvapich2">
-	  <command name="load">  tool/parallel-netcdf/1.6.1/pgi/mvapich2  </command>
+	  <command name="load">  tool/parallel-netcdf/1.7.0/pgi/mvapich2  </command>
       </modules>
       <modules compiler="nag">
-	<command name="load">compiler/nag/6.0</command>
+	<command name="load">compiler/nag/6.1</command>
       </modules>
-      <modules compiler="nag" mpilib="openmpi">
-	  <command name="load">  tool/parallel-netcdf/1.6.1/nag/openmpi </command>
+      <modules compiler="nag" mpilib="mvapich2">
+	  <command name="load">  tool/parallel-netcdf/1.7.0/nag/mvapich2 </command>
       </modules>
       <modules compiler="gnu">
-	<command name="load">compiler/gnu/4.8.3</command>
+	<command name="load">compiler/gnu/4.8.5</command>
       </modules>
     </module_system>
     <environment_variables>