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 ssh://andy@noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2008-05-30 12:13:45 +01:00
parent 454fb81bea c61aed673a
commit c8180a915b
7 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/settings.csh
View File

@ -157,7 +157,7 @@ endif
switch ("$WM_MPLIB") switch ("$WM_MPLIB")
case OPENMPI: case OPENMPI:
set ompi_version=1.2.6 set ompi_version=1.2.5
setenv OPENMPI_HOME $FOAM_SRC/other/openmpi-$ompi_version setenv OPENMPI_HOME $FOAM_SRC/other/openmpi-$ompi_version
setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS

2
etc/settings.sh
View File

@ -158,7 +158,7 @@ export FOAMX_CONFIG
case "$WM_MPLIB" in case "$WM_MPLIB" in
OPENMPI) OPENMPI)
ompi_version=1.2.6 ompi_version=1.2.5
export OPENMPI_HOME=$FOAM_SRC/other/openmpi-$ompi_version export OPENMPI_HOME=$FOAM_SRC/other/openmpi-$ompi_version
export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS

1
src/OpenFOAM/lnInclude/triFace.H
View File

@ -1 +0,0 @@
../meshes/meshShapes/triFace/triFace.H

1
src/OpenFOAM/lnInclude/triFaceI.H
View File

@ -1 +0,0 @@
../meshes/meshShapes/triFace/triFaceI.H

2
tutorials/Allclean
View File

@ -30,7 +30,7 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
. CleanFunctions . ./CleanFunctions
echo "Cleaning backup files" echo "Cleaning backup files"
find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \; find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \;

2
tutorials/CleanFunctions
View File

@ -54,7 +54,7 @@ cleanTimeDirectories ()
rm -rf $1/${timeDir} > /dev/null 2>&1 rm -rf $1/${timeDir} > /dev/null 2>&1
rm -rf $1/-${timeDir} > /dev/null 2>&1 rm -rf $1/-${timeDir} > /dev/null 2>&1
zeros=`printf %0${nZeros}d 0` zeros=`printf %0${nZeros}d 0`
let nZeros=nZeros+1 nZeros=$(($nZeros + 1))
done done
rm -rf $1/{[1-9]*,-[1-9]*,log,log.*,log-*,logSummary.*,.fxLock,*.xml,ParaView*,paraFoam*,*.foam} > /dev/null 2>&1 rm -rf $1/{[1-9]*,-[1-9]*,log,log.*,log-*,logSummary.*,.fxLock,*.xml,ParaView*,paraFoam*,*.foam} > /dev/null 2>&1
} }

2
tutorials/sonicFoam/Allclean
View File

@ -3,7 +3,6 @@
currDir=`pwd` currDir=`pwd`
application=`basename $currDir` application=`basename $currDir`
cases="forwardStep shockTube" cases="forwardStep shockTube"
utility=setShock
tutorialPath=`dirname $0`/.. tutorialPath=`dirname $0`/..
. $tutorialPath/CleanFunctions . $tutorialPath/CleanFunctions
@ -15,7 +14,6 @@ do
then then
rm -rf $case/0 rm -rf $case/0
cp -r $case/0.org $case/0 cp -r $case/0.org $case/0
wclean $case/$utility
cleanSamples $case cleanSamples $case
fi fi
done done