diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 2d0ec2d52f09348fcb8d7c7028b483a58fd221ad..b8a22dd285623b8b3211bee57e7c2fe1f5f60a28 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -28,8 +28,10 @@ Description
A multi-block mesh generator.
Uses the block mesh description found in
- \a constant/polyMesh/blockMeshDict
- (or \a constant/\<region\>/polyMesh/blockMeshDict).
+ \a system/blockMeshDict
+ or \a system/\<region\>/blockMeshDict
+ or \a constant/polyMesh/blockMeshDict
+ or \a constant/\<region\>/polyMesh/blockMeshDict
Usage
@@ -88,50 +90,60 @@ int main(int argc, char *argv[])
const word dictName("blockMeshDict");
word regionName;
- fileName polyMeshDir;
+ word regionPath;
+ // Check if the region is specified otherwise mesh the default region
if (args.optionReadIfPresent("region", regionName, polyMesh::defaultRegion))
{
- // constant/<region>/polyMesh/blockMeshDict
- polyMeshDir = regionName/polyMesh::meshSubDir;
-
Info<< nl << "Generating mesh for region " << regionName << endl;
+ regionPath = regionName;
+ }
+
+ // Search for the appropriate blockMesh dictionary....
+
+ fileName dictPath;
+
+ // Check if the dictionary is specified on the command-line
+ if (args.optionFound("dict"))
+ {
+ dictPath = args["dict"];
+
+ dictPath =
+ (
+ isDir(dictPath)
+ ? dictPath/dictName
+ : dictPath
+ );
+ }
+ // Check if dictionary is present in the constant directory
+ else if
+ (
+ exists
+ (
+ runTime.path()/runTime.constant()
+ /regionPath/polyMesh::meshSubDir/dictName
+ )
+ )
+ {
+ dictPath =
+ runTime.path()/runTime.constant()
+ /regionPath/polyMesh::meshSubDir/dictName;
}
+ // Otherwise assume the dictionary is present in the system directory
else
{
- // constant/polyMesh/blockMeshDict
- polyMeshDir = polyMesh::meshSubDir;
+ dictPath = runTime.path()/runTime.system()/regionPath/dictName;
}
IOobject meshDictIO
(
- dictName,
- runTime.constant(),
- polyMeshDir,
+ dictPath,
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
);
- if (args.optionFound("dict"))
- {
- const fileName dictPath = args["dict"];
-
- meshDictIO = IOobject
- (
- (
- isDir(dictPath)
- ? dictPath/dictName
- : dictPath
- ),
- runTime,
- IOobject::MUST_READ,
- IOobject::NO_WRITE,
- false
- );
- }
-
if (!meshDictIO.headerOk())
{
FatalErrorIn(args.executable())
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
similarity index 100%
rename from tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
rename to tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
similarity index 100%
rename from tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
rename to tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
diff --git a/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/LTSReactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/blockMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
similarity index 100%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralDyMFoam/movingCone/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/Allrun b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/Allrun
index 51be1be93cabc72c3b66fc839f4f6d59d8d465d0..8b610fff80dee1501b3b45e3994f363bfa9b09ca 100755
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/Allrun
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoLTSPimpleFoam/angledDuct/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/blockMeshDict
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
index 51be1be93cabc72c3b66fc839f4f6d59d8d465d0..8b610fff80dee1501b3b45e3994f363bfa9b09ca 100755
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/makeMesh b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/makeMesh
index 01607aaef4e7eb1a07e35197669d3e2de16ad764..aad5edd02d75571bc5e3e6e4f29cd2168d76bf87 100755
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/makeMesh
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/makeMesh
@@ -4,5 +4,5 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun b/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun
index 51be1be93cabc72c3b66fc839f4f6d59d8d465d0..8b610fff80dee1501b3b45e3994f363bfa9b09ca 100755
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPimplecFoam/angledDuct/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..40f0214c460c7188c5863d6ef15584b13621a861
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict
@@ -0,0 +1,123 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// block definition for a porosity with an angled inlet/outlet
+// the porosity is not aligned with the main axes
+//
+
+convertToMeters 0.001;
+
+vertices
+(
+ // inlet region
+ ( -150 0 -25 ) // pt 0 (in1b)
+ ( -150 35.35533906 -25 ) // pt 1 (in2b)
+ ( -150 0 25 ) // pt 2 (in1f)
+ ( -150 35.35533906 25 ) // pt 3 (in2f)
+
+ // join inlet->outlet
+ ( 0 0 -25 ) // pt 4 (join1b)
+ ( -35.35533906 35.35533906 -25 ) // pt 5 (join2b)
+ ( 0 0 25 ) // pt 6 (join1f)
+ ( -35.35533906 35.35533906 25 ) // pt 7 (join2f)
+
+ // porosity ends ->outlet
+ ( 70.71067812 70.71067812 -25 ) // pt 8 (poro1b)
+ ( 35.35533906 106.06601718 -25 ) // pt 9 (poro2b)
+ ( 70.71067812 70.71067812 25 ) // pt 10 (poro1f)
+ ( 35.35533906 106.06601718 25 ) // pt 11 (poro2f)
+
+ // outlet
+ ( 141.42135624 141.42135624 -25 ) // pt 12 (out1b)
+ ( 106.06601718 176.7766953 -25 ) // pt 13 (out2b)
+ ( 141.42135624 141.42135624 25 ) // pt 14 (out1f)
+ ( 106.06601718 176.7766953 25 ) // pt 15 (out2f)
+);
+
+blocks
+(
+ // inlet block
+ hex (0 4 5 1 2 6 7 3)
+ inlet ( 15 20 20 ) simpleGrading (1 1 1)
+
+ // porosity block
+ hex (4 8 9 5 6 10 11 7)
+ porosity ( 20 20 20 ) simpleGrading (1 1 1)
+
+ // outlet block
+ hex (8 12 13 9 10 14 15 11)
+ outlet ( 20 20 20 ) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+ // is there no way of defining all my 'defaultFaces' to be 'wall'?
+ wall front
+ (
+ // inlet block
+ (2 6 7 3)
+ // outlet block
+ (10 14 15 11)
+ )
+
+ wall back
+ (
+ // inlet block
+ (1 5 4 0)
+ // outlet block
+ (9 13 12 8)
+ )
+
+ wall walls
+ (
+ // inlet block
+ (2 0 4 6)
+ (7 5 1 3)
+ // outlet block
+ (10 8 12 14)
+ (15 13 9 11)
+ )
+
+ wall porosityWall
+ (
+ // porosity block
+ (6 10 11 7)
+ // porosity block
+ (5 9 8 4)
+ // porosity block
+ (6 4 8 10)
+ (11 9 5 7)
+ )
+
+ patch inlet
+ (
+ (3 1 0 2)
+ )
+
+ patch outlet
+ (
+ (15 13 12 14)
+ )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4
new file mode 120000
index 0000000000000000000000000000000000000000..baa86f23b953deafb91190ffebcd14cc52a4c9b6
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4
@@ -0,0 +1 @@
+../../angledDuctImplicit/system/blockMeshDict.m4
\ No newline at end of file
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
index 1cf1ad26aee070883136e1a2355cf4f325aaf2e0..a97e9a4aad7deb55e1b9b293ffac6cf0198c9dd5 100755
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index 0abd1608aba0dcb6aa66c9488133a3c4b51c7588..7a2d7d0e5e3c3269c847b329574269a0fa857aac 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -20,24 +20,28 @@ FoamFile
front
{
type wall;
+ inGroups 1(wall);
nFaces 700;
startFace 63400;
}
back
{
type wall;
+ inGroups 1(wall);
nFaces 700;
startFace 64100;
}
- wall
+ walls
{
type wall;
+ inGroups 1(wall);
nFaces 1400;
startFace 64800;
}
porosityWall
{
type wall;
+ inGroups 1(wall);
nFaces 1600;
startFace 66200;
}
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..40f0214c460c7188c5863d6ef15584b13621a861
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict
@@ -0,0 +1,123 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// block definition for a porosity with an angled inlet/outlet
+// the porosity is not aligned with the main axes
+//
+
+convertToMeters 0.001;
+
+vertices
+(
+ // inlet region
+ ( -150 0 -25 ) // pt 0 (in1b)
+ ( -150 35.35533906 -25 ) // pt 1 (in2b)
+ ( -150 0 25 ) // pt 2 (in1f)
+ ( -150 35.35533906 25 ) // pt 3 (in2f)
+
+ // join inlet->outlet
+ ( 0 0 -25 ) // pt 4 (join1b)
+ ( -35.35533906 35.35533906 -25 ) // pt 5 (join2b)
+ ( 0 0 25 ) // pt 6 (join1f)
+ ( -35.35533906 35.35533906 25 ) // pt 7 (join2f)
+
+ // porosity ends ->outlet
+ ( 70.71067812 70.71067812 -25 ) // pt 8 (poro1b)
+ ( 35.35533906 106.06601718 -25 ) // pt 9 (poro2b)
+ ( 70.71067812 70.71067812 25 ) // pt 10 (poro1f)
+ ( 35.35533906 106.06601718 25 ) // pt 11 (poro2f)
+
+ // outlet
+ ( 141.42135624 141.42135624 -25 ) // pt 12 (out1b)
+ ( 106.06601718 176.7766953 -25 ) // pt 13 (out2b)
+ ( 141.42135624 141.42135624 25 ) // pt 14 (out1f)
+ ( 106.06601718 176.7766953 25 ) // pt 15 (out2f)
+);
+
+blocks
+(
+ // inlet block
+ hex (0 4 5 1 2 6 7 3)
+ inlet ( 15 20 20 ) simpleGrading (1 1 1)
+
+ // porosity block
+ hex (4 8 9 5 6 10 11 7)
+ porosity ( 20 20 20 ) simpleGrading (1 1 1)
+
+ // outlet block
+ hex (8 12 13 9 10 14 15 11)
+ outlet ( 20 20 20 ) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+ // is there no way of defining all my 'defaultFaces' to be 'wall'?
+ wall front
+ (
+ // inlet block
+ (2 6 7 3)
+ // outlet block
+ (10 14 15 11)
+ )
+
+ wall back
+ (
+ // inlet block
+ (1 5 4 0)
+ // outlet block
+ (9 13 12 8)
+ )
+
+ wall walls
+ (
+ // inlet block
+ (2 0 4 6)
+ (7 5 1 3)
+ // outlet block
+ (10 8 12 14)
+ (15 13 9 11)
+ )
+
+ wall porosityWall
+ (
+ // porosity block
+ (6 10 11 7)
+ // porosity block
+ (5 9 8 4)
+ // porosity block
+ (6 4 8 10)
+ (11 9 5 7)
+ )
+
+ patch inlet
+ (
+ (3 1 0 2)
+ )
+
+ patch outlet
+ (
+ (15 13 12 14)
+ )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
index 1cf1ad26aee070883136e1a2355cf4f325aaf2e0..a97e9a4aad7deb55e1b9b293ffac6cf0198c9dd5 100755
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSimplecFoam/squareBend/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/rhoSimplecFoam/squareBend/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoSimplecFoam/squareBend/system/blockMeshDict
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicDyMFoam/movingCone/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index 0348228f6f82b188ea74f92a5eff9386c4e8adab..24f284adee8bd4e351fa9b32386bd8e33c2d851d 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
setDecompressionTankFine()
{
- blockMeshDict="constant/polyMesh/blockMeshDict"
+ blockMeshDict="system/blockMeshDict"
controlDict="system/controlDict"
sed \
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
similarity index 100%
rename from tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
similarity index 100%
rename from tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
rename to tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
similarity index 100%
rename from tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
rename to tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict
similarity index 99%
rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict
index 62730f5b3498b9412b333c9bb483a1a922778a9b..5f2f1e8fd2b5032b4ee3d38fcb0a2d432d1e3077 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict
@@ -81,4 +81,3 @@ boundary
mergePatchPairs
(
);
-
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
index 68bdec8486a426e552301e27ed1fcc62821a3b74..a8feba3802c49bee4e4d66f4b7b8afe465d5b44a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
- format binary;
+ format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
@@ -20,6 +20,7 @@ FoamFile
maxY
{
type wall;
+ inGroups 1(wall);
nFaces 300;
startFace 8300;
}
@@ -38,18 +39,21 @@ FoamFile
minY
{
type wall;
+ inGroups 1(wall);
nFaces 300;
startFace 8800;
}
minZ
{
type wall;
+ inGroups 1(wall);
nFaces 300;
startFace 9100;
}
maxZ
{
type wall;
+ inGroups 1(wall);
nFaces 300;
startFace 9400;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh b/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
index 51e00e57ff8a428c36e24de352adb909d8a43b61..b0e33568ef87ea22f8bf0594cd974c1b57121050 100755
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
set -x
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh > log.blockMesh 2>&1
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/blockMeshDict b/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/SRFSimpleFoam/mixer/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/blockMeshDict
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/blockMeshDict
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
index f8ab186d825f8b251e898a0b68c88f20104336f2..723784c4271f6b69e2ec6c8d9445a29e9799c327 100755
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/Allrun
@@ -26,7 +26,7 @@ copySolutionDirs()
setCavityFine()
{
- blockMeshDict="$caseName/constant/polyMesh/blockMeshDict"
+ blockMeshDict="$caseName/system/blockMeshDict"
controlDict="$caseName/system/controlDict"
sed s/"20 20 1"/"41 41 1"/g $blockMeshDict > temp.$$
mv temp.$$ $blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavity/system/blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
index 21cc91260eb0bc4b793af97d1be5ec72e03de3bf..adf298d6f36a18a4153579fdba7113c8e5aa94ca 100755
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/propeller/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunction/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/TJunctionFan/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4
new file mode 120000
index 0000000000000000000000000000000000000000..baa86f23b953deafb91190ffebcd14cc52a4c9b6
--- /dev/null
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4
@@ -0,0 +1 @@
+../../angledDuctImplicit/system/blockMeshDict.m4
\ No newline at end of file
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun
index 0e0f8292b58e5ef72571b94e418f853c175d14c1..6b3f5730251b7a3991c3a90a7a607b5318bf83d8 100755
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
rename to tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
index 379c86f9add0a5d6e1c69c32c47e9e5e1e7882dd..afad253d6ed34087fd117d27151cdd647c640b83 100755
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/incompressible/simpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/simpleFoam/pipeCyclic/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/DPMFoam/Goldschmidt/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/blockMeshDict
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/blockMeshDict
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/MPPICFoam/column/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/MPPICFoam/cyclone/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
similarity index 99%
rename from tutorials/lagrangian/MPPICFoam/injectionChannel/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
index 6a6df642181cba8ba64d561ff249112eb83c361c..f0e1288a96bc3f195e84dcf054d769c4bbee1348 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/polyMesh/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
@@ -152,24 +152,24 @@ boundary
(20 5 14 21)
( 5 6 13 14)
( 6 9 10 13)
-
+
( 7 8 9 6)
(13 10 11 12)
-
+
( 3 4 1 2)
( 4 5 20 1)
(18 21 14 15)
(17 18 15 16)
-
+
(22 23 40 41)
(23 42 43 40)
(42 27 36 43)
(27 28 35 36)
(28 31 32 35)
-
+
(29 30 31 28)
(35 32 33 34)
-
+
(25 26 23 24)
(26 27 42 23)
(40 43 36 37)
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/filter/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/sprayFoam/aachenBomb/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
similarity index 100%
rename from tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
diff --git a/tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/flange/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
diff --git a/tutorials/multiphase/LTSInterFoam/DTCHull/constant/polyMesh/blockMeshDict b/tutorials/multiphase/LTSInterFoam/DTCHull/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/LTSInterFoam/DTCHull/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/LTSInterFoam/DTCHull/system/blockMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
index bcf0228f167be7bf5b701e2e275cd18d0fddd6ca..9c160cce7d51fee2f45023c1650dd758df4f07b6 100755
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/makeMesh b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/makeMesh
index 8ef4993fdebc0faac8bb6c69426059aba4b3faac..4d667956a0a85573c003797a5e2385cba6296964 100755
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/makeMesh
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/makeMesh
@@ -1,6 +1,6 @@
#!/bin/sh
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
index bcf0228f167be7bf5b701e2e275cd18d0fddd6ca..9c160cce7d51fee2f45023c1650dd758df4f07b6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
index bcf0228f167be7bf5b701e2e275cd18d0fddd6ca..9c160cce7d51fee2f45023c1650dd758df4f07b6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
index bcf0228f167be7bf5b701e2e275cd18d0fddd6ca..9c160cce7d51fee2f45023c1650dd758df4f07b6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
index bcf0228f167be7bf5b701e2e275cd18d0fddd6ca..9c160cce7d51fee2f45023c1650dd758df4f07b6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
index bcf0228f167be7bf5b701e2e275cd18d0fddd6ca..9c160cce7d51fee2f45023c1650dd758df4f07b6 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.org 0/alpha.water
runApplication setFields
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 973d01d5b45bbb5434a6a01bab9100dfec7b0484..45adee60c76550d2c74d46c69025965b240b9187 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
setDamBreakFine ()
{
- blockMeshDict="constant/polyMesh/blockMeshDict"
+ blockMeshDict="system/blockMeshDict"
controlDict="system/controlDict"
sed \
-e s/"23 8"/"46 10"/g \
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/capillaryRise/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh
index 8ef4993fdebc0faac8bb6c69426059aba4b3faac..4d667956a0a85573c003797a5e2385cba6296964 100755
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh
@@ -1,6 +1,6 @@
#!/bin/sh
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index 99f94d40c8e2a918420ef50dceb33d62fb34972f..2d70aedba055bb2bacffc76249b127e1e7f826b1 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
setDamBreakFine ()
{
- blockMeshDict="constant/polyMesh/blockMeshDict"
+ blockMeshDict="system/blockMeshDict"
controlDict="system/controlDict"
sed \
-e s/"23 8"/"46 10"/g \
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/Allrun b/tutorials/multiphase/interFoam/ras/angledDuct/Allrun
index 51be1be93cabc72c3b66fc839f4f6d59d8d465d0..8b610fff80dee1501b3b45e3994f363bfa9b09ca 100755
--- a/tutorials/multiphase/interFoam/ras/angledDuct/Allrun
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/Allrun
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/angledDuct/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh
index 8ef4993fdebc0faac8bb6c69426059aba4b3faac..4d667956a0a85573c003797a5e2385cba6296964 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh
@@ -1,6 +1,6 @@
#!/bin/sh
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh
index 21cc91260eb0bc4b793af97d1be5ec72e03de3bf..adf298d6f36a18a4153579fdba7113c8e5aa94ca 100755
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/makeMesh
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
index 8ef4993fdebc0faac8bb6c69426059aba4b3faac..4d667956a0a85573c003797a5e2385cba6296964 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
@@ -1,6 +1,6 @@
#!/bin/sh
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/polyMesh/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/polyMesh/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh
index 8ef4993fdebc0faac8bb6c69426059aba4b3faac..4d667956a0a85573c003797a5e2385cba6296964 100755
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/makeMesh
@@ -1,6 +1,6 @@
#!/bin/sh
-m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh
topoSet
setsToZones -noFlipMap
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
similarity index 100%
rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
similarity index 100%
rename from tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
similarity index 99%
rename from tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
index bbd420dae0c461a0d5e7f8f00ccfd881e2c80581..2579387b2b187b85a522821fe3b3d7b3b1eecaee 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
@@ -83,4 +83,3 @@ mergePatchPairs
);
// ************************************************************************* //
-