From c64c505fae825f31fca5224681f80fd3cc0d811a Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Tue, 28 Jul 2020 15:16:37 -0600
Subject: [PATCH] Remove cheyenne.intel-impi and supermuc_phase2.intel build
 targets

---
 ccpp/build_ccpp.sh    |  5 +++--
 ccpp/set_compilers.sh | 14 --------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/ccpp/build_ccpp.sh b/ccpp/build_ccpp.sh
index fe1f64fe7..2e9aa9a11 100755
--- a/ccpp/build_ccpp.sh
+++ b/ccpp/build_ccpp.sh
@@ -6,8 +6,9 @@ set -eu
 # List of valid/tested machines
 VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \
                  hera.intel hera.gnu orion.intel \
-                 cheyenne.intel cheyenne.intel-impi cheyenne.gnu endeavor.intel \
-                 stampede.intel supermuc_phase2.intel macosx.gnu \
+                 cheyenne.intel cheyenne.gnu \
+                 endeavor.intel stampede.intel \
+                 macosx.gnu \
                  linux.intel linux.gnu linux.pgi )
 
 ###################################################################################################
diff --git a/ccpp/set_compilers.sh b/ccpp/set_compilers.sh
index 23143a672..894017cb0 100755
--- a/ccpp/set_compilers.sh
+++ b/ccpp/set_compilers.sh
@@ -60,13 +60,6 @@ case "$MACHINE_ID" in
             export F77=mpif77
             export F90=mpif90
             ;;
-        cheyenne.intel-impi)
-            export CC=mpiicc
-            export CXX=mpiicpc
-            export FC=mpiifort
-            export F77=mpiifort
-            export F90=mpiifort
-            ;;
         cheyenne.gnu)
             export CC=mpicc
             export CXX=mpicxx
@@ -88,13 +81,6 @@ case "$MACHINE_ID" in
             export F77=mpif77
             export F90=mpif90
             ;;
-        supermuc_phase2.intel)
-            export CC=mpiicc
-            export CXX=mpiicpc
-            export FC=mpiifort
-            export F77=mpiifort
-            export F90=mpiifort
-            ;;
         macosx.gnu)
             # set in generic modulefile
             ;;