BUG:foamEndJob: work if writeControl differs from timeStep

This commit is contained in:
mattijs
2013-07-18 09:14:35 +01:00
parent 32bc7e9fc1
commit a2567af754
2 changed files with 5 additions and 3 deletions

View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -363,10 +363,12 @@ trap restoreDict QUIT TERM INT
if [ "$stopOpt" = now ] if [ "$stopOpt" = now ]
then then
setRawEntry $controlDict stopAt nextWrite setRawEntry $controlDict stopAt nextWrite
setRawEntry $controlDict writeControl timeStep
setRawEntry $controlDict writeInterval 1 setRawEntry $controlDict writeInterval 1
echo "$Script : Changed in controlDict:" echo "$Script : Changed in controlDict:"
echo " `getLine $controlDict stopAt`" echo " `getLine $controlDict stopAt`"
echo " `getLine $controlDict writeControl`"
echo " `getLine $controlDict writeInterval`" echo " `getLine $controlDict writeInterval`"
else else
setRawEntry $controlDict stopAt nextWrite setRawEntry $controlDict stopAt nextWrite

View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -196,7 +196,7 @@ do
echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
;; ;;
5) 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 echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
;; ;;
6) 6)