diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean new file mode 100755 index 0000000000..61edfb3032 --- /dev/null +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean @@ -0,0 +1,10 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +cleanCase +rm -rf 0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun index d79a59a4f5..fa51ae65e3 100755 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun @@ -1,7 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -cd ${0%/*} || exit 1 - +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions ./Allrun.mesh @@ -15,3 +15,5 @@ runParallel potentialFoam -pName pPotential -initialiseUBCs \rm -f processor*/0/phi runParallel XiDyMFoam + +#------------------------------------------------------------------------------ diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh index 27f296d69a..59a8b9b93d 100755 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh @@ -1,11 +1,9 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -cd ${0%/*} || exit 1 - +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -rm -f log.* constant/polyMesh/*Level - runApplication blockMesh runApplication -s cyclic \ @@ -21,3 +19,5 @@ runApplication -s ami \ runApplication transformPoints -scale '(0.01 0.01 0.01)' runApplication mergeOrSplitBaffles -split -overwrite + +#------------------------------------------------------------------------------ diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict similarity index 100% rename from tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/blockMeshDict diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict similarity index 100% rename from tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict rename to tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/blockMeshDict diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean index c983aa5c4c..be64e41b64 100755 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/Allclean @@ -1,10 +1,10 @@ #!/bin/sh +cd ${0%/*} || exit 1 # run from this directory -# Source tutorial run functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase rm -rf constant/panelRegion/polyMesh -rm -f constant/polyMesh/boundary # ----------------------------------------------------------------------------- diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean index ed4bd14d20..f8c6193133 100755 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean @@ -7,8 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase rm -f 0/ph_rgh +rm -f 0/polyMesh/cellMap rm -rf constant/panelRegion/polyMesh -rm -f 0/polyMesh/cellMap -rm -f constant/polyMesh/boundary #------------------------------------------------------------------------------ diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict similarity index 100% rename from tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/polyMesh/blockMeshDict rename to tutorials/combustion/fireFoam/LES/simplePMMApanel/system/blockMeshDict diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactions.twoSteps similarity index 100% rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reactions.twoSteps diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps similarity index 100% rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermophysicalProperties.twoSteps diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/blockMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/blockMeshDict diff --git a/tutorials/mesh/parallel/cavity/Allclean b/tutorials/mesh/parallel/cavity/Allclean index 48fe2ebdab..4ca786d36e 100755 --- a/tutorials/mesh/parallel/cavity/Allclean +++ b/tutorials/mesh/parallel/cavity/Allclean @@ -1,12 +1,13 @@ #!/bin/sh +cd ${0%/*} || exit 1 # run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions +cleanCase + # Restore default dictionaries cp system/decomposeParDict-2 system/decomposeParDict cp system/controlDict-startTime system/controlDict -cleanCase -rm -f constant/polyMesh/boundary -rm -f constant/polyMesh/procAddressing +# ----------------------------------------------------------------------------- diff --git a/tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict b/tutorials/mesh/parallel/cavity/system/blockMeshDict similarity index 100% rename from tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict rename to tutorials/mesh/parallel/cavity/system/blockMeshDict diff --git a/tutorials/mesh/parallel/filter/Allclean b/tutorials/mesh/parallel/filter/Allclean index 7e7333f78c..61edfb3032 100755 --- a/tutorials/mesh/parallel/filter/Allclean +++ b/tutorials/mesh/parallel/filter/Allclean @@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -# Remove 0.orig/ copy and post-processing directories -\rm -rf 0 postProcessing - cleanCase +rm -rf 0 #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun index 0114f7829d..598afe74a5 100755 --- a/tutorials/mesh/parallel/filter/Allrun +++ b/tutorials/mesh/parallel/filter/Allrun @@ -29,5 +29,4 @@ runParallel -s parallel $application #- Reconstruct all times runParallel -s 1 redistributePar -reconstruct - -# ----------------------------------------------------------------- end-of-file +# ----------------------------------------------------------------------------- diff --git a/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict b/tutorials/mesh/parallel/filter/system/blockMeshDict similarity index 98% rename from tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict rename to tutorials/mesh/parallel/filter/system/blockMeshDict index 1e4f2bce94..42f0d62fa9 100644 --- a/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict +++ b/tutorials/mesh/parallel/filter/system/blockMeshDict @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant/polyMesh"; + location "system"; object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict index cf3f3d5bdf..5ed3bb5e1b 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/blockMeshDict @@ -3,7 +3,7 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant/polyMesh"; + location "system"; object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean index 5a47b6aef5..6b45f82a41 100755 --- a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean +++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean @@ -1,8 +1,9 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -rm -f constant/polyMesh/boundary - cleanCase + +#------------------------------------------------------------------------------ diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict rename to tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/blockMeshDict diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean index 8bfe3dc5d7..6b45f82a41 100755 --- a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean +++ b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean @@ -1,7 +1,9 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -\rm -f constant/polyMesh/boundary > /dev/null 2>&1 cleanCase + +#------------------------------------------------------------------------------ diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict rename to tutorials/mesh/snappyHexMesh/gap_detection/system/blockMeshDict