diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun index 4327bbbc1..3fdeb02e5 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun +++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun @@ -4,11 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh runApplication $(getApplication) & ./externalSolver - #------------------------------------------------------------------------------ diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel index e4ef2fce8..b7c20bd6a 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel +++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh runApplication decomposePar @@ -12,5 +12,4 @@ runParallel $(getApplication) & ./externalSolver - #------------------------------------------------------------------------------ diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre deleted file mode 100755 index 3a03bb1e8..000000000 --- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication blockMesh -runApplication createExternalCoupledPatchGeometry T - - -#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun index 25d83d176..e6a19278e 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun @@ -4,6 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh runApplication $(getApplication) diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel index 3f7cab5d8..851eaa6c4 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun-parallel @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh runApplication decomposePar diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre deleted file mode 100755 index 22c5c016d..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/Allrun.pre +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication blockMesh - -runApplication topoSet -constant - -# Split the mesh to generate the ACMI coupled patches -runApplication createBaffles -overwrite - -#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun index 63ee3a47d..63e46ba9f 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh runApplication decomposePar runParallel $(getApplication) diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre deleted file mode 100755 index cd4ebcd8c..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Copy propeller surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/ - -# Meshing -runApplication blockMesh -runApplication surfaceFeatures -runApplication snappyHexMesh -overwrite - -# Generate face/cell sets and zones -runApplication topoSet -dict system/createInletOutletSets.topoSetDict - -# Create the inlet/outlet and AMI patches -runApplication createPatch -overwrite - -runApplication renumberMesh -noFields -overwrite - -# Test by running moveDynamicMes -#runApplication moveDynamicMesh -checkAMI - -#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun index f2a840a04..543733e49 100755 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun @@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory if [ -n "$FOAMY_HEX_MESH" ] then - ./Allrun.pre + ./Allmesh runApplication $(getApplication) fi diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre deleted file mode 100755 index 9a95d04cb..000000000 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication surfaceFeatures - -runApplication foamyHexMesh - -# Collapse only patch faces from incomplete conformation -runApplication -s indirectPatchFaces \ - collapseEdges -collapseFaceSet indirectPatchFaces -latestTime -overwrite - -# Collapse small edges and sliver faces -runApplication -s collapseFaces \ - collapseEdges -collapseFaces -latestTime -overwrite - -runApplication checkMesh -allTopology -allGeometry -latestTime - -latestTime=`foamListTimes -latestTime` - -# Move the mesh into polyMesh -rm -rf constant/polyMesh -mv "${latestTime}"/polyMesh constant - -# Clean up intermediate meshes -rm -r [1-9]* - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun index 7527fc7de..def1062b0 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh application=$(getApplication) diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre deleted file mode 100755 index 8df6b2cd6..000000000 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication blockMesh - -#runApplication setSet -batch wallFilmRegion.setSet -runApplication topoSet - -runApplication extrudeToRegionMesh -overwrite - -paraFoam -touch -paraFoam -touch -region wallFilmRegion - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun index 5a14a641d..65d1db104 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh cp -rf 0.orig 0 diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel index b659d3fee..0dfd03b83 100755 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun-parallel @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh application=$(getApplication) diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre deleted file mode 100755 index c8d4217fc..000000000 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/Allrun.pre +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -rm -rf 0 - -# create the underlying block mesh -runApplication blockMesh - -# create the set for the obstacles -runApplication topoSet - -# create the obstacles - add obstacle patches to wallFilm patch -runApplication subsetMesh c0 -patch wallFilm -overwrite - -# split the obstacle patches into cube[1-6]_patch[1-6] -runApplication ./patchifyObstacles - -# Create the wall film region via extrusion -runApplication extrudeToRegionMesh -overwrite - -# Copy the system settings over to the wall film region -rm -rf system/wallFilmRegion -cp -r system/wallFilmRegion.orig system/wallFilmRegion - -find ./0 -maxdepth 1 -type f -exec \ - sed -i -e "s/wallFilm/\"(region0_to.*)\"/g" {} \; - -paraFoam -touch -paraFoam -touch -region wallFilmRegion - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun index 7527fc7de..def1062b0 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh application=$(getApplication) diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre deleted file mode 100755 index 1b494b5aa..000000000 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication blockMesh - -#runApplication setSet -batch wallFilmRegion.setSet -runApplication topoSet -dict system/wallFilmRegion.topoSet - -runApplication extrudeToRegionMesh -overwrite - -paraFoam -touch -paraFoam -touch -region wallFilmRegion - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun index 7527fc7de..def1062b0 100755 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh application=$(getApplication) diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre deleted file mode 100755 index 81aad711d..000000000 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/Allrun.pre +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication blockMesh - -#If using batch mode -#runApplication -s wallFilmRegion \ -# setSet -batch wallFilmRegion.setSet - -#If using dictionary mode -runApplication -s wallFilmRegion \ - topoSet -dict system/wallFilmRegion.topoSet - -runApplication extrudeToRegionMesh -overwrite - -#If using batch mode -#runApplication -s createWallFilmRegionPatches \ -# setSet -region wallFilmRegion \ -# -batch createWallFilmRegionPatches.setSet - -#If using dictionary mode -runApplication -s createWallFilmRegionPatches \ - topoSet -region wallFilmRegion \ - -dict system/createWallFilmRegionPatches.topoSet - -runApplication createPatch -region wallFilmRegion -overwrite - -paraFoam -touch -paraFoam -touch -region wallFilmRegion - -#------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun index b66c25a9a..ef76cac3b 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun @@ -5,9 +5,30 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Generate mesh -./Allrun-pre +./Allmesh -# Run simulation -./Allrun-simulation +cp system/controlDict.flow system/controlDict + +# Set application name +application=$(getApplication) + +runApplication createBaffles -overwrite +runApplication mergeOrSplitBaffles -split -overwrite + +# Get rid of zero faced patches +runApplication createPatch -overwrite + +# Initialize alpha +runApplication setFields + +# Decompose +runApplication -s main \ + decomposePar -force + +# Run +runParallel $application + +# Reconstruct +runApplication reconstructPar -noFunctionObjects #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre deleted file mode 100755 index d22a71663..000000000 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -intersectSurfaces() -{ - outputName1=$(basename $1) - outputName1=${outputName1%.*} - - outputName2=$(basename $2) - outputName2=${outputName2%.*} - - runApplication -s $outputName1:$outputName2 \ - surfaceBooleanFeatures "$@" intersection -} - -# Set application name -application=$(getApplication) - -# Run the surface preparation script -./constant/triSurface/surfaceProcess.sh > log.surfaceProcess 2>&1 - -# Surface intersections -intersectSurfaces \ - constant/triSurface/vessel.stl \ - constant/triSurface/spargerShaft.stl \ - -perturb - -intersectSurfaces \ - constant/triSurface/vessel.stl \ - constant/triSurface/shaft.stl \ - -perturb - -intersectSurfaces \ - constant/triSurface/spargerShaft.stl \ - constant/triSurface/spargerInlet.stl \ - -perturb - -intersectSurfaces \ - constant/triSurface/stirrer.stl \ - constant/triSurface/shaftRotating.stl \ - -perturb - -intersectSurfaces \ - constant/triSurface/stirrer_baffles.stl \ - constant/triSurface/stirrer.stl \ - -surf1Baffle \ - -perturb - -intersectSurfaces \ - constant/triSurface/rotating.stl \ - constant/triSurface/shaft.stl \ - -surf1Baffle \ - -perturb - -# Intersect blades with the plate -for bladeI in $(seq 1 6); -do - intersectSurfaces \ - constant/triSurface/stirrer_baffles_$bladeI.obj \ - constant/triSurface/stirrer_baffles_plate.obj \ - -surf1Baffle \ - -surf2Baffle -done - -# Meshing -cp system/controlDict.mesh system/controlDict - -runApplication blockMesh -region backgroundMeshDecomposition - -runApplication -s backgroundMeshDecomposition \ - decomposePar -region backgroundMeshDecomposition - -runApplication surfaceFeatures - -runParallel foamyHexMesh - -runParallel -s faces \ - collapseEdges -collapseFaces -latestTime \ - -dict system/collapseDict.collapseFaces - -#runParallel -s faceSet \ -# collapseEdges -collapseFaceSet indirectPatchFaces -latestTime \ -# -dict system/collapseDict.indirectPatchFaces - -runParallel checkMesh -allTopology -allGeometry -latestTime - -runApplication reconstructParMesh -latestTime - -# Copy the mesh from the latest time folder into polyMesh and delete that -# latest time folder -latestTime=$(foamListTimes -latestTime) -cp -r $latestTime/polyMesh constant -rm -rf $latestTime - - -#------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation deleted file mode 100755 index 967f8096f..000000000 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -cp system/controlDict.flow system/controlDict - -# Set application name -application=$(getApplication) - -runApplication createBaffles -overwrite -runApplication mergeOrSplitBaffles -split -overwrite - -# Get rid of zero faced patches -runApplication createPatch -overwrite - -# Initialize alpha -runApplication setFields - -# Decompose -runApplication -s main \ - decomposePar -force - -# Run -runParallel $application - -# Reconstruct -runApplication reconstructPar -noFunctionObjects - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun index f35012c3e..03e64e9cd 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun @@ -6,8 +6,10 @@ cd ${0%/*} || exit 1 # Run from this directory application=$(getApplication) +./Allmesh -./Allrun.pre +# Initialize alpha +runApplication setFields # Decompose runApplication decomposePar -force diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre deleted file mode 100755 index 163a36e37..000000000 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Set application name -application=$(getApplication) - -# Meshing -runApplication blockMesh -runApplication surfaceFeatures -runApplication snappyHexMesh -overwrite -runApplication createBaffles -overwrite -runApplication mergeOrSplitBaffles -split -overwrite - -# Initialize alpha -runApplication setFields - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun index 59aa02e75..ba8edfc64 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -./Allrun.pre +./Allmesh runApplication decomposePar diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre deleted file mode 100755 index 493f2ce5b..000000000 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Copy propeller surface from resources directory -cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/ - -runApplication blockMesh -runApplication surfaceFeatures -runApplication snappyHexMesh -overwrite - -# Generate face/cell sets and zones -runApplication topoSet -dict system/createInletOutletSets.topoSetDict - -# Create the inlet/outlet and AMI patches -runApplication createPatch -overwrite - -runApplication renumberMesh -noFields -overwrite - -# Test by running moveDynamicMesh -#runApplication moveDynamicMesh -checkAMI - -#------------------------------------------------------------------------------