From 4bf399fa58a9fd7b5f5edab016daf1739288b1eb Mon Sep 17 00:00:00 2001
From: Martin Beaudoin <beaudoin.martin@ireq.ca>
Date: Tue, 17 Apr 2012 22:51:22 -0400
Subject: [PATCH] Switch to PyFoam version 0.5.7

---
 ThirdParty/AllMake        | 3 +++
 ThirdParty/AllMake.stage3 | 3 ++-
 ThirdParty/AllMake.stage5 | 2 ++
 etc/settings.csh          | 4 ++--
 etc/settings.sh           | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ThirdParty/AllMake b/ThirdParty/AllMake
index 9d3105278..0991e37ba 100755
--- a/ThirdParty/AllMake
+++ b/ThirdParty/AllMake
@@ -72,6 +72,9 @@ echo
 ./AllMake.stage4
 
 # Running stage 5
+# This stage depends on a properly compiled installation
+# of OpenFOAM. On a brand new installation of OpenFOAM-1.6-ext,
+# this stage should be called last in your compilation process
 ./AllMake.stage5
 
 echo ========================================
diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3
index 11f9cda99..fc1e2a4f6 100755
--- a/ThirdParty/AllMake.stage3
+++ b/ThirdParty/AllMake.stage3
@@ -128,7 +128,8 @@ fi
 # PyFoam
 if [ -z "$PYFOAM_SYSTEM" ] 
 then
-    ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec  -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
+#   ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec  -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
+    ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec  -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch)
 else
     echo "Using system installed PyFoam"
     echo ""
diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5
index 39761f3ec..f5f5b9fc7 100755
--- a/ThirdParty/AllMake.stage5
+++ b/ThirdParty/AllMake.stage5
@@ -31,6 +31,8 @@
 #
 # Requirements:
 #     1: Your OpenFOAM environment must be properly initialized
+#     2: OpenFOAM must already been compiled because swak4Foam depends on
+#        OpenFOAM include files and libraries
 #
 # Author:
 #     Martin Beaudoin, Hydro-Quebec, (2012)
diff --git a/etc/settings.csh b/etc/settings.csh
index 225199b70..2c32ee1b2 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -437,8 +437,8 @@ endif
 
 # PyFoam
 # ~~~~~~
-if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.5.6 ) then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.6/platforms/noarch/etc/PyFoam-0.5.6.csh
+if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.5.7 ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch/etc/PyFoam-0.5.7.csh
 endif
 
 # QT
diff --git a/etc/settings.sh b/etc/settings.sh
index 409438b8c..bd71048b7 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -524,8 +524,8 @@ export MPI_BUFFER_SIZE
 
 # Load PyFoam
 # ~~~~~~~~~~~
-[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.6 ] && {
-    _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.6/platforms/noarch/etc/PyFoam-0.5.6.sh
+[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7 ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch/etc/PyFoam-0.5.7.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    PYFOAM_DIR is initialized to: $PYFOAM_DIR"