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
This commit is contained in:
Henry Weller
2016-02-15 15:49:05 +00:00
parent 3c185e6d43
commit 7c762bb90d
14 changed files with 56 additions and 98 deletions

View File

@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file

View File

@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file

View File

@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file

View File

@ -9,7 +9,6 @@ application=`getApplication`
runApplication $application
(cd validation && ./Allrun)
(cd validation && ./Allrun $*)
# ----------------------------------------------------------------- end-of-file

View 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
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)
# Do the LES case
cp lesFiles/Allrun motorBikeLES/
(cd motorBikeLES && foamRunTutorials)
fi
# ----------------------------------------------------------------- end-of-file

View File

@ -1,10 +0,0 @@
#!/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

View 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`

View File

@ -1,29 +1,32 @@
#!/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
)
(
cd mixerVessel || exit
./Allrun
./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

View File

@ -1,32 +0,0 @@
#!/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

View File

@ -1,9 +0,0 @@
#!/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

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
(
cd flange || exit
./Allrun
./Allrun $*
)
exit 0

View File

@ -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