zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2012-10-29 12:28:36 +00:00
parent ab64401050 3a1113e513
commit 90ef61f497
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/foamNew
View File

@ -52,11 +52,11 @@ USAGE
case "$1" in case "$1" in
(-s | -source | source) (-s | -source | source)
shift shift
$WM_PROJECT_DIR/etc/codeTemplates/source/foamNewSource $* $WM_PROJECT_DIR/etc/codeTemplates/source/foamNewSource "$@"
;; ;;
(-t | -template | template) (-t | -template | template)
shift shift
$WM_PROJECT_DIR/etc/codeTemplates/template/foamNewTemplate $* $WM_PROJECT_DIR/etc/codeTemplates/template/foamNewTemplate "$@"
;; ;;
(*) (*)
usage "unknown type '$1'" usage "unknown type '$1'"

12
etc/config/settings.csh
View File

@ -391,22 +391,12 @@ case SYSTEMOPENMPI:
# Use the system installed openmpi, get library directory via mpicc # Use the system installed openmpi, get library directory via mpicc
setenv FOAM_MPI openmpi-system setenv FOAM_MPI openmpi-system
# Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
setenv PINC "`mpicc --showme:compile`"
setenv PLIBS "`mpicc --showme:link`"
set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
# include files and libraries. # include files and libraries.
setenv MPI_ARCH_PATH "${libDir:h}" setenv MPI_ARCH_PATH "${libDir:h}"
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using system installed MPI:"
echo " compile flags : $PINC"
echo " link flags : $PLIBS"
echo " libmpi dir : $libDir"
endif
_foamAddLib $libDir _foamAddLib $libDir
unset libDir unset libDir
breaksw breaksw

13
etc/config/settings.sh
View File

@ -418,23 +418,12 @@ SYSTEMOPENMPI)
# Use the system installed openmpi, get library directory via mpicc # Use the system installed openmpi, get library directory via mpicc
export FOAM_MPI=openmpi-system export FOAM_MPI=openmpi-system
# Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
export PINC="`mpicc --showme:compile`"
export PLIBS="`mpicc --showme:link`"
libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
# include files and libraries. # include files and libraries.
export MPI_ARCH_PATH="${libDir%/*}" export MPI_ARCH_PATH="${libDir%/*}"
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Using system installed MPI:" 1>&2
echo " compile flags : $PINC" 1>&2
echo " link flags : $PLIBS" 1>&2
echo " libmpi dir : $libDir" 1>&2
fi
_foamAddLib $libDir _foamAddLib $libDir
unset libDir unset libDir
;; ;;