From d671d25d8bddf4f5a80b0b1028cd5474ac325504 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Tue, 2 May 2017 14:10:46 -0600
Subject: [PATCH] add error for machines that do not support mpi-serial

---
 config/acme/machines/config_machines.xml  | 6 ++++++
 config/cesm/machines/config_machines.xml  | 3 +++
 scripts/lib/CIME/XML/env_mach_specific.py | 4 +++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
index 2e60046a832..4ef4d63edb7 100644
--- a/config/acme/machines/config_machines.xml
+++ b/config/acme/machines/config_machines.xml
@@ -1041,6 +1041,9 @@
                <arg name="thread_count"> --envs OMP_NUM_THREADS=$OMP_NUM_THREADS</arg>
              </arguments>
          </mpirun>
+    <mpirun mpilib="mpi-serial">
+      <executable>unsupported</executable>
+    </mpirun>
     <module_system type="soft">
       <init_path lang="csh">/etc/profile.d/00softenv.csh</init_path>
       <cmd_path lang="csh">soft</cmd_path>
@@ -1137,6 +1140,9 @@
                <arg name="thread_count"> --envs OMP_NUM_THREADS=$OMP_NUM_THREADS</arg>
              </arguments>
          </mpirun>
+    <mpirun mpilib="mpi-serial">
+      <executable>unsupported</executable>
+    </mpirun>
     <module_system type="soft">
       <init_path lang="csh">/etc/profile.d/00softenv.csh</init_path>
       <cmd_path lang="csh">soft</cmd_path>
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 16ab72f87cb..904dee58af9 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -1178,6 +1178,9 @@
 	<arg name="thread_count"> --envs OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS}</arg>
       </arguments>
     </mpirun>
+    <mpirun mpilib="mpi-serial">
+      <executable>unsupported</executable>
+    </mpirun>
     <module_system type="soft">
       <init_path lang="csh">/etc/profile.d/00softenv.csh</init_path>
       <init_path lang="sh">/etc/profile.d/00softenv.sh</init_path>
diff --git a/scripts/lib/CIME/XML/env_mach_specific.py b/scripts/lib/CIME/XML/env_mach_specific.py
index a81e20b91f2..8cd3d780098 100644
--- a/scripts/lib/CIME/XML/env_mach_specific.py
+++ b/scripts/lib/CIME/XML/env_mach_specific.py
@@ -397,5 +397,7 @@ def get_mpirun(self, case, attribs, check_members=None, job="case.run", exe_only
         exec_node = self.get_node("executable", root=the_match)
         expect(exec_node is not None,"No executable found")
         executable = exec_node.text
-
+        expect("unsupported" not in executable, "%s is not supported for this machine"%attribs["mpilib"])
+        
+        
         return executable, args