exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into MartinBeaudoin

Browse source
This commit is contained in:
Hrvoje Jasak 2010-10-12 11:18:11 +01:00
commit 4dcea1deca
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/solvers/multiphase/cavitatingFoam/pEqn.H
View file

@ -37,7 +37,7 @@
- fvm::laplacian(rUAf, p) - fvm::laplacian(rUAf, p)
); );
if (corr == nCorr-1 && nonOrth == nNonOrthCorr) if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
{ {
pEqn.solve(mesh.solver(p.name() + "Final")); pEqn.solve(mesh.solver(p.name() + "Final"));
} }

37
etc/settings.sh
View file

@ -47,6 +47,10 @@ _foamAddLib()
while [ $# -ge 1 ] while [ $# -ge 1 ]
do do
export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
if [ "$WM_ARCH" == "darwinIntel" ]
then
export DYLD_LIBRARY_PATH=$1:$DYLD_LIBRARY_PATH
fi
shift shift
done done
} }
@ -168,15 +172,24 @@ unset MPI_ARCH_PATH
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
mpi_version=openmpi-1.4.1 if [ "$WM_ARCH" == "darwinIntel" ]
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version then
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS mpi_version=openmpi-system
export MPI_HOME=/usr
export MPI_ARCH_PATH=/usr
# Tell OpenMPI where to find its install directory unset OPAL_PREFIX
export OPAL_PREFIX=$MPI_ARCH_PATH else
mpi_version=openmpi-1.4.1
export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
_foamAddPath $MPI_ARCH_PATH/bin # Tell OpenMPI where to find its install directory
_foamAddLib $MPI_ARCH_PATH/lib export OPAL_PREFIX=$MPI_ARCH_PATH
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib
fi
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
unset mpi_version unset mpi_version
@ -317,6 +330,16 @@ export MPI_BUFFER_SIZE
# export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD # export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
#fi #fi
# HOARD seems to crash Paraview on Mac OS X 10.6
#if [ -f $FOAM_LIBBIN/libhoard.dylib ]
#then
# if [ -z "$DYLD_INSERT_LIBRARIES" ]
# then
# export DYLD_INSERT_LIBRARIES=$FOAM_LIBBIN/libhoard.dylib
# else
# export DYLD_INSERT_LIBRARIES=$FOAM_LIBBIN/libhoard.dylib:$DYLD_INSERT_LIBRARIES
# fi
#fi
# cleanup environment: # cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~