diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
index d1bbe709514df2f23d9ba0b74629ef712b518ef5..c78eec59c1ac050920773b926425de12207aa40e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
@@ -45,18 +45,6 @@ boundaryField
type movingWallVelocity;
value uniform (0 0 0);
}
-
- AMI1
- {
- type cyclicAMI;
- value uniform (0 0 0);
- }
-
- AMI2
- {
- type cyclicAMI;
- value uniform (0 0 0);
- }
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
index 4512a15707fa597d775782ba4c3c61ea866abd4b..c8a9ab3e88501a17fcfb6ff1e8175727e1aedf64 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
@@ -45,18 +45,6 @@ boundaryField
type epsilonWallFunction;
value $internalField;
}
-
- AMI1
- {
- type cyclicAMI;
- value $internalField;
- }
-
- AMI2
- {
- type cyclicAMI;
- value $internalField;
- }
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
index 4539cc1591a6328f35823143965310bfb84f29b4..fa184b506d48bde2bebf95aa33fe96fe8f8a126e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
@@ -45,18 +45,6 @@ boundaryField
type kqRWallFunction;
value $internalField;
}
-
- AMI1
- {
- type cyclicAMI;
- value $internalField;
- }
-
- AMI2
- {
- type cyclicAMI;
- value $internalField;
- }
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
index 3b34b2cbbfe5d6a81f8061fc13b9d73a9ba090de..0c696194233c251558db178dce834e0b54bdf409 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
@@ -44,18 +44,6 @@ boundaryField
type nutkWallFunction;
value uniform 0;
}
-
- AMI1
- {
- type cyclicAMI;
- value uniform 0;
- }
-
- AMI2
- {
- type cyclicAMI;
- value uniform 0;
- }
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
index 3196c16c90fbadc438d449f0c7d9e25dca2c5296..98504cb29b28d7fbc41a94def393c075b473a49c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
@@ -41,18 +41,6 @@ boundaryField
{
type zeroGradient;
}
-
- AMI1
- {
- type cyclicAMI;
- value uniform 0;
- }
-
- AMI2
- {
- type cyclicAMI;
- value uniform 0;
- }
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 472c03a6f7034d02b4e0b8a4f01bba629dc6de59..2abd5b41e176064c93c21aaa4c76a354ad3bee03 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -17,6 +17,7 @@ runApplication surfaceFeatureExtract
runApplication snappyHexMesh -overwrite
# force removal of fields generated by snappy
\rm -rf 0
+cp -rf 0.org 0
# - generate face/cell sets and zones
@@ -37,19 +38,18 @@ runApplication topoSet -dict system/createAMIFaces.topoSetDict
mv log.topoSet log.createAMIFaces.topoSet
-# - create the inlet/outlet patches and AMI patches
+# - create the inlet/outlet patches
runApplication createPatch -overwrite
-# - create the AMI faces by creating baffles, and then splitting the mesh
+# - apply the initial fields
-createBaffles -internalFacesOnly -overwrite innerCylinderSmall '(AMI1 AMI2)' \
- > log.createBaffles 2>&1
+cp -rf 0.org 0
-runApplication mergeOrSplitBaffles -split -overwrite
+# - create the AMI faces by creating baffles, and then splitting the mesh
-# - apply the initial fields
+runApplication createBaffles -overwrite
-cp -rf 0.org 0
+runApplication mergeOrSplitBaffles -split -overwrite
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createBafflesDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createBafflesDict
new file mode 100644
index 0000000000000000000000000000000000000000..f3a7eadc973754efb7c12d42d38db1946a201100
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createBafflesDict
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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 createBafflesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Whether to convert internal faces only (so leave boundary faces intact).
+// This is only relevant if your face selection type can pick up boundary
+// faces.
+internalFacesOnly true;
+
+
+// Baffles to create.
+baffles
+{
+ baffleFaces
+ {
+ //- Use predefined faceZone to select faces and orientation.
+ type faceZone;
+ zoneName innerCylinderSmall;
+
+
+ patches
+ {
+ master
+ {
+ //- Master side patch
+ name AMI1;
+ type cyclicAMI;
+ matchTolerance 0.0001;
+ neighbourPatch AMI2;
+ transform noOrdering;
+ }
+ slave
+ {
+ //- Slave side patch
+ name AMI2;
+ type cyclicAMI;
+ matchTolerance 0.0001;
+ neighbourPatch AMI1;
+ transform noOrdering;
+ }
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict
index 2400a435093264b8c3b78b72a05b574d5250f967..1559be08ddd80f8823edfedd2da120216eb30a31 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict
@@ -46,37 +46,6 @@ patches
set outletFaces;
}
-
-
- // Construct empty patches
- {
- name AMI1;
- patchInfo
- {
- type cyclicAMI;
- neighbourPatch AMI2;
- transform noOrdering;
- surface
- {}
- }
- constructFrom set;
- set dummyFaces;
- }
- {
- name AMI2;
-
- patchInfo
- {
- type cyclicAMI;
- neighbourPatch AMI1;
- transform noOrdering;
- surface
- {}
- }
- constructFrom set;
- set dummyFaces;
- }
-
);
// ************************************************************************* //