songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry 2008-06-04 11:48:20 +01:00
commit 4066b1fd9e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/tools/buildParaViewFunctions
View File

@ -43,7 +43,7 @@ addCMakeVariable ()
initialiseVariables () initialiseVariables ()
{ {
unset CMAKE_VARIABLES OBJ_ADD unset CMAKE_VARIABLES OBJ_ADD MPI_ARCH_PATH
if [ "$VERBOSE" = ON ]; then if [ "$VERBOSE" = ON ]; then
addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE" addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
@ -58,19 +58,16 @@ addMpiSupport ()
# using OpenFOAM variables to identify location of MPI libraries # using OpenFOAM variables to identify location of MPI libraries
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
MPI_INCLUDE_PATH=$OPENMPI_ARCH_PATH/include MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so
MPI_RUN=$OPENMPI_ARCH_PATH/bin/mpirun
;; ;;
LAM) LAM)
MPI_INCLUDE_PATH=$LAM_ARCH_PATH/include MPI_ARCH_PATH=$LAM_ARCH_PATH
MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so
MPI_RUN=$LAM_ARCH_PATH/bin/mpirun
;; ;;
MPICH) MPICH)
MPI_INCLUDE_PATH=$MPICH_ARCH_PATH/include MPI_ARCH_PATH=$MPICH_ARCH_PATH
MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so
MPI_RUN=$MPICH_ARCH_PATH/bin/mpirun
;; ;;
*) *)
echo "*** Error: unknown/unsupported mpi: $WM_MPLIB" echo "*** Error: unknown/unsupported mpi: $WM_MPLIB"
@ -78,6 +75,9 @@ addMpiSupport ()
;; ;;
esac esac
MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include
MPI_RUN=$MPI_ARCH_PATH/bin/mpirun
OBJ_ADD="$OBJ_ADD-mpi" OBJ_ADD="$OBJ_ADD-mpi"
addCMakeVariable "VTK_USE_MPI=ON" addCMakeVariable "VTK_USE_MPI=ON"
addCMakeVariable "PARAVIEW_USE_MPI=ON" addCMakeVariable "PARAVIEW_USE_MPI=ON"
@ -242,11 +242,11 @@ installParaView ()
"s,$PARAVIEW_SRC_DIR,\$ENV{ParaView_INST_DIR},g" {} ';' \ "s,$PARAVIEW_SRC_DIR,\$ENV{ParaView_INST_DIR},g" {} ';' \
-print -print
# Replace local OPENMPI_ARCH_PATH path with OPENMPI_ARCH_PATH # Replace local MPI_ARCH_PATH path with MPI_ARCH_PATH
# environment variables # environment variables
if [ "$INCLUDE_MPI" = ON ]; then if [ "$INCLUDE_MPI" = ON ]; then
find . -iname \*.cmake -execdir sed -i \ find . -iname \*.cmake -execdir sed -i \
"s,$OPENMPI_ARCH_PATH,\$ENV{OPENMPI_ARCH_PATH},g" {} ';' \ "s,$MPI_ARCH_PATH,\$ENV{MPI_ARCH_PATH},g" {} ';' \
-print -print
fi fi
@ -274,6 +274,7 @@ installParaView ()
# for good measure - clear a few variables before using any of the functions # for good measure - clear a few variables before using any of the functions
unset VERBOSE INCLUDE_MPI INCLUDE_PYTHON INCLUDE_MESA PYTHON_LIBRARY unset VERBOSE INCLUDE_MPI INCLUDE_PYTHON INCLUDE_MESA PYTHON_LIBRARY
unset MPI_ARCH_PATH
unset CMAKE_VARIABLES OBJ_ADD unset CMAKE_VARIABLES OBJ_ADD
unset CMAKE_SKIP unset CMAKE_SKIP