TUT: verificationAndValidation Allrun uses bash

STYLE: double-quote "$@" for isTest/notTest
2020-03-30 21:14:29 +02:00 · 2020-03-30 21:14:29 +02:00 · 9b1c0786ce
commit 9b1c0786ce
parent 8a4ea197cd
36 changed files with 50 additions and 43 deletions
--- a/tutorials/IO/fileHandler/Allrun
+++ b/tutorials/IO/fileHandler/Allrun
@ -3,7 +3,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------

-if isTest $@
+if isTest "$@"
 then
    # Reset the controlDict
    if [ -f system/controlDict.orig ]
--- a/tutorials/combustion/XiFoam/RAS/Allrun
+++ b/tutorials/combustion/XiFoam/RAS/Allrun
@ -24,7 +24,7 @@ setCombustionProperties()
 # Do moriyoshiHomogeneous
 ( cd moriyoshiHomogeneous && foamRunTutorials )

-if notTest $@
+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 notTest $@
+if notTest "$@"
 then
    (cd validation && ./Allrun $*)
 fi
--- a/tutorials/combustion/chemFoam/h2/Allrun
+++ b/tutorials/combustion/chemFoam/h2/Allrun
@ -5,7 +5,7 @@ cd "${0%/*}" || exit                                # Run from this directory

 runApplication $(getApplication)

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

 runApplication $(getApplication)

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

 runApplication $(getApplication)

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

 runApplication $(getApplication)

-if notTest $@
+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 notTest $@
+if notTest "$@"
 then
    (cd validation && ./createGraphs)
 fi
--- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
+++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
@ -15,7 +15,7 @@ runApplication chemkinToFoam \
 runApplication blockMesh
 runApplication setFields

-if isTest $@
+if isTest "$@"
 then
    # Test without chemistry
    foamDictionary constant/chemistryProperties -entry chemistry -set off
--- 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 notTest $@
+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
@ -27,7 +27,7 @@ setDecompressionTankFine()
 # Do decompressionTank
 ( cd decompressionTank && foamRunTutorials )

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

-if notTest $@
+if notTest "$@"
 then
    runApplication validation/createGraphs
 fi
--- a/tutorials/incompressible/adjointOptimisationFoam/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/Allrun
@ -3,7 +3,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------

-if notTest $@
+if notTest "$@"
 then
    foamRunTutorials -skipFirst
 else
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@ -33,7 +33,7 @@ do
    rm -rf logs
 done

-if notTest $@
+if notTest "$@"
 then
    # create validation plot

--- 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 notTest $@
+if notTest "$@"
 then
    latestTime=$(\cd steady && foamListTimes -noZero -latestTime -processor)

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

-if notTest $@
+if notTest "$@"
 then
    # Copy/link the steady-state case to movement
    linkParallelCase steady movement
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun
@ -26,7 +26,7 @@ runApplication blockMesh
 runApplication decomposePar
 runParallel $(getApplication)

-if notTest $@
+if notTest "$@"
 then
    # create validation plot

--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
@ -14,7 +14,7 @@ runParallel $(getApplication)

 # Run noise tool for both point and surface

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

--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun
@ -10,7 +10,7 @@ Stokes
 "

 endTime=2
-if notTest $@
+if notTest "$@"
 then
    endTime=25
 fi
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/Allrun
@ -6,7 +6,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 # Do the Spalart-Allmaras steady-state case
 (cd motorBike && foamRunTutorials)

-if notTest $@
+if notTest "$@"
 then
    # Clone the steady-state case to the LES case
    cloneParallelCase motorBike motorBikeLES
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun
@ -6,7 +6,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 runApplication blockMesh
 runApplication simpleFoam

-if notTest $@
+if notTest "$@"
 then
    # Create validation plots

--- a/tutorials/incompressible/simpleFoam/bump2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/bump2D/Allrun
@ -47,7 +47,7 @@ extractVal()
 }


