TUT: test mode not respected (closes #710)

- now replaced 'if ! isTest' with 'if notTest' for most cases.
This commit is contained in:
Mark Olesen
2018-02-20 12:54:44 +01:00
parent 63edb6024b
commit fe140cd6c5
24 changed files with 36 additions and 27 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-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -24,7 +24,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# Look for '-parallel' in the argument list. # Check presence of '-parallel' in the argument list.
# #
isParallel() isParallel()
{ {
@ -34,7 +34,7 @@ isParallel()
# #
# Look for '-test' in the argument list. # Check presence of '-test' in the argument list.
# #
isTest() isTest()
{ {
@ -42,6 +42,15 @@ isTest()
return 1 return 1
} }
#
# Check absence of '-test' in the argument list.
#
notTest()
{
for i; do [ "$i" = "-test" ] && return 1; done
return 0
}
# #
# Extract 'numberOfSubdomains' from system/decomposeParDict # Extract 'numberOfSubdomains' from system/decomposeParDict

View File

@ -20,7 +20,7 @@ setCombustionProperties()
# Do moriyoshiHomogeneous # Do moriyoshiHomogeneous
( cd moriyoshiHomogeneous && foamRunTutorials ) ( cd moriyoshiHomogeneous && foamRunTutorials )
if ! isTest $@ if notTest $@
then then
# Clone case for second phase # Clone case for second phase
cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2 cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2

View File

@ -9,7 +9,7 @@ runApplication chemkinToFoam \
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
(cd validation && ./Allrun $*) (cd validation && ./Allrun $*)
fi fi

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
(cd validation && ./Allrun $*) (cd validation && ./Allrun $*)
fi fi

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
(cd validation && ./Allrun $*) (cd validation && ./Allrun $*)
fi fi

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
(cd validation && ./Allrun $*) (cd validation && ./Allrun $*)
fi fi

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
(cd validation && ./Allrun $*) (cd validation && ./Allrun $*)
fi fi

View File

@ -21,7 +21,7 @@ runParallel $(getApplication)
paraFoam -touch paraFoam -touch
paraFoam -touch -region panelRegion paraFoam -touch -region panelRegion
if ! isTest $@ if notTest $@
then then
(cd validation && ./createGraphs) (cd validation && ./createGraphs)
fi fi

View File

@ -8,8 +8,8 @@ application=$(getApplication)
restore0Dir restore0Dir
runApplication chemkinToFoam \ runApplication chemkinToFoam \
chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties \ chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties \
constant/reactionsGRI constant/thermo.compressibleGasGRI constant/reactionsGRI constant/thermo.compressibleGasGRI
runApplication blockMesh runApplication blockMesh
runApplication setFields runApplication setFields

View File

@ -29,7 +29,7 @@ run resolved
# Run with the plenum modelled by a boundary condition # Run with the plenum modelled by a boundary condition
run modelled run modelled
if ! isTest $@ if notTest $@
then then
# Plot a comparison of the pressure in the neck # Plot a comparison of the pressure in the neck
cat << EOF | gnuplot -persist cat << EOF | gnuplot -persist

View File

@ -26,7 +26,7 @@ setDecompressionTankFine()
# Do decompressionTank # Do decompressionTank
( cd decompressionTank && foamRunTutorials ) ( cd decompressionTank && foamRunTutorials )
if ! isTest $@ if notTest $@
then then
# Clone case # Clone case
cloneCase decompressionTank decompressionTankFine cloneCase decompressionTank decompressionTankFine

View File

@ -6,7 +6,7 @@ runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
runApplication -s sample postProcess -latestTime -func sample runApplication -s sample postProcess -latestTime -func sample
if ! istest $@ if notTest $@
then then
runApplication validation/createGraphs runApplication validation/createGraphs
fi fi

View File

@ -32,7 +32,7 @@ do
rm -rf logs rm -rf logs
done done
if ! isTest $@ if notTest $@
then then
# create validation plot # create validation plot
# Test if gnuplot exists on the system # Test if gnuplot exists on the system

View File

@ -75,7 +75,7 @@ copyParallelPointDisplacement()
# Do steady-state case # Do steady-state case
(cd steady && foamRunTutorials) (cd steady && foamRunTutorials)
if ! isTest $@ if notTest $@
then then
latestTime=$(cd steady && foamListTimes -noZero -latestTime -processor) latestTime=$(cd steady && foamListTimes -noZero -latestTime -processor)

View File

@ -51,7 +51,7 @@ linkParallelCase()
# Do steady-state case # Do steady-state case
(cd steady && ./Allrun.pre) (cd steady && ./Allrun.pre)
if ! isTest $@ if notTest $@
then then
# Copy/link the steady-state case to movement # Copy/link the steady-state case to movement
linkParallelCase steady movement linkParallelCase steady movement

View File

@ -15,7 +15,7 @@ runParallel $(getApplication)
# Run noise tool for both point and surface # Run noise tool for both point and surface
if ! isTest $@ if notTest $@
then then
runParallel -s point noise -dict system/noiseDict-point runParallel -s point noise -dict system/noiseDict-point

View File

@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Do the Spalart-Allmaras steady-state case # Do the Spalart-Allmaras steady-state case
(cd motorBike && foamRunTutorials) (cd motorBike && foamRunTutorials)
if ! isTest $@ if notTest $@
then then
# Clone the steady-state case to the LES case # Clone the steady-state case to the LES case
cloneParallelCase motorBike motorBikeLES cloneParallelCase motorBike motorBikeLES

View File

@ -9,7 +9,7 @@ cd ${0%/*} || exit 1 # Run from this directory
( cd blob && ./Allrun $* ) ( cd blob && ./Allrun $* )
( cd simpleShapes && ./Allrun $* ) ( cd simpleShapes && ./Allrun $* )
if ! isTest $@ if notTest $@
then then
( cd flange && ./Allrun $* ) ( cd flange && ./Allrun $* )
( cd mixerVessel && ./Allrun $* ) ( cd mixerVessel && ./Allrun $* )

View File

@ -25,7 +25,7 @@ setDamBreakFine ()
(cd damBreak && foamRunTutorials) (cd damBreak && foamRunTutorials)
if ! isTest $@ if notTest $@
then then
# Clone case # Clone case
cloneCase damBreak damBreakFine cloneCase damBreak damBreakFine

View File

@ -24,7 +24,7 @@ setDamBreakFine ()
# Do damBreak # Do damBreak
(cd damBreak && foamRunTutorials) (cd damBreak && foamRunTutorials)
if ! isTest $@ if notTest $@
then then
# Clone case # Clone case
cloneCase damBreak damBreakFine cloneCase damBreak damBreakFine

View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
(cd eulerianInjection && ./Allrun $*) (cd eulerianInjection && ./Allrun $*)
if ! isTest $@ if notTest $@
then then
# Note: particle data only available if running complete case # Note: particle data only available if running complete case
(cd lagrangianParticleInjection && ./Allrun $*) (cd lagrangianParticleInjection && ./Allrun $*)

View File

@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
foamDictionary system/controlDict -entry endTime -set 5 foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5' foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5'

View File

@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh runApplication blockMesh
runApplication $(getApplication) runApplication $(getApplication)
if ! isTest $@ if notTest $@
then then
foamDictionary system/controlDict -entry endTime -set 5 foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5' foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5'

View File

@ -18,7 +18,7 @@ do
runApplication -s ${schemeTag} scalarTransportFoam runApplication -s ${schemeTag} scalarTransportFoam
if ! isTest $params if notTest $params
then then
# Save the line plot # Save the line plot
mv postProcessing/sample1/100/line1_T.xy line1_T_${schemeTag}.xy mv postProcessing/sample1/100/line1_T.xy line1_T_${schemeTag}.xy