diff --git a/Allwmake b/Allwmake index 414bb04f62d900e8a3295cfdb39a593cc0e525a1..a311597d39eac621518d1bbff87b4f74e7f24962 100755 --- a/Allwmake +++ b/Allwmake @@ -1,13 +1,15 @@ #!/bin/sh set -x -( cd wmake && ./makeWmake ) +(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake) -( cd src && ./Allwmake ) +(cd wmake && ./makeWmake) -( cd applications && ./Allwmake ) +(cd src && ./Allwmake) + +(cd applications && ./Allwmake) if [ "$1" = doc ] then - ( cd doc && ./Allwmake) + (cd doc && ./Allwmake) fi diff --git a/etc/settings.csh b/etc/settings.csh index 10bce2b685a4998ca593fb559b8b9c7d4d42fc62..73b340e9e953205b6c74fa1e0c9bff05bba9c203 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -121,10 +121,15 @@ if ($?WM_COMPILER_BIN) then endif +# Third-party software +# ~~~~~~~~~~~~~~~~~~~~ +set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty + + # MICO # ~~~~ setenv MICO_VERSION 2.3.12 -setenv MICO_PATH $FOAM_SRC/other/mico-$MICO_VERSION +setenv MICO_PATH $thirdParty/mico-$MICO_VERSION setenv MICO_ARCH_PATH $MICO_PATH/platforms/$WM_OPTIONS set path=($MICO_ARCH_PATH/bin $path) @@ -158,7 +163,7 @@ endif switch ("$WM_MPLIB") case OPENMPI: set ompi_version=1.2.6 - setenv OPENMPI_HOME $FOAM_SRC/other/openmpi-$ompi_version + setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS # Tell OpenMPI where to find it's install directory @@ -173,7 +178,7 @@ case OPENMPI: case LAM: set lam_version=7.1.4 - setenv LAMHOME $FOAM_SRC/other/lam-$lam_version + setenv LAMHOME $thirdParty/lam-$lam_version setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS AddLib $LAM_ARCH_PATH/lib @@ -185,7 +190,7 @@ case LAM: case MPICH: set mpich_version=1.2.4 - setenv MPICH_PATH $FOAM_SRC/other/mpich-$mpich_version + setenv MPICH_PATH $thirdParty/mpich-$mpich_version setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS setenv MPICH_ROOT $MPICH_ARCH_PATH diff --git a/etc/settings.sh b/etc/settings.sh index 8bb969a3561a2eb822c9bd886c20409b58b0d769..9d577d605e3431345958902a032da8d99c46e59c 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -128,10 +128,15 @@ if [ "$WM_COMPILER_BIN" != "" ]; then fi +# Third-party software +# ~~~~~~~~~~~~~~~~~~~~ +thirdParty=$WM_PROJECT_INST_DIR/ThirdParty + + # MICO # ~~~~ export MICO_VERSION=2.3.12 -export MICO_PATH=$FOAM_SRC/other/mico-$MICO_VERSION +export MICO_PATH=$thirdParty/mico-$MICO_VERSION export MICO_ARCH_PATH=$MICO_PATH/platforms/$WM_OPTIONS export PATH=$MICO_ARCH_PATH/bin:$PATH @@ -159,7 +164,7 @@ export FOAMX_CONFIG case "$WM_MPLIB" in OPENMPI) ompi_version=1.2.6 - export OPENMPI_HOME=$FOAM_SRC/other/openmpi-$ompi_version + export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS # Tell OpenMPI where to find it's install directory @@ -174,7 +179,7 @@ OPENMPI) LAM) lam_version=7.1.4 - export LAMHOME=$FOAM_SRC/other/lam-$lam_version + export LAMHOME=$thirdParty/lam-$lam_version export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS AddLib $LAM_ARCH_PATH/lib @@ -186,7 +191,7 @@ LAM) MPICH) mpich_version=1.2.4 - export MPICH_PATH=$FOAM_SRC/other/mpich-$mpich_version + export MPICH_PATH=$thirdParty/mpich-$mpich_version export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS export MPICH_ROOT=$MPICH_ARCH_PATH diff --git a/src/Allwmake b/src/Allwmake index d98d1bed0aaca60af9875c8196130eb44f326d96..1db8264e3f74ec9ccb5a50cf7ccca1254a9425c6 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -2,9 +2,7 @@ set -x ( cd OpenFOAM && wmakeLnInclude . ) -( cd other && ./Allwmake ) ( cd Pstream && ./Allwmake ) - wmake libo OSspecific/$WM_OS wmake libso OpenFOAM diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake index 79013a6d7730fef5d6b5389e036852a4f4e8227b..98f16e38eb030f822f7433bec41d3caad0eb2976 100755 --- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake +++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake @@ -1,3 +1 @@ -wmake libso ParMGridGen-1.0/MGridGen/IMlib -wmake libso ParMGridGen-1.0/MGridGen/Lib wmake libso MGridGenGAMGAgglomeration diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options index 8a23c38729d04280edb1cfa26aa077f2016d9137..8b8d0b691324528533d7517474729646b2c2b5ed 100644 --- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options +++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options @@ -1,4 +1,4 @@ -ParMGridGen = $(LIB_SRC)/decompositionAgglomeration/MGridGenGamgAgglomeration/ParMGridGen-1.0 +ParMGridGen = ${WM_PROJECT_INST_DIR}/ThirdParty/ParMGridGen-1.0 TYPE_REAL= #if defined(SP) diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionAgglomeration/decompositionMethods/Make/options index 224af2cdfcf9cb1d7a6b23603eb16f044ce1cb4d..041b8c71808b2d6c60d082400670454d1fdf5cc6 100644 --- a/src/decompositionAgglomeration/decompositionMethods/Make/options +++ b/src/decompositionAgglomeration/decompositionMethods/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SRC)/other/metis-5.0pre2/include + -I${WM_PROJECT_INST_DIR}/ThirdParty/metis-5.0pre2/include LIB_LIBS = \ -lmetis \ diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionAgglomeration/parMetisDecomp/Make/options index 2bbedb99301e113d55131f1f86cfbb5ae7f7356a..eb2850d9e2a03c04a895d28e969c36cb16a39c52 100644 --- a/src/decompositionAgglomeration/parMetisDecomp/Make/options +++ b/src/decompositionAgglomeration/parMetisDecomp/Make/options @@ -2,8 +2,8 @@ include $(RULES)/mplib$(WM_MPLIB) EXE_INC = \ $(PFLAGS) $(PINC) \ - -I$(FOAM_SRC)/other/ParMetis-3.1/ParMETISLib \ - -I$(FOAM_SRC)/other/ParMetis-3.1 \ + -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1/ParMETISLib \ + -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1 \ -I../decompositionMethods/lnInclude LIB_LIBS = \