From 9ae900e1759330cbd6dd49d2f63dbd797a5127af Mon Sep 17 00:00:00 2001
From: Henry Weller <henry@nero.(none)>
Date: Fri, 30 May 2008 10:10:12 +0100
Subject: [PATCH 1/3] sh compatibility

---
 tutorials/Allclean           | 2 +-
 tutorials/CleanFunctions     | 2 +-
 tutorials/sonicFoam/Allclean | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tutorials/Allclean b/tutorials/Allclean
index b8cf626ef3..aefce0c6f0 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -30,7 +30,7 @@
 #     
 #------------------------------------------------------------------------------
 
-. CleanFunctions
+. ./CleanFunctions
 
 echo "Cleaning backup files"
 find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \; 
diff --git a/tutorials/CleanFunctions b/tutorials/CleanFunctions
index dee6ac75fe..a5e9b7ebed 100644
--- a/tutorials/CleanFunctions
+++ b/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
 }
diff --git a/tutorials/sonicFoam/Allclean b/tutorials/sonicFoam/Allclean
index c79a02160c..598ab19eb5 100755
--- a/tutorials/sonicFoam/Allclean
+++ b/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 

From 508b757fbb11f24e21a01ef32cd39191840ecb3d Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 30 May 2008 11:08:35 +0100
Subject: [PATCH 2/3] Attempt to fix src/OpenFOAM/lnInclude/triFace*H problem

---
 src/OpenFOAM/lnInclude/triFace.H  | 1 -
 src/OpenFOAM/lnInclude/triFaceI.H | 1 -
 2 files changed, 2 deletions(-)
 delete mode 120000 src/OpenFOAM/lnInclude/triFace.H
 delete mode 120000 src/OpenFOAM/lnInclude/triFaceI.H

diff --git a/src/OpenFOAM/lnInclude/triFace.H b/src/OpenFOAM/lnInclude/triFace.H
deleted file mode 120000
index d00e3329d3..0000000000
--- a/src/OpenFOAM/lnInclude/triFace.H
+++ /dev/null
@@ -1 +0,0 @@
-../meshes/meshShapes/triFace/triFace.H
\ No newline at end of file
diff --git a/src/OpenFOAM/lnInclude/triFaceI.H b/src/OpenFOAM/lnInclude/triFaceI.H
deleted file mode 120000
index 7bb4b179a5..0000000000
--- a/src/OpenFOAM/lnInclude/triFaceI.H
+++ /dev/null
@@ -1 +0,0 @@
-../meshes/meshShapes/triFace/triFaceI.H
\ No newline at end of file

From c61aed673a72d9c454728f018052d1a8fe2f82b7 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 30 May 2008 11:22:59 +0100
Subject: [PATCH 3/3] Reverting OpenMPI back to version 1.2.5 due to
 insurmountable build problems with 1.2.6

---
 etc/settings.csh | 2 +-
 etc/settings.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/settings.csh b/etc/settings.csh
index 10bce2b685..94d6501e9d 100644
--- a/etc/settings.csh
+++ b/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
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 8bb969a356..880dba484d 100644
--- a/etc/settings.sh
+++ b/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