diff --git a/applications/test/parallelOverset/heatTransfer/Allclean b/applications/test/parallelOverset/heatTransfer/Allclean index 2f87da61e0..3f55a99486 100755 --- a/applications/test/parallelOverset/heatTransfer/Allclean +++ b/applications/test/parallelOverset/heatTransfer/Allclean @@ -3,10 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase +cleanCase0 rm -f constant/polyMesh/boundary rm -f constant/polyMesh/zoneID -rm -rf 0 - #------------------------------------------------------------------------------ diff --git a/applications/test/volField/cavity/Allclean b/applications/test/volField/cavity/Allclean index 67037edd0a..9b26b99836 100755 --- a/applications/test/volField/cavity/Allclean +++ b/applications/test/volField/cavity/Allclean @@ -1,6 +1,7 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase diff --git a/etc/templates/axisymmetricJet/Allclean b/etc/templates/axisymmetricJet/Allclean index 08a28bfa7e..c44edd4936 100755 --- a/etc/templates/axisymmetricJet/Allclean +++ b/etc/templates/axisymmetricJet/Allclean @@ -1,8 +1,10 @@ #!/bin/sh -cd "${0%/*}" || exit # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ cleanCase -rm constant/polyMesh/boundary + +rm -f constant/polyMesh/boundary #------------------------------------------------------------------------------ diff --git a/etc/templates/axisymmetricJet/Allrun b/etc/templates/axisymmetricJet/Allrun index 110caeb362..ebca64303f 100755 --- a/etc/templates/axisymmetricJet/Allrun +++ b/etc/templates/axisymmetricJet/Allrun @@ -1,6 +1,7 @@ #!/bin/sh -cd "${0%/*}" || exit # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ runApplication blockMesh runApplication extrudeMesh diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allclean deleted file mode 100755 index fb1f384730..0000000000 --- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allclean +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions -#------------------------------------------------------------------------------ - -cleanCase0 - -#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun index b1499edc52..78d5debbe7 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -restore0Dir - -runApplication blockMesh - -runApplication topoSet +./Allrun.pre runApplication $(getApplication) diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun-parallel similarity index 62% rename from tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allclean rename to tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun-parallel index fb1f384730..f9aa96400d 100755 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun-parallel @@ -1,8 +1,12 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -cleanCase0 +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/squareBend/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun.pre similarity index 64% rename from tutorials/incompressible/simpleFoam/squareBend/Allclean rename to tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun.pre index 4afce75b5c..0063b9c3a6 100755 --- a/tutorials/incompressible/simpleFoam/squareBend/Allclean +++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/Allrun.pre @@ -1,10 +1,12 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -cleanCase0 +restore0Dir -rm -rf constant/triSurface +runApplication blockMesh + +runApplication topoSet #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict index 65973db771..5985abc63d 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | +| \\ / O peration | Version: v2106 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ xin #eval{ $xin / 5 }; xout #eval{ $xout / 5 }; zmax #eval{ $zmax / 5 }; -nxin #eval{ round($nxin / 5) }; -nxout #eval{ round($nxout / 5) }; -nz #eval{ round($nz / 5) }; +nxin #eval{ round ($nxin / 5) }; +nxout #eval{ round ($nxout / 5) }; +nz #eval{ round ($nz / 5) }; #endif zmin #eval{ -$zmax }; diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun b/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun index 6624f4bbfd..78d5debbe7 100755 --- a/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun @@ -3,30 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -restore0Dir - -cp -rf \ - "$FOAM_TUTORIALS"/resources/geometry/squareBend \ - constant/triSurface - -runApplication blockMesh - -# Extract some faces for sampling -runApplication surfaceMeshExtract \ - -patches inlet -time 0 \ - constant/triSurface/inlet_sample0.obj - -# Recentre and inflate -runApplication surfaceTransformPoints \ - -recentre \ - -scale 3.5 \ - constant/triSurface/inlet_sample0.obj \ - constant/triSurface/inlet_sample1.obj - -# Finer mesh -runApplication surfaceRefineRedGreen \ - constant/triSurface/inlet_sample1.obj \ - constant/triSurface/oversized_sample.obj +./Allrun.pre runApplication $(getApplication) diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun-parallel b/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun-parallel new file mode 100755 index 0000000000..f9aa96400d --- /dev/null +++ b/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun-parallel @@ -0,0 +1,12 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun.pre b/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun.pre new file mode 100755 index 0000000000..b1dc24c327 --- /dev/null +++ b/tutorials/compressible/rhoSimpleFoam/squareBend/Allrun.pre @@ -0,0 +1,32 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +cp -rf \ + "$FOAM_TUTORIALS"/resources/geometry/squareBend \ + constant/triSurface + +runApplication blockMesh + +# Extract some faces for sampling +runApplication surfaceMeshExtract \ + -patches inlet -time 0 \ + constant/triSurface/inlet_sample0.obj + +# Recentre and inflate +runApplication surfaceTransformPoints \ + -recentre \ + -scale 3.5 \ + constant/triSurface/inlet_sample0.obj \ + constant/triSurface/inlet_sample1.obj + +# Finer mesh +runApplication surfaceRefineRedGreen \ + constant/triSurface/inlet_sample1.obj \ + constant/triSurface/oversized_sample.obj + + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun index b1499edc52..78d5debbe7 100755 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -restore0Dir - -runApplication blockMesh - -runApplication topoSet +./Allrun.pre runApplication $(getApplication) diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun-parallel b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun-parallel new file mode 100755 index 0000000000..f9aa96400d --- /dev/null +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun-parallel @@ -0,0 +1,12 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/Allclean b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun.pre similarity index 64% rename from tutorials/compressible/rhoSimpleFoam/squareBend/Allclean rename to tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun.pre index 4afce75b5c..0063b9c3a6 100755 --- a/tutorials/compressible/rhoSimpleFoam/squareBend/Allclean +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allrun.pre @@ -1,10 +1,12 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -cleanCase0 +restore0Dir -rm -rf constant/triSurface +runApplication blockMesh + +runApplication topoSet #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict index 65973db771..5985abc63d 100644 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | +| \\ / O peration | Version: v2106 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ xin #eval{ $xin / 5 }; xout #eval{ $xout / 5 }; zmax #eval{ $zmax / 5 }; -nxin #eval{ round($nxin / 5) }; -nxout #eval{ round($nxout / 5) }; -nz #eval{ round($nz / 5) }; +nxin #eval{ round ($nxin / 5) }; +nxout #eval{ round ($nxout / 5) }; +nz #eval{ round ($nz / 5) }; #endif zmin #eval{ -$zmax }; diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun index b1499edc52..78d5debbe7 100755 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun @@ -3,11 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -restore0Dir - -runApplication blockMesh - -runApplication topoSet +./Allrun.pre runApplication $(getApplication) diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun-parallel b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun-parallel new file mode 100755 index 0000000000..f9aa96400d --- /dev/null +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun-parallel @@ -0,0 +1,12 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allclean b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun.pre similarity index 64% rename from tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allclean rename to tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun.pre index fb1f384730..0063b9c3a6 100755 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/Allclean +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/Allrun.pre @@ -1,8 +1,12 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -cleanCase0 +restore0Dir + +runApplication blockMesh + +runApplication topoSet #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict index adc941d802..6f7ea300a6 100644 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiqNoNewtonian/system/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | +| \\ / O peration | Version: v2106 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ xin #eval{ $xin / 5 }; xout #eval{ $xout / 5 }; zmax #eval{ $zmax / 5 }; -nxin #eval{ round($nxin / 5) }; -nxout #eval{ round($nxout / 5) }; -nz #eval{ round($nz / 5) }; +nxin #eval{ round ($nxin / 5) }; +nxout #eval{ round ($nxout / 5) }; +nz #eval{ round ($nz / 5) }; #endif zmin #eval{ -$zmax }; diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean deleted file mode 100755 index 426e7ad42e..0000000000 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions -#------------------------------------------------------------------------------ - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/squareBend/Allrun b/tutorials/incompressible/simpleFoam/squareBend/Allrun index 9f3b08bc33..78d5debbe7 100755 --- a/tutorials/incompressible/simpleFoam/squareBend/Allrun +++ b/tutorials/incompressible/simpleFoam/squareBend/Allrun @@ -3,17 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -mkdir -p constant/triSurface - -cp -f \ - "$FOAM_TUTORIALS"/resources/geometry/angledPlane.obj.gz \ - constant/triSurface - -restore0Dir - -runApplication blockMesh - -runApplication topoSet +./Allrun.pre runApplication $(getApplication) diff --git a/tutorials/incompressible/simpleFoam/squareBend/Allrun-parallel b/tutorials/incompressible/simpleFoam/squareBend/Allrun-parallel new file mode 100755 index 0000000000..f9aa96400d --- /dev/null +++ b/tutorials/incompressible/simpleFoam/squareBend/Allrun-parallel @@ -0,0 +1,12 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +./Allrun.pre + +runApplication decomposePar + +runParallel $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/squareBend/Allrun.pre b/tutorials/incompressible/simpleFoam/squareBend/Allrun.pre new file mode 100755 index 0000000000..949833760d --- /dev/null +++ b/tutorials/incompressible/simpleFoam/squareBend/Allrun.pre @@ -0,0 +1,18 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +mkdir -p constant/triSurface + +cp -f \ + "$FOAM_TUTORIALS"/resources/geometry/angledPlane.obj.gz \ + constant/triSurface + +restore0Dir + +runApplication blockMesh + +runApplication topoSet + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict b/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict index 65973db771..5985abc63d 100644 --- a/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict +++ b/tutorials/incompressible/simpleFoam/squareBend/system/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | +| \\ / O peration | Version: v2106 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ xin #eval{ $xin / 5 }; xout #eval{ $xout / 5 }; zmax #eval{ $zmax / 5 }; -nxin #eval{ round($nxin / 5) }; -nxout #eval{ round($nxout / 5) }; -nz #eval{ round($nz / 5) }; +nxin #eval{ round ($nxin / 5) }; +nxout #eval{ round ($nxout / 5) }; +nz #eval{ round ($nz / 5) }; #endif zmin #eval{ -$zmax };