From a2567af754cef52a1decb0eaa6285bb1d568645c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 18 Jul 2013 09:14:35 +0100
Subject: [PATCH] BUG:foamEndJob: work if writeControl differs from timeStep

---
 bin/foamEndJob  | 4 +++-
 bin/mpirunDebug | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/foamEndJob b/bin/foamEndJob
index 09f701d1bf..06e695795a 100755
--- a/bin/foamEndJob
+++ b/bin/foamEndJob
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -363,10 +363,12 @@ trap restoreDict QUIT TERM INT
 if [ "$stopOpt" = now ]
 then
     setRawEntry  $controlDict stopAt nextWrite
+    setRawEntry  $controlDict writeControl timeStep
     setRawEntry  $controlDict writeInterval 1
 
     echo "$Script : Changed in controlDict:"
     echo "    `getLine $controlDict stopAt`"
+    echo "    `getLine $controlDict writeControl`"
     echo "    `getLine $controlDict writeInterval`"
 else
     setRawEntry $controlDict stopAt nextWrite
diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index 7911e06e98..5fa926ba2c 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -196,7 +196,7 @@ do
         echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
         ;;
     5)
-        echo "$sourceFoam; cd $PWD; valgrind $exec $args; read dummy" >> $procCmdFile
+        echo "$sourceFoam; cd $PWD; valgrind --leak-check=full --show-reachable=yes $exec $args 2>&1 | tee $procLog; read dummy" >> $procCmdFile
         echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
         ;;
     6)