Commit cfa7678b authored by Henry Weller's avatar Henry Weller
Browse files

foamRunTutorials: Rationalized support for the "-test" option

RunFunctions: Added "isTest()" argument parsing function
tutorials: Updated Allrun scripts to propagate the "-test" option
tutorials: Removed the lower Alltest scripts and updated the Allrun to
    use the "isTest()" function to handle test-specific operation
parent 3faa7e22
......@@ -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-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
......@@ -94,16 +94,17 @@ do
esac
done
passArgs=$(if $runTests; then echo "-test"; fi)
# If an argument is supplied do not execute ./Allrun to avoid recursion
if ! $skipFirst && $runTests && [ -f "./Alltest" ]
then
# Run a special test script.
./Alltest
./Alltest $passArgs
elif ! $skipFirst && [ -f "./Allrun" ]
then
# Specialised script.
./Allrun
./Allrun $passArgs
elif [ -d system ]
then
# Normal case.
......@@ -120,20 +121,15 @@ else
( compileApplication $caseName )
fi
done
# Recurse to subdirectories
#for caseName in *
#do
# if [ -d $caseName ]
# then
# ( cd $caseName && $thisScript )
# fi
#done
FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs)
#$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript"
passArgs=$(if $runTests; then echo "-test"; fi)
#$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
# FOAM_TARGETS="$FOAM_TARGETS" \
# FOAM_APP="$WM_SCHEDULER $thisScript" FOAM_ARGS="$passArgs"
$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$thisScript" FOAM_ARGS="$passArgs"
$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs \
FOAM_TARGETS="$FOAM_TARGETS" \
FOAM_APP="$thisScript" FOAM_ARGS="$passArgs"
fi
#------------------------------------------------------------------------------
......@@ -28,6 +28,17 @@
# Miscellaneous functions for running tutorial cases
#------------------------------------------------------------------------------
isTest()
{
for i in "$@"; do
if [ "$i" = "-test" ]
then
return 0
fi
done
return 1
}
getNumberOfProcessors()
{
expandDictionary system/decomposeParDict \
......
......@@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file
......@@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file
......@@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file
......@@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file
......@@ -25,11 +25,14 @@ cloneParallelCase()
# Do the Spalart-Allmaras steady-state case
(cd motorBike && foamRunTutorials)
# Clone the steady-state case to the LES case
cloneParallelCase motorBike motorBikeLES
# Do the LES case
cp lesFiles/Allrun motorBikeLES/
(cd motorBikeLES && foamRunTutorials)
if ! isTest $@
then
# Clone the steady-state case to the LES case
cloneParallelCase motorBike motorBikeLES
# Do the LES case
cp lesFiles/Allrun motorBikeLES/
(cd motorBikeLES && foamRunTutorials)
fi
# ----------------------------------------------------------------- end-of-file
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Do the Spalart-Allmaras steady-state case
(cd motorBike && foamRunTutorials)
# ----------------------------------------------------------------- end-of-file
......@@ -16,7 +16,7 @@ runParallel snappyHexMesh -overwrite
find . -type f -iname "*level*" -exec rm {} \;
ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
runParallel topoSet
runParallel `getApplication`
......
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Any cases that are links to solver test cases and are run when the Allrun
# scripts of those solvers are run. This script avoids meshing these cases
# twice.
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
(
cd blob || exit
./Allrun
)
(
cd flange || exit
./Allrun
./Allrun $*
)
(
cd simpleShapes || exit
./Allrun
./Allrun $*
)
(
cd mixerVessel || exit
./Allrun
)
exit 0
# Any cases that are links to solver test cases and are run when the Allrun
# scripts of those solvers are run.
# This dummy Allrun script avoids meshing these cases twice.
if ! isTest $@
then
(
cd flange || exit
./Allrun $*
)
(
cd mixerVessel || exit
./Allrun $*
)
fi
# ----------------------------------------------------------------- end-of-file
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
cp system/controlDict system/controlDict.org
sed -e s/"\(endTime[ \t]*\)\([0-9]*\);"/"\1 10;"/g \
-e s/"\(writeInterval[ \t]*\)\([0-9]*\);"/"\1 10;"/g \
system/controlDict.org > system/controlDict
runApplication foamyHexMesh
# Change collapseEdges to only do one iteration
cp system/collapseDict system/collapseDict.org
sed -e s/"\(maximumIterations[ \t]*\)\([0-9]*\);"/"\1 1;"/g \
system/collapseDict.org > system/collapseDict
runApplication collapseEdges -latestTime -collapseFaces
cp system/controlDict.org system/controlDict
cp system/collapseDict.org system/collapseDict
rm -f system/controlDict.org system/collapseDict.org
# ----------------------------------------------------------------- end-of-file
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Do nothing for now.
# ----------------------------------------------------------------- end-of-file
......@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
(
cd flange || exit
./Allrun
./Allrun $*
)
exit 0
......
......@@ -3,12 +3,12 @@ cd ${0%/*} || exit 1 # Run from this directory
(
cd throttle || exit
./Allrun
./Allrun $*
)
(
cd throttle3D || exit
./Allrun
./Allrun $*
)
# ----------------------------------------------------------------- end-of-file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment