From 507c01e485b4cccf8b68bdd9f65b1ddc364622bb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 31 Jul 2020 13:52:48 +0200
Subject: [PATCH] CONFIG: add mpicc/mpicxx handling for Fujitsu MPI (issue #54)

- uses mpifcc/mpiFCC for mpicc/mpicxx, respectively
---
 etc/tools/ThirdPartyFunctions | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/etc/tools/ThirdPartyFunctions b/etc/tools/ThirdPartyFunctions
index 24b0090..29fc222 100644
--- a/etc/tools/ThirdPartyFunctions
+++ b/etc/tools/ThirdPartyFunctions
@@ -258,13 +258,20 @@ whichCXX()
 }
 
 
-# Return <mpicc> by default or <mpiicc> if possible for INTELMPI.
+# Return
+#   <mpicc> by default
+#   <mpifcc> for FJMPI (if possible)
+#   <mpiicc> for INTELMPI (if possible)
+#
 # Cray doesn't have <mpicc>, but its <cc> manages mpi paths directly.
 # NOTE: could further refine based on "wmake -show-c", but not yet needed
 whichMpicc()
 {
     local comp="$(command -v mpicc)"
     case "$WM_MPLIB" in
+    (FJMPI)
+        comp="$(command -v mpifcc)"     # Fujitsu <mpifcc> available?
+        ;;
     (INTELMPI)
         comp="$(command -v mpiicc)"     # Intel <mpiicc> available?
         ;;
@@ -276,13 +283,20 @@ whichMpicc()
 }
 
 
-# Return <mpicxx> by default or <mpiicpc> if possible for INTELMPI.
+# Return
+#   <mpicxx> by default
+#   <mpiFCC> for FJMPI (if possible)
+#   <mpiicpc> for INTELMPI (if possible)
+#
 # Cray doesn't have <mpicxx>, but its <CC> manages mpi paths directly.
 # NOTE: could further refine based on "wmake -show-cxx", but not yet needed
 whichMpicxx()
 {
     local comp="$(command -v mpicxx)"
     case "$WM_MPLIB" in
+    (FJMPI)
+        comp="$(command -v mpiFCC)"     # Fujitsu <mpiFCC> available?
+        ;;
     (INTELMPI)
         comp="$(command -v mpiicpc)"    # Intel <mpiicpc> available?
         ;;