diff --git a/etc/apps/scotch/bashrc b/etc/apps/scotch/bashrc index 333662722a4b6d009f2c33a55aa3b8a5a9ea0cbb..fcd19bfaa35cd49306fb7e6901c6efc948f1f82b 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 22515e65d2f57824c54f2b7941816b0a60a740ac..cb053bcc3e811423065066a35578544f55d49fda 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 17e6ea5ced3c94e62916539cec9bf1906b7c9be5..d4f56eb39a42e7e3a48d3eeda17d20f2384bc525 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