ENH: 'wclean all' now uses either Allwclean or Allclean files if

present.
This commit is contained in:
Mark Olesen
2010-03-09 17:16:23 +01:00
parent d4054f6b1f
commit 2068c67a33
7 changed files with 55 additions and 80 deletions

View File

@ -1,35 +1,4 @@
#!/bin/sh
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# Allclean
#
# Description
#
#------------------------------------------------------------------------------
cd ${0%/*} || exit 1 # run from this directory
echo "--------"
@ -43,4 +12,5 @@ rm logs testLoopReport > /dev/null 2>&1
foamCleanTutorials cases
echo "--------"
# ----------------------------------------------------------------- end-of-file

View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -29,7 +29,6 @@
# Description
#
#------------------------------------------------------------------------------
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
@ -38,9 +37,9 @@ cd ${0%/*} || exit 1 # run from this directory
# logReport <logfile>
# Extracts useful info from log file.
logReport () {
case=`dirname $1 | sed s/"\(.*\)\.\/"/""/g`
caseName=`dirname $1 | sed s/"\(.*\)\.\/"/""/g`
app=`echo $1 | sed s/"\(.*\)\."/""/g`
appAndCase="Application $app - case $case"
appAndCase="Application $app - case $caseName"
fatalError=`grep "FOAM FATAL" $1`
UxSS=`grep -E "Ux[:| ]*solution singularity" $1`
@ -51,11 +50,9 @@ logReport () {
if [ "$fatalError" ]
then
echo "$appAndCase: ** FOAM FATAL ERROR **"
return
elif [ "$UxSS" -a "$UySS" -a "$UzSS" ]
then
echo "$appAndCase: ** Solution singularity **"
return
elif [ "$completed" ]
then
completionTime=`tail -10 $log | grep Execution | cut -d= -f2 | sed 's/^[ \t]*//'`
@ -64,7 +61,6 @@ logReport () {
completionTime="in $completionTime"
fi
echo "$appAndCase: completed $completionTime"
return
else
echo "$appAndCase: unconfirmed completion"
fi
@ -78,17 +74,18 @@ foamRunTutorials cases
# Analyse all log files
rm testLoopReport > /dev/null 2>&1 &
touch testLoopReport
for application in *
for appDir in *
do
if [ -d $application ]
if [ -d $appDir ]
then
cd $application
(
cd $appDir
for log in `find . -name "log.*" | xargs ls -rt`
do
logReport $log >> ../testLoopReport
done
echo "" >> ../testLoopReport
cd ..
)
fi
done

View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -30,7 +30,6 @@
# quickly tests the tutorials and writes out the scheme/solver information
#
#------------------------------------------------------------------------------
cd ${0%/*} || exit 1 # run from this directory
usage() {
@ -225,5 +224,4 @@ do
echo "" >> $SOLVERS_FILE
done
# ----------------------------------------------------------------- end-of-file