From 4552326329ca70a8d6a74321f5741c151aaad480 Mon Sep 17 00:00:00 2001
From: Sean Patrick Santos <SeanPatrickSantos@gmail.com>
Date: Thu, 25 Aug 2016 15:36:18 -0600
Subject: [PATCH] Fix issue with mpi-serial on yellowstone.

Because `SCC` and `SFC` have machine-specific settings for MPICH2, they
need machine-specific settings for all MPI libraries.
---
 cime_config/cesm/machines/config_build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cime_config/cesm/machines/config_build.xml b/cime_config/cesm/machines/config_build.xml
index 21f7b80d6290..dd0f2f12ef15 100644
--- a/cime_config/cesm/machines/config_build.xml
+++ b/cime_config/cesm/machines/config_build.xml
@@ -1337,6 +1337,8 @@ for mct, etc.
   <PAPI_LIB MPILIB="mpich2">/glade/apps/opt/papi/5.3.0/intel/12.1.5/lib64 </PAPI_LIB>
   <PFUNIT_PATH><env>CESMDATAROOT</env>/tools/pFUnit/pFUnit3.1_Intel15.0.1_MPI</PFUNIT_PATH>
   <!-- Needed due to the way that netcdf is loaded on yellowstone -->
+  <SCC MPILIB="mpi-serial">icc</SCC>
+  <SFC MPILIB="mpi-serial">ifort</SFC>
   <SCC MPILIB="mpich2"><var>MPICC</var></SCC>
   <SFC MPILIB="mpich2"><var>MPIFC</var></SFC>
   <SLIBS>