From 3d90d53230ad9af4bc0c1ea11976f42851e1c294 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 6 Jun 2011 11:44:07 +0100
Subject: [PATCH 1/3] ENH: MakefileDirs: specify non-make command

---
 bin/tools/MakefileDirs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/MakefileDirs b/bin/tools/MakefileDirs
index b67656b6e8..7dda83a399 100644
--- a/bin/tools/MakefileDirs
+++ b/bin/tools/MakefileDirs
@@ -36,7 +36,7 @@
 application: $(FOAM_TARGETS)
 
 $(FOAM_TARGETS):
-	@(cd $@ && $(FOAM_APP))
+	+@(cd $@ && $(FOAM_APP))
 
 
 #------------------------------------------------------------------------------

From 5ebf3704528c7198ba28c91b94a0008e5b61e9ab Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 6 Jun 2011 11:45:38 +0100
Subject: [PATCH 2/3] ENH: paraFoam: filter out dlclose error

---
 bin/paraFoam | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/paraFoam b/bin/paraFoam
index a57505f5f9..48eab6ebe0 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -229,7 +229,8 @@ else
         echo "created temporary '$caseFile'"
     }
 
-    paraview --data="$caseFile" "$@"
+    # For now filter out any ld.so errors. Caused by non-system compiler?
+    paraview --data="$caseFile" "$@" 2>&1 | fgrep -v 'Inconsistency detected by ld.so'
 fi
 
 

From 4f4decc4b949006ee647aa129c078b5679d0b98e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 6 Jun 2011 12:21:33 +0100
Subject: [PATCH 3/3] ENH: RunFunctions: disable scheduler for parallel run

---
 bin/tools/RunFunctions | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index bc5ebb5f32..909d902b8a 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -62,13 +62,13 @@ runParallel()
         shift
         echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
 
-        if [ "$WM_SCHEDULER" ]
-        then
-            echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
-            $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
-        else
+        #if [ "$WM_SCHEDULER" ]
+        #then
+        #    echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
+        #    $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
+        #else
             ( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )
-        fi
+        #fi
     fi
 }