diff --git a/src/parallel/decompose/Allwclean b/src/parallel/decompose/Allwclean index 897eed71b7..62e2d29698 100755 --- a/src/parallel/decompose/Allwclean +++ b/src/parallel/decompose/Allwclean @@ -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 diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options index 25ca6e9d02..cb407ec6b5 100644 --- a/src/parallel/decompose/ptscotchDecomp/Make/options +++ b/src/parallel/decompose/ptscotchDecomp/Make/options @@ -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 diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options index 3bb11fba5c..d2cc770692 100644 --- a/src/parallel/decompose/scotchDecomp/Make/options +++ b/src/parallel/decompose/scotchDecomp/Make/options @@ -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