-# Possibly disable for test: if notTest $@
+# Possibly disable for test: if notTest "$@"

 if :
 then
--- a/tutorials/incompressible/simpleFoam/bump2D/plot
+++ b/tutorials/incompressible/simpleFoam/bump2D/plot
@ -92,7 +92,7 @@ PLT_CP
 }


-if notTest $@
+if notTest "$@"
 then
    # Create validation plots

--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun
@ -3,7 +3,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------

-if notTest $@
+if notTest "$@"
 then
    models="
    kOmegaSST
--- a/tutorials/mesh/foamyHexMesh/Allrun
+++ b/tutorials/mesh/foamyHexMesh/Allrun
@ -10,7 +10,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 ( cd blob && ./Allrun $* )
 ( cd simpleShapes && ./Allrun $* )

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


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

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

 (cd eulerianInjection && ./Allrun $*)

-if notTest $@
+if notTest "$@"
 then
    # Note: particle data only available if running complete case
    (cd lagrangianParticleInjection && ./Allrun $*)
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun
@ -8,7 +8,7 @@ application=$(getApplication)
 runApplication blockMesh
 runApplication $application

-if notTest $@
+if notTest "$@"
 then
    foamDictionary system/controlDict -entry endTime -set 4
    foamDictionary system/controlDict -entry startTime -set 0.5
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun
@ -8,7 +8,7 @@ application=$(getApplication)
 runApplication blockMesh
 runApplication $application

-if notTest $@
+if notTest "$@"
 then
    foamDictionary system/controlDict -entry endTime -set 4
    foamDictionary system/controlDict -entry startTime -set 0.5
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/Allrun
@ -6,7 +6,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 runApplication blockMesh
 runApplication $(getApplication)

-if notTest $@
+if notTest "$@"
 then
    foamDictionary system/controlDict -entry endTime -set 4
    foamDictionary 2/T.liquid -entry boundaryField/wall2/q -set 'uniform 1e5'
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun
@ -8,7 +8,7 @@ application=$(getApplication)
 runApplication blockMesh
 runApplication $application

-if notTest $@
+if notTest "$@"
 then
    foamDictionary system/controlDict -entry endTime -set 4
    foamDictionary system/controlDict -entry startTime -set 0.5
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/Allrun
@ -6,7 +6,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 runApplication blockMesh
 runApplication $(getApplication)

-if notTest $@
+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
@ -1,27 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------

-params=$@
+# Save the line plot
+unset savePlots
+
+if notTest "$@"
+then
+    savePlots=true
+fi
+

 runApplication blockMesh

-cat system/schemesToTest | while read scheme
+while read -r scheme
 do
    echo "Updating fvSchemes to use $scheme"
    sed "s/DIVSCHEME/$scheme/g" system/fvSchemes.template > system/fvSchemes

    # Create a sanitised name for the scheme - remove 'special' characters
-    schemeTag=$(sed -e 's# #_#g#' -e 's#(##g' -e 's#)##g' -e 's#\.##g' <<< "$scheme")
+    schemeTag=$(sed -e 's# #_#g#' -e 's#[.()]##g' <<< "$scheme")

-    runApplication -s ${schemeTag} scalarTransportFoam
+    runApplication -s "${schemeTag}" scalarTransportFoam

-    if notTest $params
+    if [ "$savePlots" = true ]
    then
        # 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
    fi
-done
+done < system/schemesToTest

 #------------------------------------------------------------------------------
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/plot
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/plot
@ -71,7 +71,7 @@ GNUPLOT
 }


-if notTest $@
+if notTest "$@"
 then
    # Create validation plots

--- a/tutorials/verificationAndValidation/turbulentInflow/Allrun
+++ b/tutorials/verificationAndValidation/turbulentInflow/Allrun
@ -6,7 +6,7 @@ cd "${0%/*}" || exit                                # Run from this directory

 endTime=10
 \cp system/controlDict.template system/controlDict
-if notTest $@
+if notTest "$@"
 then
    endTime=85
 fi