From d807ba6b8d6413b96ddaf7e5fac97557f0fc082c Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Fri, 28 Jul 2017 09:54:16 -0600
Subject: [PATCH] backout change for gnu and pgi on yellowstone

---
 config/cesm/machines/config_machines.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 3546fa8b10a..115c8636d84 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -1677,10 +1677,24 @@
       <modules compiler="gnu">
 	<command name="load">gnu/5.2.0</command>
       </modules>
-      <modules mpilib="mpi-serial">
+      <modules mpilib="mpi-serial" compiler="gnu">
+	<command name="load">netcdf/4.3.3.1</command>
+      </modules>
+      <modules mpilib="!mpi-serial" compiler="gnu">
+	<command name="load">netcdf-mpi/4.3.3.1</command>
+	<command name="load">pnetcdf/1.6.1</command>
+      </modules>
+      <modules mpilib="mpi-serial" compiler="pgi">
+	<command name="load">netcdf/4.3.3.1</command>
+      </modules>
+      <modules mpilib="!mpi-serial" compiler="pgi">
+	<command name="load">netcdf-mpi/4.3.3.1</command>
+	<command name="load">pnetcdf/1.6.1</command>
+      </modules>
+      <modules mpilib="mpi-serial" compiler="intel">
 	<command name="load">netcdf/4.4.1</command>
       </modules>
-      <modules mpilib="!mpi-serial">
+      <modules mpilib="!mpi-serial" compiler="intel">
 	<command name="load">netcdf-mpi/4.4.1</command>
 	<command name="load">pnetcdf/1.6.1</command>
       </modules>