From 1aedae665c948aafabdd57a91851b323e4c78470 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 3 Jan 2011 16:54:56 +0100
Subject: [PATCH] ENH: use mpi-qualified names for ptscotch include, lib
---
etc/apps/scotch/bashrc | 6 ++++++
src/parallel/decompose/Allwmake | 2 +-
src/parallel/decompose/ptscotchDecomp/Make/options | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/etc/apps/scotch/bashrc b/etc/apps/scotch/bashrc
index 333662722a4..fcd19bfaa35 100644
--- a/etc/apps/scotch/bashrc
+++ b/etc/apps/scotch/bashrc
@@ -36,4 +36,10 @@
export SCOTCH_VERSION=scotch_5.1.11
export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
+# mpi-qualified include directory
+export SCOTCH_MPI_INCLUDE=$SCOTCH_ARCH_PATH/include/${FOAM_MPI_LIBBIN##*/}
+
+# mpi-qualified lib directory
+export SCOTCH_MPI_LIBBIN=$SCOTCH_ARCH_PATH/lib/${FOAM_MPI_LIBBIN##*/}
+
# -----------------------------------------------------------------------------
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 22515e65d2f..cb053bcc3e8 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
+# get SCOTCH_VERSION, SCOTCH_ARCH_PATH, SCOTCH_MPI_INCLUDE
settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
if [ -f "$settings" ]
then
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 17e6ea5ced3..d4f56eb39a4 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -3,7 +3,7 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
- -I$(SCOTCH_ARCH_PATH)/include \
+ -I$(SCOTCH_MPI_INCLUDE) \
-I/usr/include/scotch \
-I../decompositionMethods/lnInclude
--
GitLab