ENH: propeller: convert to createBafflesDict

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);
-    }
 }
 
 

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;
-    }
 }
 
 

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;
-    }
 }
 
 

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;
-    }
 }
 
 

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;
-    }
 }
 
 

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
-
-createBaffles -internalFacesOnly -overwrite innerCylinderSmall '(AMI1 AMI2)'   \
-    > log.createBaffles 2>&1
-
-runApplication mergeOrSplitBaffles -split -overwrite
-
-
 # - apply the initial fields
 
 cp -rf 0.org 0
+
+
+# - create the AMI faces by creating baffles, and then splitting the mesh
+
+runApplication createBaffles -overwrite
+
+runApplication mergeOrSplitBaffles -split -overwrite

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;
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //

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;
-    }
-
 );
 
 // ************************************************************************* //