src/parallel/decompose: Remove dependency on "SCOTCH_ROOT" and repair "decompose/Allwclean"

Patch contributed by Bruno Santos
Resolves patch request http://bugs.openfoam.org/view.php?id=2212
This commit is contained in:
Henry Weller
2016-08-23 21:53:35 +01:00
parent 73c48c5a7e
commit 9354748814
3 changed files with 13 additions and 8 deletions

View File

@ -1,9 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
then
@ -28,7 +25,7 @@ wcleanMpiLib()
WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$FOAM_MPI"
whichscotch="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$SCOTCH_VERSION"
wclean $targetType $libName
wclean $libName
)
done
set -x

View File

@ -3,10 +3,15 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
-I$(SCOTCH_ROOT)/include \
-I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
-I$(SCOTCH_ARCH_PATH)/include \
-I/usr/include/scotch \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
-L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt
-L$(SCOTCH_ARCH_PATH)/lib \
-L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
-lptscotch \
-lptscotcherrexit \
-lscotch \
-lrt

View File

@ -7,10 +7,13 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
-I$(SCOTCH_ROOT)/include \
-I$(SCOTCH_ARCH_PATH)/include \
-I/usr/include/scotch \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
-L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
-L$(SCOTCH_ARCH_PATH)/lib \
-L$(FOAM_EXT_LIBBIN) \
-lscotch \
-lscotcherrexit \
-lrt