TUT: test mode not respected (closes #710)

- now replaced 'if ! isTest' with 'if notTest' for most cases.
2025-11-28 03:28:01 +00:00 · 2018-02-20 12:54:44 +01:00
parent 63edb6024b
commit fe140cd6c5
24 changed files with 36 additions and 27 deletions
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@ -3,7 +3,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    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
 #     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()
 {
@ -34,7 +34,7 @@ isParallel()


 #
-# Look for '-test' in the argument list.
+# Check presence of '-test' in the argument list.
 #
 isTest()
 {
@ -42,6 +42,15 @@ isTest()
    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
--- a/tutorials/combustion/XiFoam/RAS/Allrun
+++ b/tutorials/combustion/XiFoam/RAS/Allrun
@ -20,7 +20,7 @@ setCombustionProperties()
 # Do moriyoshiHomogeneous
 ( cd moriyoshiHomogeneous && foamRunTutorials )

-if ! isTest $@
+if notTest $@
 then
    # Clone case for second phase
    cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
--- a/tutorials/combustion/chemFoam/gri/Allrun
+++ b/tutorials/combustion/chemFoam/gri/Allrun
@ -9,7 +9,7 @@ runApplication chemkinToFoam \

 runApplication $(getApplication)

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

 runApplication $(getApplication)

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

 runApplication $(getApplication)

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

 runApplication $(getApplication)

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

 runApplication $(getApplication)

-if ! isTest $@
+if notTest $@
 then
    (cd validation && ./Allrun $*)
 fi
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
@ -21,7 +21,7 @@ runParallel $(getApplication)
 paraFoam -touch
 paraFoam -touch -region panelRegion

-if ! isTest $@
+if notTest $@
 then
    (cd validation && ./createGraphs)
 fi
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
@ -8,8 +8,8 @@ application=$(getApplication)
 restore0Dir

 runApplication chemkinToFoam \
-               chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties \
-               constant/reactionsGRI constant/thermo.compressibleGasGRI
+    chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties \
+    constant/reactionsGRI constant/thermo.compressibleGasGRI

 runApplication blockMesh
 runApplication setFields
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
@ -29,7 +29,7 @@ run resolved
 # Run with the plenum modelled by a boundary condition
 run modelled

-if ! isTest $@
+if notTest $@
 then
    # Plot a comparison of the pressure in the neck
    cat << EOF | gnuplot -persist
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@ -26,7 +26,7 @@ setDecompressionTankFine()
 # Do decompressionTank
 ( cd decompressionTank && foamRunTutorials )

-if ! isTest $@
+if notTest $@
 then
    # Clone case
    cloneCase decompressionTank decompressionTankFine
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@ -6,7 +6,7 @@ runApplication blockMesh
 runApplication $(getApplication)
 runApplication -s sample  postProcess -latestTime -func sample

-if ! istest $@
+if notTest $@
 then
    runApplication validation/createGraphs
 fi
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@ -32,7 +32,7 @@ do
    rm -rf logs
 done

-if ! isTest $@
+if notTest $@
 then
    # create validation plot
    # Test if gnuplot exists on the system
--- a/tutorials/incompressible/lumpedPointMotion/building/Allrun
+++ b/tutorials/incompressible/lumpedPointMotion/building/Allrun
@ -75,7 +75,7 @@ copyParallelPointDisplacement()
 # Do steady-state case
 (cd steady && foamRunTutorials)

-if ! isTest $@
+if notTest $@
 then
    latestTime=$(cd steady && foamListTimes -noZero -latestTime -processor)

--- a/tutorials/incompressible/lumpedPointMotion/building/Allrun.move
+++ b/tutorials/incompressible/lumpedPointMotion/building/Allrun.move
@ -51,7 +51,7 @@ linkParallelCase()
 # Do steady-state case
 (cd steady && ./Allrun.pre)

-if ! isTest $@
+if notTest $@
 then
    # Copy/link the steady-state case to movement
    linkParallelCase steady movement
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
@ -15,7 +15,7 @@ runParallel $(getApplication)

 # Run noise tool for both point and surface

-if ! isTest $@
+if notTest $@
 then
    runParallel -s point noise -dict system/noiseDict-point

--- a/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun
@ -5,7 +5,7 @@ cd ${0%/*} || exit 1                        # Run from this directory
 # Do the Spalart-Allmaras steady-state case
 (cd motorBike && foamRunTutorials)

-if ! isTest $@
+if notTest $@
 then
    # Clone the steady-state case to the LES case
    cloneParallelCase motorBike motorBikeLES
--- a/tutorials/mesh/foamyHexMesh/Allrun
+++ b/tutorials/mesh/foamyHexMesh/Allrun
@ -9,7 +9,7 @@ cd ${0%/*} || exit 1                        # Run from this directory
 ( cd blob && ./Allrun $* )
 ( cd simpleShapes && ./Allrun $* )

-if ! isTest $@
+if notTest $@
 then
    ( cd flange && ./Allrun $* )
    ( cd mixerVessel && ./Allrun $* )
--- a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun
@ -25,7 +25,7 @@ setDamBreakFine ()
 (cd damBreak && foamRunTutorials)


-if ! isTest $@
+if notTest $@
 then
    # Clone case
    cloneCase damBreak damBreakFine
--- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun
@ -24,7 +24,7 @@ setDamBreakFine ()
 # Do damBreak
 (cd damBreak && foamRunTutorials)

-if ! isTest $@
+if notTest $@
 then
    # Clone case
    cloneCase damBreak damBreakFine
--- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/Allrun
@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                        # Run from this directory

 (cd eulerianInjection && ./Allrun $*)

-if ! isTest $@
+if notTest $@
 then
    # Note: particle data only available if running complete case
    (cd lagrangianParticleInjection && ./Allrun $*)
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
@ -5,7 +5,7 @@ cd ${0%/*} || exit 1                        # Run from this directory
 runApplication blockMesh
 runApplication $(getApplication)

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

-if ! isTest $@
+if notTest $@
 then
    foamDictionary system/controlDict -entry endTime -set 5
    foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5'
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
@ -18,7 +18,7 @@ do

    runApplication -s ${schemeTag} scalarTransportFoam

-    if ! isTest $params
+    if notTest $params
    then
        # Save the line plot
        mv postProcessing/sample1/100/line1_T.xy line1_T_${schemeTag}.xy