diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun index b72d1f3424..6468b3642b 100755 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allrun @@ -3,13 +3,12 @@ cd ${0%/*} || exit 1 # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -# create the blockMesh file with the parametric one m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication topoSet -runApplication snappyHexMesh -overwrite +runApplication snappyHexMesh -overwrite runApplication extrudeToRegionMesh -overwrite diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun index 1bc5f6f547..287801e89f 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun @@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun index 1bc5f6f547..287801e89f 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun @@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh index 57090307eb..8d6f4d11eb 100755 --- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh +++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun index e7b56928b6..84cd354497 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun @@ -9,8 +9,8 @@ rm -rf 0 constant \cp -r ../common/constant constant m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun index e7b56928b6..84cd354497 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun @@ -9,8 +9,8 @@ rm -rf 0 constant \cp -r ../common/constant constant m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun index 1bc5f6f547..287801e89f 100755 --- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun +++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun @@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh b/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh index ed804d4c3e..2c367f2649 100755 --- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh +++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh @@ -1,7 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh > log.blockMesh 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun index 6a84799376..0fdfd46efd 100755 --- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun @@ -3,9 +3,7 @@ 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 diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh index 6e03b018ca..d9fc3c0658 100755 --- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh @@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict - +m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh runApplication topoSet diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun index e7b56928b6..84cd354497 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun @@ -9,8 +9,8 @@ rm -rf 0 constant \cp -r ../common/constant constant m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun index e7b56928b6..84cd354497 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun @@ -9,8 +9,8 @@ rm -rf 0 constant \cp -r ../common/constant constant m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh index 8512eff976..8d6f4d11eb 100755 --- a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh +++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh @@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict - +m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun index 4dc771c494..287801e89f 100755 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun @@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict - +m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh runApplication $(getApplication) diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun index ad9fd18f01..587a7e2782 100755 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun @@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory # create the underlying block mesh m4 system/pachuka.m4 > system/blockMeshDict - runApplication blockMesh \cp 0/alpha.water.orig 0/alpha.water diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun index 75b0b625cf..b9be9e4afc 100755 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/Allrun @@ -5,7 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + cp 0/alpha.water.orig 0/alpha.water + runApplication setFields runApplication $(getApplication) diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh index 4065edb322..5405ca1217 100755 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh @@ -1,7 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun index 1bc5f6f547..287801e89f 100755 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/Allrun @@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh index 4065edb322..5405ca1217 100755 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh @@ -1,7 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun index c9defa12df..b9be9e4afc 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun @@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + cp 0/alpha.water.orig 0/alpha.water runApplication setFields diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun index c9defa12df..b9be9e4afc 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun @@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + cp 0/alpha.water.orig 0/alpha.water runApplication setFields diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun index c9defa12df..b9be9e4afc 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun @@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + cp 0/alpha.water.orig 0/alpha.water runApplication setFields diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun index 00a7c77d2e..b9be9e4afc 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun @@ -7,6 +7,7 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh cp 0/alpha.water.orig 0/alpha.water + runApplication setFields runApplication $(getApplication) diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun index 75b0b625cf..b9be9e4afc 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun @@ -5,7 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + cp 0/alpha.water.orig 0/alpha.water + runApplication setFields runApplication $(getApplication) diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun b/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun index c9defa12df..b9be9e4afc 100755 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/Allrun @@ -5,6 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + cp 0/alpha.water.orig 0/alpha.water runApplication setFields diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh index 4065edb322..5405ca1217 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh @@ -1,7 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh index 6e03b018ca..d9fc3c0658 100755 --- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh +++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh @@ -3,8 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict - +m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh index 4d667956a0..5405ca1217 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh @@ -1,6 +1,11 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh index 4065edb322..5405ca1217 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh @@ -1,7 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh index 4065edb322..5405ca1217 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh @@ -1,7 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh index 4065edb322..5405ca1217 100755 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh @@ -1,7 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory +#------------------------------------------------------------------------------ -m4 < system/blockMeshDict.m4 > system/blockMeshDict +m4 system/blockMeshDict.m4 > system/blockMeshDict blockMesh + topoSet setsToZones -noFlipMap