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

etc/settings.csh

@@ -157,7 +157,7 @@ endif
 
 switch ("$WM_MPLIB")
 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_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
 

etc/settings.sh

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

src/OpenFOAM/lnInclude/triFace.H

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

src/OpenFOAM/lnInclude/triFaceI.H

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

tutorials/Allclean

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

tutorials/CleanFunctions

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

tutorials/sonicFoam/Allclean

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