diff --git a/tutorials/IO/fileHandler/Allrun b/tutorials/IO/fileHandler/Allrun
index 1f90a49f6b26bae3fa71d11c7285b159a35ef4e7..52d50e93fafbb3dc5f51643d6b7d6e54fda19909 100755
--- a/tutorials/IO/fileHandler/Allrun
+++ b/tutorials/IO/fileHandler/Allrun
@@ -2,6 +2,17 @@
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
+if isTest $@
+then
+ # Reset the controlDict
+ if [ -f system/controlDict.orig ]
+ then
+ echo "$0: restoring the controlDict from controlDict.orig"
+ mv system/controlDict.orig system/controlDict
+ fi
+fi
+
+
runApplication blockMesh
application=$(getApplication)
diff --git a/tutorials/IO/fileHandler/Alltest b/tutorials/IO/fileHandler/Alltest
deleted file mode 100755
index d5416642d47d45ed6574d8e5c7053f87ff97fe57..0000000000000000000000000000000000000000
--- a/tutorials/IO/fileHandler/Alltest
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-
-# Reset the controlDict
-if [ -f system/controlDict.orig ]
-then
- echo "$0: restoring the controlDict from controlDict.orig"
- mv system/controlDict.orig system/controlDict
-fi
-
-./Allrun
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/basic/overPotentialFoam/cylinder/Allrun b/tutorials/basic/overPotentialFoam/cylinder/Allrun
index 7604f9ad35a006852330ed91538222f0bd42f49b..606384c249f13caa7dd4af5bff9892326317f615 100755
--- a/tutorials/basic/overPotentialFoam/cylinder/Allrun
+++ b/tutorials/basic/overPotentialFoam/cylinder/Allrun
@@ -5,4 +5,4 @@
(cd cylinderMesh && ./Allrun.pre)
# Add background mesh
-(cd cylinderAndBackground && ./Allrun)
+(cd cylinderAndBackground && ./Allrun $*)
diff --git a/tutorials/combustion/XiFoam/RAS/Allrun b/tutorials/combustion/XiFoam/RAS/Allrun
index 213d7e066483e5ce31902fc3ac5de5a7c54714bc..6871fc1cc2223f54642d436f1e52ebd83d75dfe1 100755
--- a/tutorials/combustion/XiFoam/RAS/Allrun
+++ b/tutorials/combustion/XiFoam/RAS/Allrun
@@ -4,55 +4,56 @@ cd ${0%/*} || exit 1 # Run from this directory
setControlDict()
{
- sed \
- -e "s/\(deltaT[ \t]*\) 5e-06;/\1 1e-05;/g" \
- -e "s/\(endTime[ \t]*\) 0.005;/\1 0.015;/g" \
- -e "s/\(writeInterval[ \t]*\) 10;/\1 50;/g" \
- -i system/controlDict
+ foamDictionary -entry "deltaT" -set "1e-05" system/controlDict
+ foamDictionary -entry "endTime" -set "0.015" system/controlDict
+ foamDictionary -entry "writeInterval" -set "50" system/controlDict
}
setCombustionProperties()
{
- sed \
- -e "s/\(laminarFlameSpeedCorrelation[ \t]*\) Gulders;/\1 RaviPetersen;/g" \
- -e "s/\(fuel[ \t]*\) Propane;/\1 HydrogenInAir;/g" \
- -i constant/combustionProperties
+ foamDictionary -entry "laminarFlameSpeedCorrelation" \
+ -set "RaviPetersen" constant/combustionProperties
+ foamDictionary -entry "fuel" \
+ -set "HydrogenInAir" constant/combustionProperties
}
# Do moriyoshiHomogeneous
( cd moriyoshiHomogeneous && foamRunTutorials )
-# Clone case for second phase
-cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
-
-# Modify and execute
-(
- cd moriyoshiHomogeneousPart2 || exit
-
- # The following 2 command lines are a generic implementation of the
- # following command:
- # cp -r ../moriyoshiHomogeneous/0.005 .
-
- lastTimeStep=$(foamListTimes -case ../moriyoshiHomogeneous -latestTime)
- cp -r ../moriyoshiHomogeneous/$lastTimeStep .
-
- setControlDict
- runApplication $(getApplication)
-)
-
-# Clone case for hydrogen
-cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
-
-# Modify and execute
-(
- cd moriyoshiHomogeneousHydrogen || exit
-
- setCombustionProperties
- mv constant/thermophysicalProperties \
- constant/thermophysicalProperties.propane
- mv constant/thermophysicalProperties.hydrogen \
- constant/thermophysicalProperties
- runApplication $(getApplication)
-)
+if ! isTest $@
+then
+ # Clone case for second phase
+ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
+
+ # Modify and execute
+ (
+ cd moriyoshiHomogeneousPart2 || exit
+
+ # The following 2 command lines are a generic implementation of the
+ # following command:
+ # cp -r ../moriyoshiHomogeneous/0.005 .
+
+ lastTimeStep=$(foamListTimes -case ../moriyoshiHomogeneous -latestTime)
+ cp -r ../moriyoshiHomogeneous/$lastTimeStep .
+
+ setControlDict
+ runApplication $(getApplication)
+ )
+
+ # Clone case for hydrogen
+ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
+
+ # Modify and execute
+ (
+ cd moriyoshiHomogeneousHydrogen || exit
+
+ setCombustionProperties
+ mv constant/thermophysicalProperties \
+ constant/thermophysicalProperties.propane
+ mv constant/thermophysicalProperties.hydrogen \
+ constant/thermophysicalProperties
+ runApplication $(getApplication)
+ )
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun
index 192618695d35623fd02a3adf040de68de371af1a..822fbd8972c5f3d0ea0870daf333480c33f75045 100755
--- a/tutorials/combustion/chemFoam/gri/Allrun
+++ b/tutorials/combustion/chemFoam/gri/Allrun
@@ -9,6 +9,9 @@ runApplication chemkinToFoam \
runApplication $(getApplication)
-(cd validation && ./Allrun $*)
+if ! isTest $@
+then
+ (cd validation && ./Allrun $*)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun
index bf06d218a86fce91c7f35af8883679cf4d1267d7..d0f65aed57120d019a891d54b1736d9fb97e3264 100755
--- a/tutorials/combustion/chemFoam/h2/Allrun
+++ b/tutorials/combustion/chemFoam/h2/Allrun
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication)
-(cd validation && ./Allrun $*)
+if ! isTest $@
+then
+ (cd validation && ./Allrun $*)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun
index bf06d218a86fce91c7f35af8883679cf4d1267d7..d0f65aed57120d019a891d54b1736d9fb97e3264 100755
--- a/tutorials/combustion/chemFoam/ic8h18/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18/Allrun
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication)
-(cd validation && ./Allrun $*)
+if ! isTest $@
+then
+ (cd validation && ./Allrun $*)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
index bf06d218a86fce91c7f35af8883679cf4d1267d7..d0f65aed57120d019a891d54b1736d9fb97e3264 100755
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication)
-(cd validation && ./Allrun $*)
+if ! isTest $@
+then
+ (cd validation && ./Allrun $*)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun
index bf06d218a86fce91c7f35af8883679cf4d1267d7..d0f65aed57120d019a891d54b1736d9fb97e3264 100755
--- a/tutorials/combustion/chemFoam/nc7h16/Allrun
+++ b/tutorials/combustion/chemFoam/nc7h16/Allrun
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication $(getApplication)
-(cd validation && ./Allrun $*)
+if ! isTest $@
+then
+ (cd validation && ./Allrun $*)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
index c09ed1e6e3efcac7f098e8a97e64df0f7629ef76..7916c6e143fdfd95e2325e53a1472b8b32409b70 100755
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
@@ -21,6 +21,9 @@ runParallel $(getApplication)
paraFoam -touch
paraFoam -touch -region panelRegion
-(cd validation && ./createGraphs)
+if ! isTest $@
+then
+ (cd validation && ./createGraphs)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
index 6299aedeab7a4c63664f091a4145ba57c73b18d0..37f0be5d56bd57cd5ca6918894c54739a3f1589f 100755
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
@@ -5,8 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Application name
application=$(getApplication)
-rm -f 0
-cp -r 0.orig 0
+restore0Dir
runApplication chemkinToFoam \
chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties \
@@ -15,20 +14,27 @@ runApplication chemkinToFoam \
runApplication blockMesh
runApplication setFields
+if isTest $@
+then
+ # Test without chemistry
+ foamDictionary -entry "chemistry" -set "off" constant/chemistryProperties
+ runApplication $application
+else
+ # Run the application without chemistry until 1500 to let the flow field
+ # develop
+ foamDictionary -entry "writeInterval" -set "1500" system/controlDict
+ foamDictionary -entry "endTime" -set "1500" system/controlDict
+ foamDictionary -entry "chemistry" -set "off" constant/chemistryProperties
-# Run the application without chemistry until 1500 to let the flow field develop
-foamDictionary -entry "writeInterval" -set "1500" system/controlDict
-foamDictionary -entry "endTime" -set "1500" system/controlDict
-foamDictionary -entry "chemistry" -set "off" constant/chemistryProperties
+ runApplication $application
-runApplication $application
+ # Run with chemistry until flame reach its full size
+ foamDictionary -entry "writeInterval" -set "100" system/controlDict
+ foamDictionary -entry "endTime" -set "5000" system/controlDict
+ foamDictionary -entry "chemistry" -set "on" constant/chemistryProperties
-# Run with chemistry until flame reach its full size
-foamDictionary -entry "writeInterval" -set "100" system/controlDict
-foamDictionary -entry "endTime" -set "5000" system/controlDict
-foamDictionary -entry "chemistry" -set "on" constant/chemistryProperties
-
-runApplication -o $application
+ runApplication -o $application
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun
index 7604f9ad35a006852330ed91538222f0bd42f49b..606384c249f13caa7dd4af5bff9892326317f615 100755
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun
@@ -5,4 +5,4 @@
(cd cylinderMesh && ./Allrun.pre)
# Add background mesh
-(cd cylinderAndBackground && ./Allrun)
+(cd cylinderAndBackground && ./Allrun $*)
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
index 8143eddba2bb6037fb48813abc8507770373f479..63008fb09342b88767b98a03bcb7246fda02c7b7 100755
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
@@ -29,20 +29,23 @@ run resolved
# Run with the plenum modelled by a boundary condition
run modelled
-# Plot a comparison of the pressure in the neck
-cat << EOF | gnuplot -persist
+if ! isTest $@
+then
+ # Plot a comparison of the pressure in the neck
+ cat << EOF | gnuplot -persist
-set terminal postscript eps size 5,4 enhanced color
+ set terminal postscript eps size 5,4 enhanced color
-set xlabel "Time (s)"
-set ylabel "Guage pressure in the neck (Pa)"
+ set xlabel "Time (s)"
+ set ylabel "Guage pressure in the neck (Pa)"
-set output "pressure.eps"
+ set output "pressure.eps"
-plot \
- "resolved/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Resolved Plenum" w l, \
- "modelled/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Modelled Plenum" w l
+ plot \
+ "resolved/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Resolved Plenum" w l, \
+ "modelled/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Modelled Plenum" w l
EOF
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index f7f2c64c0426d3592e1518dc11092579cd0a6ca0..81160eeefcf014d726587ddb5da511ddc932b75e 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -26,18 +26,21 @@ setDecompressionTankFine()
# Do decompressionTank
( cd decompressionTank && foamRunTutorials )
-# Clone case
-cloneCase decompressionTank decompressionTankFine
-
-(
- cd decompressionTankFine || exit
-
- # Modify case
- setDecompressionTankFine
-
- # And execute
- runApplication blockMesh
- runApplication $(getApplication)
-)
+if ! isTest $@
+then
+ # Clone case
+ cloneCase decompressionTank decompressionTankFine
+
+ (
+ cd decompressionTankFine || exit
+
+ # Modify case
+ setDecompressionTankFine
+
+ # And execute
+ runApplication blockMesh
+ runApplication $(getApplication)
+ )
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
index 4abae23d19bcb2706da8e2d48864a34acaee5343..e36ed26058e87654fcca5a5bec7e9a0765994441 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@@ -6,6 +6,9 @@ runApplication blockMesh
runApplication $(getApplication)
runApplication -s sample postProcess -latestTime -func sample
-runApplication validation/createGraphs
+if ! istest $@
+then
+ runApplication validation/createGraphs
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
index 0a453a027990ba66250504e61c14656e2768e54a..03f8f41f8f847fb7614d338ec6d3e94e5a0f4ee5 100755
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -32,37 +32,39 @@ do
rm -rf logs
done
-
-# create validation plot
-# Test if gnuplot exists on the system
-command -v gnuplot >/dev/null 2>&1 || {
- echo "gnuplot not found - skipping graph creation" 1>&2
- exit 1
-}
-
-graphName="OF_vs_ANALYTICAL.eps"
-
-echo "Creating graph of u+ vs y+ to $graphName"
-gnuplot<<EOF
- set terminal postscript eps color enhanced
- set output "$graphName"
- set grid
- set xlabel "y+"
- set ylabel "u+"
- set key top left
- set size 0.75, 0.75
- set parametric
- # u+ range
- set trange [0:35]
- # Spaldings law
- k=0.41
- E=9.8
- f(t) = t + 1/E*(exp(k*t) - 1 - k*t*(1 + 0.5*k*t) - 1/6*k*t**3)
- set logscale x
- set format x "10^{%T}"
- plot f(t),t title "Spalding" with lines linetype -1, \
- "yPlus_vs_uPlus" title "OpenFOAM" with points lt 1 pt 6
+if ! isTest $@
+then
+ # create validation plot
+ # Test if gnuplot exists on the system
+ command -v gnuplot >/dev/null 2>&1 || {
+ echo "gnuplot not found - skipping graph creation" 1>&2
+ exit 1
+ }
+
+ graphName="OF_vs_ANALYTICAL.eps"
+
+ echo "Creating graph of u+ vs y+ to $graphName"
+ gnuplot<<EOF
+ set terminal postscript eps color enhanced
+ set output "$graphName"
+ set grid
+ set xlabel "y+"
+ set ylabel "u+"
+ set key top left
+ set size 0.75, 0.75
+ set parametric
+ # u+ range
+ set trange [0:35]
+ # Spaldings law
+ k=0.41
+ E=9.8
+ f(t) = t + 1/E*(exp(k*t) - 1 - k*t*(1 + 0.5*k*t) - 1/6*k*t**3)
+ set logscale x
+ set format x "10^{%T}"
+ plot f(t),t title "Spalding" with lines linetype -1, \
+ "yPlus_vs_uPlus" title "OpenFOAM" with points lt 1 pt 6
EOF
+fi
echo Done
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun b/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun
index 5758f00725125eed6759ad14dae03071a82639a1..a98fd76068981a93b833e87d7ff2d2fe6b540142 100755
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
(cd cylinderMesh && ./Allrun.pre)
# Add background mesh
-(cd cylinderAndBackground && ./Allrun)
+(cd cylinderAndBackground && ./Allrun $*)
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
index 89808888c0e2bf0641a249246c122c9eb36fc627..f708e6cfc09a6dd28f25ac52c8c0f60f6e1c6d63 100755
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
@@ -15,7 +15,12 @@ runParallel $(getApplication)
# Run noise tool for both point and surface
-runParallel -s point noise -dict system/noiseDict-point
+if ! isTest $@
+then
+ runParallel -s point noise -dict system/noiseDict-point
+
+ runParallel -s surface noise -dict system/noiseDict-surface
+fi
+
-runParallel -s surface noise -dict system/noiseDict-surface
#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Alltest b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Alltest
deleted file mode 100755
index ab2855196f2dab15ed344a954fba5aabbacab3ca..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Alltest
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-
-rm -f system/blockMeshDict
-m4 system/blockMeshDict.m4 > system/blockMeshDict
-
-runApplication blockMesh
-
-restore0Dir
-
-runApplication decomposePar
-
-runParallel $(getApplication)
-
-# Note: not running the noise utility since no pressure data will be generated
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
index 5588e4ecd039e0dbbc6a6ed27464e53074ccc54b..aab521bd8260a4c406d3d10ea2064adef415362e 100755
--- a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
@@ -24,21 +24,25 @@ setDamBreakFine ()
# Do damBreak
(cd damBreak && foamRunTutorials)
-# Clone case
-cloneCase damBreak damBreakFine
-(
- cd damBreakFine || exit
+if ! isTest $@
+then
+ # Clone case
+ cloneCase damBreak damBreakFine
- # Modify case
- setDamBreakFine
- \cp ../damBreak/0/alpha.water.orig 0/alpha.water
- # And execute
- runApplication blockMesh
- runApplication setFields
- runApplication decomposePar
- runParallel $(getApplication)
- runApplication reconstructPar
-)
+ (
+ cd damBreakFine || exit
+
+ # Modify case
+ setDamBreakFine
+ \cp ../damBreak/0/alpha.water.orig 0/alpha.water
+ # And execute
+ runApplication blockMesh
+ runApplication setFields
+ runApplication decomposePar
+ runParallel $(getApplication)
+ runApplication reconstructPar
+ )
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
index 5588e4ecd039e0dbbc6a6ed27464e53074ccc54b..91244246c5329cad850323f2b919540f4609975b 100755
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
@@ -24,21 +24,24 @@ setDamBreakFine ()
# Do damBreak
(cd damBreak && foamRunTutorials)
-# Clone case
-cloneCase damBreak damBreakFine
+if ! isTest $@
+then
+ # Clone case
+ cloneCase damBreak damBreakFine
-(
- cd damBreakFine || exit
+ (
+ cd damBreakFine || exit
- # Modify case
- setDamBreakFine
- \cp ../damBreak/0/alpha.water.orig 0/alpha.water
- # And execute
- runApplication blockMesh
- runApplication setFields
- runApplication decomposePar
- runParallel $(getApplication)
- runApplication reconstructPar
-)
+ # Modify case
+ setDamBreakFine
+ \cp ../damBreak/0/alpha.water.orig 0/alpha.water
+ # And execute
+ runApplication blockMesh
+ runApplication setFields
+ runApplication decomposePar
+ runParallel $(getApplication)
+ runApplication reconstructPar
+ )
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun
index a9796a5b0f0a4b4944702333aeed5358f80c3299..a7486bdf9586884d0cfbff39063b4a0c187594ee 100755
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun
@@ -2,8 +2,13 @@
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-(cd eulerianInjection && ./Allrun)
-(cd lagrangianParticleInjection && ./Allrun)
-(cd lagrangianDistributionInjection && ./Allrun)
+(cd eulerianInjection && ./Allrun $*)
+
+if ! isTest $@
+then
+ # Note: particle data only available if running complete case
+ (cd lagrangianParticleInjection && ./Allrun $*)
+ (cd lagrangianDistributionInjection && ./Allrun $*)
+fi
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Alltest b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Alltest
deleted file mode 100755
index e1e7226b2266ab36a4671693679efc0e9868801d..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Alltest
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-
-(cd eulerianInjection && ./Allrun)
-
-# Note: only running the Eulerian test - particle data not yet available
-# (after 1 iter) for subsequent Lagrangian cases
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun b/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
index c15cbc2e04075dc8348f24c27c589275ac6b136e..19627902c5491b1c85764859a6929aa746b6a313 100755
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
@@ -4,6 +4,8 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+params=$@
+
runApplication blockMesh
cat system/schemesToTest | while read scheme
@@ -16,6 +18,9 @@ do
runApplication -s ${schemeTag} scalarTransportFoam
- # Save the line plot
- mv postProcessing/sample1/100/line1_T.xy line1_T_${schemeTag}.xy
+ if ! isTest $params
+ then
+ # Save the line plot
+ mv postProcessing/sample1/100/line1_T.xy line1_T_${schemeTag}.xy
+ fi
done