From 08b27669da4e5627d7f22db5bd640466fae87b03 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 9 Nov 2010 10:11:17 +0100
Subject: [PATCH] ENH: install scotch files under ThirdyParty platforms/

- for future updates of scotch, need to edit these two files:

    OpenFOAM-<VERSION>/src/parallel/decompose/Allwmake
    ThirdParty-<VERSION>/Allwmake
---
 src/parallel/decompose/Allwmake                    | 9 ++++++++-
 src/parallel/decompose/ptscotchDecomp/Make/options | 2 +-
 src/parallel/decompose/scotchDecomp/Make/options   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 3ca612fb5b..82fa74bec3 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -2,6 +2,10 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+SCOTCH_VERSION=scotch_5.1.10b
+SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
+export SCOTCH_ARCH_PATH
+
 wmakeLnInclude decompositionMethods
 
 wmake libso scotchDecomp
@@ -9,7 +13,10 @@ wmake libso metisDecomp
 
 if [ -d "$FOAM_MPI_LIBBIN" ]
 then
-    ( WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso ptscotchDecomp )
+(
+    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
+    wmake libso ptscotchDecomp
+)
 fi
 
 wmake libso decompositionMethods
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 3841a34819..17e6ea5ced 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$(WM_THIRD_PARTY_DIR)/scotch_5.1.10b/include \
+    -I$(SCOTCH_ARCH_PATH)/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index 287aad462b..c832cc0b7c 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1.10b/include \
+    -I$(SCOTCH_ARCH_PATH)/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude