zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tutorials: Prevent foamDictionary output from printing during test loop

Browse Source 
foamDictionary executions are now wrapped by runApplication like any
other execution so that they do not print during a test loop.
foamDictionary does not produce a conforming log, however, so
log.foamDictionary has been filtered out of the formation of the test
loop report so that false failures are not reported.
This commit is contained in:
Will Bainbridge
2020-07-24 12:32:42 +01:00
parent bf7ade04d8
commit 36731b2fe9
19 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/Allrun
View File

@ -14,7 +14,8 @@ setInertY()
y=${1%.*} y=${1%.*}
phase=${1#*.} phase=${1#*.}
[ $y != "none" ] && arg="-set $y" || arg="-remove" [ $y != "none" ] && arg="-set $y" || arg="-remove"
foamDictionary -entry inertSpecie $arg constant/thermophysicalProperties.$phase runApplication -a foamDictionary -entry inertSpecie $arg \
constant/thermophysicalProperties.$phase
} }
for gY in $gYs for gY in $gYs

7
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/Allrun
View File

@ -18,7 +18,8 @@ setInertY()
* ) arg="-set $y";; * ) arg="-set $y";;
esac esac
foamDictionary -entry inertSpecie $arg constant/thermophysicalProperties.$phase runApplication -a foamDictionary -entry inertSpecie $arg \
constant/thermophysicalProperties.$phase
} }
setThermoAndEnergy() setThermoAndEnergy()
@ -32,7 +33,7 @@ setThermoAndEnergy()
* ) exit 1;; * ) exit 1;;
esac esac
foamDictionary -entry thermoType.thermo -set $thermo \ runApplication -a foamDictionary -entry thermoType.thermo -set $thermo \
constant/thermophysicalProperties.$phase constant/thermophysicalProperties.$phase
case $he in case $he in
@ -41,7 +42,7 @@ setThermoAndEnergy()
* ) exit 1;; * ) exit 1;;
esac esac
foamDictionary -entry thermoType.energy -set $energy \ runApplication -a foamDictionary -entry thermoType.energy -set $energy \
constant/thermophysicalProperties.$phase constant/thermophysicalProperties.$phase
} }

4
test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/Allrun
View File

@ -12,7 +12,7 @@ setThermoAndEnergy()
he=${1%.*} he=${1%.*}
phase=${1#*.} phase=${1#*.}
foamDictionary -entry thermoType.thermo -set ${he}Const \ runApplication -a foamDictionary -entry thermoType.thermo -set ${he}Const \
constant/thermophysicalProperties.$phase constant/thermophysicalProperties.$phase
case $he in case $he in
@ -21,7 +21,7 @@ setThermoAndEnergy()
* ) exit 1;; * ) exit 1;;
esac esac
foamDictionary -entry thermoType.energy -set $energy \ runApplication -a foamDictionary -entry thermoType.energy -set $energy \
constant/thermophysicalProperties.$phase constant/thermophysicalProperties.$phase
} }

4
tutorials/Allrun
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | Website: https://openfoam.org # \\ / O peration | Website: https://openfoam.org
# \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -80,7 +80,7 @@ logReportDir()
cd $1 || return 1 cd $1 || return 1
logs=`find . -name "log.*"` logs=`find . -name "log.*" ! -name "log.foamDictionary"`
[ -n "$logs" ] || return 0 [ -n "$logs" ] || return 0
retVal=0 retVal=0

6
tutorials/combustion/XiFoam/RAS/Allrun
View File

@ -28,9 +28,9 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
if ! isTest $@ if ! isTest $@
then then
foamDictionary system/controlDict -entry deltaT -set 1e-05 runApplication -a foamDictionary system/controlDict -entry deltaT -set 1e-05
foamDictionary system/controlDict -entry endTime -set 0.015 runApplication -a foamDictionary system/controlDict -entry endTime -set 0.015
foamDictionary system/controlDict -entry writeInterval -set 50 runApplication -a foamDictionary system/controlDict -entry writeInterval -set 50
runApplication -a XiFoam runApplication -a XiFoam
fi fi

16
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
View File

@ -17,20 +17,20 @@ runApplication setFields
if ! isTest $@ if ! isTest $@
then then
# Run the application without chemistry until 1500 to let the flow develop # Run the application without chemistry until 1500 to let the flow develop
foamDictionary -entry "startTime" -set "0" system/controlDict runApplication -a foamDictionary -entry "startTime" -set "0" system/controlDict
foamDictionary -entry "writeInterval" -set "1500" system/controlDict runApplication -a foamDictionary -entry "writeInterval" -set "1500" system/controlDict
foamDictionary -entry "endTime" -set "1500" system/controlDict runApplication -a foamDictionary -entry "endTime" -set "1500" system/controlDict
rm -rf constant/chemistryProperties > /dev/null 2>&1 rm -rf constant/chemistryProperties > /dev/null 2>&1
foamDictionary -entry "chemistry" -set "off" constant/chemistryProperties runApplication -a foamDictionary -entry "chemistry" -set "off" constant/chemistryProperties
runApplication $application runApplication $application
# Run with chemistry until flame reach its full size # Run with chemistry until flame reach its full size
foamDictionary -entry "startTime" -set "1500" system/controlDict runApplication -a foamDictionary -entry "startTime" -set "1500" system/controlDict
foamDictionary -entry "writeInterval" -set "100" system/controlDict runApplication -a foamDictionary -entry "writeInterval" -set "100" system/controlDict
foamDictionary -entry "endTime" -set "5000" system/controlDict runApplication -a foamDictionary -entry "endTime" -set "5000" system/controlDict
rm -rf constant/chemistryProperties > /dev/null 2>&1 rm -rf constant/chemistryProperties > /dev/null 2>&1
foamDictionary -entry "chemistry" -set "on" constant/chemistryProperties runApplication -a foamDictionary -entry "chemistry" -set "on" constant/chemistryProperties
fi fi
runApplication -o $application runApplication -o $application

2
tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/Allrun
View File

@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication foamSetupCHT runApplication foamSetupCHT
foamDictionary -entry internalField -set "uniform 348" 0/solid/T runApplication foamDictionary -entry internalField -set "uniform 348" 0/solid/T
runApplication decomposePar -allRegions -dict system/decomposeParDict runApplication decomposePar -allRegions -dict system/decomposeParDict

12
tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/Allmesh.layers
View File

@ -9,9 +9,9 @@ runApplication blockMesh
runApplication decomposePar -copyZero runApplication decomposePar -copyZero
# Run snappy without layers # Run snappy without layers
foamDictionary system/snappyHexMeshDict -entry castellatedMesh -set on runApplication -a foamDictionary system/snappyHexMeshDict -entry castellatedMesh -set on
foamDictionary system/snappyHexMeshDict -entry snap -set on runApplication -a foamDictionary system/snappyHexMeshDict -entry snap -set on
foamDictionary system/snappyHexMeshDict -entry addLayers -set off runApplication -a foamDictionary system/snappyHexMeshDict -entry addLayers -set off
runParallel snappyHexMesh -overwrite runParallel snappyHexMesh -overwrite
# Convert the face zones into mapped wall baffles and split # Convert the face zones into mapped wall baffles and split
@ -20,9 +20,9 @@ runParallel mergeOrSplitBaffles -split -overwrite
rm -rf processor*/constant/polyMesh/pointLevel rm -rf processor*/constant/polyMesh/pointLevel
# Run snappy again to create layers # Run snappy again to create layers
foamDictionary system/snappyHexMeshDict -entry castellatedMesh -set off runApplication -a foamDictionary system/snappyHexMeshDict -entry castellatedMesh -set off
foamDictionary system/snappyHexMeshDict -entry snap -set off runApplication -a foamDictionary system/snappyHexMeshDict -entry snap -set off
foamDictionary system/snappyHexMeshDict -entry addLayers -set on runApplication -a foamDictionary system/snappyHexMeshDict -entry addLayers -set on
runParallel -a snappyHexMesh -overwrite runParallel -a snappyHexMesh -overwrite
# Split the mesh into regions # Split the mesh into regions

2
tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/Allrun
View File

@ -36,7 +36,7 @@ setAtmosphereBC () {
echo "Setting $_field BC on atmosphere patch to $_BC" echo "Setting $_field BC on atmosphere patch to $_BC"
foamDictionary \ runApplication -a foamDictionary \
-entry boundaryField.atmosphere.type \ -entry boundaryField.atmosphere.type \
-set "$_BC" \ -set "$_BC" \
"0/$_field" > /dev/null 2>&1 "0/$_field" > /dev/null 2>&1

4
tutorials/incompressible/simpleFoam/turbineSiting/Allrun
View File

@ -5,9 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh runApplication blockMesh
foamDictionary -entry "method" -set "hierarchical" system/decomposeParDict runApplication -a foamDictionary -entry "method" -set "hierarchical" system/decomposeParDict
runApplication decomposePar -copyZero runApplication decomposePar -copyZero
foamDictionary -entry "method" -set "ptscotch" system/decomposeParDict runApplication -a foamDictionary -entry "method" -set "ptscotch" system/decomposeParDict
runParallel snappyHexMesh -overwrite runParallel snappyHexMesh -overwrite
runParallel topoSet runParallel topoSet

2
tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh
View File

@ -13,7 +13,7 @@ runApplication blockMesh
for i in 1 2 3 4 5 6 for i in 1 2 3 4 5 6
do do
foamDictionary system/refineMeshDict -entry set -set c${i} runApplication -a foamDictionary system/refineMeshDict -entry set -set c${i}
runApplication -a topoSet runApplication -a topoSet

2
tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh
View File

@ -13,7 +13,7 @@ runApplication blockMesh
for i in 1 2 3 4 5 6 for i in 1 2 3 4 5 6
do do
foamDictionary system/refineMeshDict -entry set -set c${i} runApplication -a foamDictionary system/refineMeshDict -entry set -set c${i}
runApplication -a topoSet runApplication -a topoSet

2
tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh
View File

@ -13,7 +13,7 @@ runApplication blockMesh
for i in 1 2 3 4 5 6 for i in 1 2 3 4 5 6
do do
foamDictionary system/refineMeshDict -entry set -set c${i} runApplication -a foamDictionary system/refineMeshDict -entry set -set c${i}
runApplication -a topoSet runApplication -a topoSet

2
tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.1
View File

@ -17,7 +17,7 @@ runApplication blockMesh -dict system/blockMeshDict.1
for i in 1 2 3 4 5 6 7 for i in 1 2 3 4 5 6 7
do do
foamDictionary system/refineMeshDict -entry set -set c${i} runApplication -a foamDictionary system/refineMeshDict -entry set -set c${i}
runApplication -a topoSet -dict system/topoSetDict.1 runApplication -a topoSet -dict system/topoSetDict.1
runApplication -a refineMesh -dict system/refineMeshDict -overwrite runApplication -a refineMesh -dict system/refineMeshDict -overwrite
done done

2
tutorials/multiphase/interFoam/RAS/planingHullW3/Allmesh.2
View File

@ -17,7 +17,7 @@ runApplication blockMesh -dict system/blockMeshDict.2
for i in 1 2 3 4 for i in 1 2 3 4
do do
foamDictionary system/refineMeshDict -entry set -set c${i} runApplication -a foamDictionary system/refineMeshDict -entry set -set c${i}
runApplication -a topoSet -dict system/topoSetDict.2 runApplication -a topoSet -dict system/topoSetDict.2
runApplication -a refineMesh -dict system/refineMeshDict -overwrite runApplication -a refineMesh -dict system/refineMeshDict -overwrite
done done

4
tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/Allrun
View File

@ -14,8 +14,8 @@ runParallel $application
if ! isTest $@ if ! isTest $@
then then
foamDictionary system/controlDict -entry endTime -set 4 runApplication -a foamDictionary system/controlDict -entry endTime -set 4
foamDictionary system/controlDict -entry startTime -set 0.5 runApplication -a foamDictionary system/controlDict -entry startTime -set 0.5
runParallel -a foamDictionary 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900" runParallel -a foamDictionary 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900"
runParallel -a foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue" runParallel -a foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue"
runParallel -a $application runParallel -a $application

4
tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/Allrun
View File

@ -14,8 +14,8 @@ runParallel $application
if ! isTest $@ if ! isTest $@
then then
foamDictionary system/controlDict -entry endTime -set 4 runApplication -a foamDictionary system/controlDict -entry endTime -set 4
foamDictionary system/controlDict -entry startTime -set 0.5 runApplication -a foamDictionary system/controlDict -entry startTime -set 0.5
runParallel -a foamDictionary 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900" runParallel -a foamDictionary 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900"
runParallel -a foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue" runParallel -a foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue"
runParallel -a $application runParallel -a $application

4
tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun
View File

@ -15,8 +15,8 @@ runParallel $application
if ! isTest $@ if ! isTest $@
then then
foamDictionary system/controlDict -entry endTime -set 4 runApplication -a foamDictionary system/controlDict -entry endTime -set 4
foamDictionary system/controlDict -entry startTime -set 0.5 runApplication -a foamDictionary system/controlDict -entry startTime -set 0.5
runParallel -a foamDictionary -expand 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900" runParallel -a foamDictionary -expand 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900"
runParallel -a foamDictionary -expand 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue" runParallel -a foamDictionary -expand 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue"
runParallel -a $application runParallel -a $application

4
tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/Allrun
View File

@ -15,8 +15,8 @@ runParallel $application
if ! isTest $@ if ! isTest $@
then then
foamDictionary system/controlDict -entry endTime -set 4 runApplication -a foamDictionary system/controlDict -entry endTime -set 4
foamDictionary system/controlDict -entry startTime -set 0.5 runApplication -a foamDictionary system/controlDict -entry startTime -set 0.5
runParallel -a foamDictionary -expand 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900" runParallel -a foamDictionary -expand 0.5/T.liquid -entry boundaryField.wall.q -set "uniform 73900"
runParallel -a foamDictionary -expand 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue" runParallel -a foamDictionary -expand 0.5/U.liquid -entry boundaryField.inlet.type -set "fixedValue"
runParallel -a $application runParallel -a $application