diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
index 2e9c3f7fb3..3bfa5eab93 100755
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun
@@ -5,5 +5,5 @@
 
 application=$(getApplication)
 
-./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication $application
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh
deleted file mode 100755
index aad5edd02d..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-runApplication blockMesh
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
deleted file mode 100644
index e0288808a4..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,834 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ri0, ri1, Rb1, Rb0)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ri1, ri2, Rb2, Rb1)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ri2, ri3, Rb3, Rb2)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ri3, ri4, Rb4, Rb3)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ri4, ri5, Rb5, Rb4)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ri5, ri6, Rb6, Rb5)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ri6, ri7, Rb7, Rb6)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ri7, ri0, Rb0, Rb7)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-patches
-(
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
-
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
-
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
-
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun
index c454c9b3f6..996a936a1f 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/Allrun
@@ -6,7 +6,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
+runApplication createBaffles -overwrite
+runApplication mergeOrSplitBaffles -split -overwrite
+runApplication topoSet
 
 #runApplication $application
 runApplication decomposePar
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/geometry/projectionSurface.stl b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/geometry/projectionSurface.stl
deleted file mode 100644
index 9488327587..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/geometry/projectionSurface.stl
+++ /dev/null
@@ -1,1346 +0,0 @@
-solid AMI1
-  facet normal 0.999464 -0.0327281 0
-    outer loop
-       vertex 0.06 0 0
-       vertex 0.06 0 0.01
-       vertex 0.0598715 -0.00392419 0.01
-    endloop
-  endfacet
-  facet normal 0.999464 -0.0327281 0
-    outer loop
-       vertex 0.0598715 -0.00392419 0.01
-       vertex 0.0598715 -0.00392419 0
-       vertex 0.06 0 0
-    endloop
-  endfacet
-  facet normal 0.995186 -0.0980062 0
-    outer loop
-       vertex 0.0598715 -0.00392419 0
-       vertex 0.0598715 -0.00392419 0.01
-       vertex 0.0594867 -0.00783157 0.01
-    endloop
-  endfacet
-  facet normal 0.995186 -0.0980062 0
-    outer loop
-       vertex 0.0594867 -0.00783157 0.01
-       vertex 0.0594867 -0.00783157 0
-       vertex 0.0598715 -0.00392419 0
-    endloop
-  endfacet
-  facet normal 0.986642 -0.162902 0
-    outer loop
-       vertex 0.0594867 -0.00783157 0
-       vertex 0.0594867 -0.00783157 0.01
-       vertex 0.0588471 -0.0117054 0.01
-    endloop
-  endfacet
-  facet normal 0.986642 -0.162902 0
-    outer loop
-       vertex 0.0588471 -0.0117054 0.01
-       vertex 0.0588471 -0.0117054 0
-       vertex 0.0594867 -0.00783157 0
-    endloop
-  endfacet
-  facet normal 0.973875 -0.227085 0
-    outer loop
-       vertex 0.0588471 -0.0117054 0
-       vertex 0.0588471 -0.0117054 0.01
-       vertex 0.0579555 -0.0155291 0.01
-    endloop
-  endfacet
-  facet normal 0.973875 -0.227085 0
-    outer loop
-       vertex 0.0579555 -0.0155291 0.01
-       vertex 0.0579555 -0.0155291 0
-       vertex 0.0588471 -0.0117054 0
-    endloop
-  endfacet
-  facet normal 0.956945 -0.29027 0
-    outer loop
-       vertex 0.0579555 -0.0155291 0
-       vertex 0.0579555 -0.0155291 0.01
-       vertex 0.0568158 -0.0192864 0.01
-    endloop
-  endfacet
-  facet normal 0.956945 -0.29027 0
-    outer loop
-       vertex 0.0568158 -0.0192864 0.01
-       vertex 0.0568158 -0.0192864 0
-       vertex 0.0579555 -0.0155291 0
-    endloop
-  endfacet
-  facet normal 0.935908 -0.352245 0
-    outer loop
-       vertex 0.0568158 -0.0192864 0
-       vertex 0.0568158 -0.0192864 0.01
-       vertex 0.0554328 -0.022961 0.01
-    endloop
-  endfacet
-  facet normal 0.935908 -0.352245 0
-    outer loop
-       vertex 0.0554328 -0.022961 0.01
-       vertex 0.0554328 -0.022961 0
-       vertex 0.0568158 -0.0192864 0
-    endloop
-  endfacet
-  facet normal 0.910864 -0.412707 0
-    outer loop
-       vertex 0.0554328 -0.022961 0
-       vertex 0.0554328 -0.022961 0.01
-       vertex 0.0538124 -0.0265373 0.01
-    endloop
-  endfacet
-  facet normal 0.910864 -0.412707 0
-    outer loop
-       vertex 0.0538124 -0.0265373 0.01
-       vertex 0.0538124 -0.0265373 0
-       vertex 0.0554328 -0.022961 0
-    endloop
-  endfacet
-  facet normal 0.881916 -0.471406 0
-    outer loop
-       vertex 0.0538124 -0.0265373 0
-       vertex 0.0538124 -0.0265373 0.01
-       vertex 0.0519615 -0.03 0.01
-    endloop
-  endfacet
-  facet normal 0.881916 -0.471406 0
-    outer loop
-       vertex 0.0519615 -0.03 0.01
-       vertex 0.0519615 -0.03 0
-       vertex 0.0538124 -0.0265373 0
-    endloop
-  endfacet
-  facet normal 0.849207 -0.528061 0
-    outer loop
-       vertex 0.0519615 -0.03 0
-       vertex 0.0519615 -0.03 0.01
-       vertex 0.0498882 -0.0333342 0.01
-    endloop
-  endfacet
-  facet normal 0.849207 -0.528061 0
-    outer loop
-       vertex 0.0498882 -0.0333342 0.01
-       vertex 0.0498882 -0.0333342 0
-       vertex 0.0519615 -0.03 0
-    endloop
-  endfacet
-  facet normal 0.812846 -0.582478 0
-    outer loop
-       vertex 0.0498882 -0.0333342 0
-       vertex 0.0498882 -0.0333342 0.01
-       vertex 0.0476012 -0.0365257 0.01
-    endloop
-  endfacet
-  facet normal 0.812846 -0.582478 0
-    outer loop
-       vertex 0.0476012 -0.0365257 0.01
-       vertex 0.0476012 -0.0365257 0
-       vertex 0.0498882 -0.0333342 0
-    endloop
-  endfacet
-  facet normal 0.773005 -0.634399 0
-    outer loop
-       vertex 0.0476012 -0.0365257 0
-       vertex 0.0476012 -0.0365257 0.01
-       vertex 0.0451104 -0.0395607 0.01
-    endloop
-  endfacet
-  facet normal 0.773005 -0.634399 0
-    outer loop
-       vertex 0.0451104 -0.0395607 0.01
-       vertex 0.0451104 -0.0395607 0
-       vertex 0.0476012 -0.0365257 0
-    endloop
-  endfacet
-  facet normal 0.729867 -0.683589 0
-    outer loop
-       vertex 0.0451104 -0.0395607 0
-       vertex 0.0451104 -0.0395607 0.01
-       vertex 0.0424264 -0.0424264 0.01
-    endloop
-  endfacet
-  facet normal 0.729867 -0.683589 0
-    outer loop
-       vertex 0.0424264 -0.0424264 0.01
-       vertex 0.0424264 -0.0424264 0
-       vertex 0.0451104 -0.0395607 0
-    endloop
-  endfacet
-  facet normal 0.683589 -0.729867 0
-    outer loop
-       vertex 0.0424264 -0.0424264 0
-       vertex 0.0424264 -0.0424264 0.01
-       vertex 0.0395607 -0.0451104 0.01
-    endloop
-  endfacet
-  facet normal 0.683589 -0.729867 0
-    outer loop
-       vertex 0.0395607 -0.0451104 0.01
-       vertex 0.0395607 -0.0451104 0
-       vertex 0.0424264 -0.0424264 0
-    endloop
-  endfacet
-  facet normal 0.634399 -0.773005 0
-    outer loop
-       vertex 0.0395607 -0.0451104 0
-       vertex 0.0395607 -0.0451104 0.01
-       vertex 0.0365257 -0.0476012 0.01
-    endloop
-  endfacet
-  facet normal 0.634399 -0.773005 0
-    outer loop
-       vertex 0.0365257 -0.0476012 0.01
-       vertex 0.0365257 -0.0476012 0
-       vertex 0.0395607 -0.0451104 0
-    endloop
-  endfacet
-  facet normal 0.582478 -0.812846 0
-    outer loop
-       vertex 0.0365257 -0.0476012 0
-       vertex 0.0365257 -0.0476012 0.01
-       vertex 0.0333342 -0.0498882 0.01
-    endloop
-  endfacet
-  facet normal 0.582478 -0.812846 0
-    outer loop
-       vertex 0.0333342 -0.0498882 0.01
-       vertex 0.0333342 -0.0498882 0
-       vertex 0.0365257 -0.0476012 0
-    endloop
-  endfacet
-  facet normal 0.528061 -0.849207 0
-    outer loop
-       vertex 0.0333342 -0.0498882 0
-       vertex 0.0333342 -0.0498882 0.01
-       vertex 0.03 -0.0519615 0.01
-    endloop
-  endfacet
-  facet normal 0.528061 -0.849207 0
-    outer loop
-       vertex 0.03 -0.0519615 0.01
-       vertex 0.03 -0.0519615 0
-       vertex 0.0333342 -0.0498882 0
-    endloop
-  endfacet
-  facet normal 0.471406 -0.881916 0
-    outer loop
-       vertex 0.03 -0.0519615 0
-       vertex 0.03 -0.0519615 0.01
-       vertex 0.0265373 -0.0538124 0.01
-    endloop
-  endfacet
-  facet normal 0.471406 -0.881916 0
-    outer loop
-       vertex 0.0265373 -0.0538124 0.01
-       vertex 0.0265373 -0.0538124 0
-       vertex 0.03 -0.0519615 0
-    endloop
-  endfacet
-  facet normal 0.412707 -0.910864 0
-    outer loop
-       vertex 0.0265373 -0.0538124 0
-       vertex 0.0265373 -0.0538124 0.01
-       vertex 0.022961 -0.0554328 0.01
-    endloop
-  endfacet
-  facet normal 0.412707 -0.910864 0
-    outer loop
-       vertex 0.022961 -0.0554328 0.01
-       vertex 0.022961 -0.0554328 0
-       vertex 0.0265373 -0.0538124 0
-    endloop
-  endfacet
-  facet normal 0.352245 -0.935908 0
-    outer loop
-       vertex 0.022961 -0.0554328 0
-       vertex 0.022961 -0.0554328 0.01
-       vertex 0.0192864 -0.0568158 0.01
-    endloop
-  endfacet
-  facet normal 0.352245 -0.935908 0
-    outer loop
-       vertex 0.0192864 -0.0568158 0.01
-       vertex 0.0192864 -0.0568158 0
-       vertex 0.022961 -0.0554328 0
-    endloop
-  endfacet
-  facet normal 0.29027 -0.956945 0
-    outer loop
-       vertex 0.0192864 -0.0568158 0
-       vertex 0.0192864 -0.0568158 0.01
-       vertex 0.0155291 -0.0579555 0.01
-    endloop
-  endfacet
-  facet normal 0.29027 -0.956945 0
-    outer loop
-       vertex 0.0155291 -0.0579555 0.01
-       vertex 0.0155291 -0.0579555 0
-       vertex 0.0192864 -0.0568158 0
-    endloop
-  endfacet
-  facet normal 0.227085 -0.973875 0
-    outer loop
-       vertex 0.0155291 -0.0579555 0
-       vertex 0.0155291 -0.0579555 0.01
-       vertex 0.0117054 -0.0588471 0.01
-    endloop
-  endfacet
-  facet normal 0.227085 -0.973875 0
-    outer loop
-       vertex 0.0117054 -0.0588471 0.01
-       vertex 0.0117054 -0.0588471 0
-       vertex 0.0155291 -0.0579555 0
-    endloop
-  endfacet
-  facet normal 0.162902 -0.986642 0
-    outer loop
-       vertex 0.0117054 -0.0588471 0
-       vertex 0.0117054 -0.0588471 0.01
-       vertex 0.00783157 -0.0594867 0.01
-    endloop
-  endfacet
-  facet normal 0.162902 -0.986642 0
-    outer loop
-       vertex 0.00783157 -0.0594867 0.01
-       vertex 0.00783157 -0.0594867 0
-       vertex 0.0117054 -0.0588471 0
-    endloop
-  endfacet
-  facet normal 0.0980062 -0.995186 0
-    outer loop
-       vertex 0.00783157 -0.0594867 0
-       vertex 0.00783157 -0.0594867 0.01
-       vertex 0.00392419 -0.0598715 0.01
-    endloop
-  endfacet
-  facet normal 0.0980062 -0.995186 0
-    outer loop
-       vertex 0.00392419 -0.0598715 0.01
-       vertex 0.00392419 -0.0598715 0
-       vertex 0.00783157 -0.0594867 0
-    endloop
-  endfacet
-  facet normal 0.0327281 -0.999464 0
-    outer loop
-       vertex 0.00392419 -0.0598715 0
-       vertex 0.00392419 -0.0598715 0.01
-       vertex 1.07694e-10 -0.06 0.01
-    endloop
-  endfacet
-  facet normal 0.0327281 -0.999464 0
-    outer loop
-       vertex 1.07694e-10 -0.06 0.01
-       vertex 1.07694e-10 -0.06 0
-       vertex 0.00392419 -0.0598715 0
-    endloop
-  endfacet
-  facet normal -0.0327281 -0.999464 0
-    outer loop
-       vertex 1.07694e-10 -0.06 0
-       vertex 1.07694e-10 -0.06 0.01
-       vertex -0.00392419 -0.0598715 0.01
-    endloop
-  endfacet
-  facet normal -0.0327281 -0.999464 -0
-    outer loop
-       vertex -0.00392419 -0.0598715 0.01
-       vertex -0.00392419 -0.0598715 0
-       vertex 1.07694e-10 -0.06 0
-    endloop
-  endfacet
-  facet normal -0.0980062 -0.995186 0
-    outer loop
-       vertex -0.00392419 -0.0598715 0
-       vertex -0.00392419 -0.0598715 0.01
-       vertex -0.00783157 -0.0594867 0.01
-    endloop
-  endfacet
-  facet normal -0.0980062 -0.995186 -0
-    outer loop
-       vertex -0.00783157 -0.0594867 0.01
-       vertex -0.00783157 -0.0594867 0
-       vertex -0.00392419 -0.0598715 0
-    endloop
-  endfacet
-  facet normal -0.162902 -0.986642 0
-    outer loop
-       vertex -0.00783157 -0.0594867 0
-       vertex -0.00783157 -0.0594867 0.01
-       vertex -0.0117054 -0.0588471 0.01
-    endloop
-  endfacet
-  facet normal -0.162902 -0.986642 -0
-    outer loop
-       vertex -0.0117054 -0.0588471 0.01
-       vertex -0.0117054 -0.0588471 0
-       vertex -0.00783157 -0.0594867 0
-    endloop
-  endfacet
-  facet normal -0.227085 -0.973875 0
-    outer loop
-       vertex -0.0117054 -0.0588471 0
-       vertex -0.0117054 -0.0588471 0.01
-       vertex -0.0155291 -0.0579555 0.01
-    endloop
-  endfacet
-  facet normal -0.227085 -0.973875 -0
-    outer loop
-       vertex -0.0155291 -0.0579555 0.01
-       vertex -0.0155291 -0.0579555 0
-       vertex -0.0117054 -0.0588471 0
-    endloop
-  endfacet
-  facet normal -0.29027 -0.956945 0
-    outer loop
-       vertex -0.0155291 -0.0579555 0
-       vertex -0.0155291 -0.0579555 0.01
-       vertex -0.0192864 -0.0568158 0.01
-    endloop
-  endfacet
-  facet normal -0.29027 -0.956945 -0
-    outer loop
-       vertex -0.0192864 -0.0568158 0.01
-       vertex -0.0192864 -0.0568158 0
-       vertex -0.0155291 -0.0579555 0
-    endloop
-  endfacet
-  facet normal -0.352245 -0.935908 0
-    outer loop
-       vertex -0.0192864 -0.0568158 0
-       vertex -0.0192864 -0.0568158 0.01
-       vertex -0.022961 -0.0554328 0.01
-    endloop
-  endfacet
-  facet normal -0.352245 -0.935908 -0
-    outer loop
-       vertex -0.022961 -0.0554328 0.01
-       vertex -0.022961 -0.0554328 0
-       vertex -0.0192864 -0.0568158 0
-    endloop
-  endfacet
-  facet normal -0.412707 -0.910864 0
-    outer loop
-       vertex -0.022961 -0.0554328 0
-       vertex -0.022961 -0.0554328 0.01
-       vertex -0.0265373 -0.0538124 0.01
-    endloop
-  endfacet
-  facet normal -0.412707 -0.910864 -0
-    outer loop
-       vertex -0.0265373 -0.0538124 0.01
-       vertex -0.0265373 -0.0538124 0
-       vertex -0.022961 -0.0554328 0
-    endloop
-  endfacet
-  facet normal -0.471406 -0.881916 0
-    outer loop
-       vertex -0.0265373 -0.0538124 0
-       vertex -0.0265373 -0.0538124 0.01
-       vertex -0.03 -0.0519615 0.01
-    endloop
-  endfacet
-  facet normal -0.471406 -0.881916 -0
-    outer loop
-       vertex -0.03 -0.0519615 0.01
-       vertex -0.03 -0.0519615 0
-       vertex -0.0265373 -0.0538124 0
-    endloop
-  endfacet
-  facet normal -0.528061 -0.849207 0
-    outer loop
-       vertex -0.03 -0.0519615 0
-       vertex -0.03 -0.0519615 0.01
-       vertex -0.0333342 -0.0498882 0.01
-    endloop
-  endfacet
-  facet normal -0.528061 -0.849207 -0
-    outer loop
-       vertex -0.0333342 -0.0498882 0.01
-       vertex -0.0333342 -0.0498882 0
-       vertex -0.03 -0.0519615 0
-    endloop
-  endfacet
-  facet normal -0.582478 -0.812846 0
-    outer loop
-       vertex -0.0333342 -0.0498882 0
-       vertex -0.0333342 -0.0498882 0.01
-       vertex -0.0365257 -0.0476012 0.01
-    endloop
-  endfacet
-  facet normal -0.582478 -0.812846 -0
-    outer loop
-       vertex -0.0365257 -0.0476012 0.01
-       vertex -0.0365257 -0.0476012 0
-       vertex -0.0333342 -0.0498882 0
-    endloop
-  endfacet
-  facet normal -0.634399 -0.773005 0
-    outer loop
-       vertex -0.0365257 -0.0476012 0
-       vertex -0.0365257 -0.0476012 0.01
-       vertex -0.0395607 -0.0451104 0.01
-    endloop
-  endfacet
-  facet normal -0.634399 -0.773005 -0
-    outer loop
-       vertex -0.0395607 -0.0451104 0.01
-       vertex -0.0395607 -0.0451104 0
-       vertex -0.0365257 -0.0476012 0
-    endloop
-  endfacet
-  facet normal -0.683589 -0.729867 0
-    outer loop
-       vertex -0.0395607 -0.0451104 0
-       vertex -0.0395607 -0.0451104 0.01
-       vertex -0.0424264 -0.0424264 0.01
-    endloop
-  endfacet
-  facet normal -0.683589 -0.729867 -0
-    outer loop
-       vertex -0.0424264 -0.0424264 0.01
-       vertex -0.0424264 -0.0424264 0
-       vertex -0.0395607 -0.0451104 0
-    endloop
-  endfacet
-  facet normal -0.729867 -0.683589 0
-    outer loop
-       vertex -0.0424264 -0.0424264 0
-       vertex -0.0424264 -0.0424264 0.01
-       vertex -0.0451104 -0.0395607 0.01
-    endloop
-  endfacet
-  facet normal -0.729867 -0.683589 -0
-    outer loop
-       vertex -0.0451104 -0.0395607 0.01
-       vertex -0.0451104 -0.0395607 0
-       vertex -0.0424264 -0.0424264 0
-    endloop
-  endfacet
-  facet normal -0.773005 -0.634399 0
-    outer loop
-       vertex -0.0451104 -0.0395607 0
-       vertex -0.0451104 -0.0395607 0.01
-       vertex -0.0476012 -0.0365257 0.01
-    endloop
-  endfacet
-  facet normal -0.773005 -0.634399 -0
-    outer loop
-       vertex -0.0476012 -0.0365257 0.01
-       vertex -0.0476012 -0.0365257 0
-       vertex -0.0451104 -0.0395607 0
-    endloop
-  endfacet
-  facet normal -0.812846 -0.582478 0
-    outer loop
-       vertex -0.0476012 -0.0365257 0
-       vertex -0.0476012 -0.0365257 0.01
-       vertex -0.0498882 -0.0333342 0.01
-    endloop
-  endfacet
-  facet normal -0.812846 -0.582478 -0
-    outer loop
-       vertex -0.0498882 -0.0333342 0.01
-       vertex -0.0498882 -0.0333342 0
-       vertex -0.0476012 -0.0365257 0
-    endloop
-  endfacet
-  facet normal -0.849207 -0.528061 0
-    outer loop
-       vertex -0.0498882 -0.0333342 0
-       vertex -0.0498882 -0.0333342 0.01
-       vertex -0.0519615 -0.03 0.01
-    endloop
-  endfacet
-  facet normal -0.849207 -0.528061 -0
-    outer loop
-       vertex -0.0519615 -0.03 0.01
-       vertex -0.0519615 -0.03 0
-       vertex -0.0498882 -0.0333342 0
-    endloop
-  endfacet
-  facet normal -0.881916 -0.471406 0
-    outer loop
-       vertex -0.0519615 -0.03 0
-       vertex -0.0519615 -0.03 0.01
-       vertex -0.0538124 -0.0265373 0.01
-    endloop
-  endfacet
-  facet normal -0.881916 -0.471406 -0
-    outer loop
-       vertex -0.0538124 -0.0265373 0.01
-       vertex -0.0538124 -0.0265373 0
-       vertex -0.0519615 -0.03 0
-    endloop
-  endfacet
-  facet normal -0.910864 -0.412707 0
-    outer loop
-       vertex -0.0538124 -0.0265373 0
-       vertex -0.0538124 -0.0265373 0.01
-       vertex -0.0554328 -0.022961 0.01
-    endloop
-  endfacet
-  facet normal -0.910864 -0.412707 -0
-    outer loop
-       vertex -0.0554328 -0.022961 0.01
-       vertex -0.0554328 -0.022961 0
-       vertex -0.0538124 -0.0265373 0
-    endloop
-  endfacet
-  facet normal -0.935908 -0.352245 0
-    outer loop
-       vertex -0.0554328 -0.022961 0
-       vertex -0.0554328 -0.022961 0.01
-       vertex -0.0568158 -0.0192864 0.01
-    endloop
-  endfacet
-  facet normal -0.935908 -0.352245 -0
-    outer loop
-       vertex -0.0568158 -0.0192864 0.01
-       vertex -0.0568158 -0.0192864 0
-       vertex -0.0554328 -0.022961 0
-    endloop
-  endfacet
-  facet normal -0.956945 -0.29027 0
-    outer loop
-       vertex -0.0568158 -0.0192864 0
-       vertex -0.0568158 -0.0192864 0.01
-       vertex -0.0579555 -0.0155291 0.01
-    endloop
-  endfacet
-  facet normal -0.956945 -0.29027 -0
-    outer loop
-       vertex -0.0579555 -0.0155291 0.01
-       vertex -0.0579555 -0.0155291 0
-       vertex -0.0568158 -0.0192864 0
-    endloop
-  endfacet
-  facet normal -0.973875 -0.227085 0
-    outer loop
-       vertex -0.0579555 -0.0155291 0
-       vertex -0.0579555 -0.0155291 0.01
-       vertex -0.0588471 -0.0117054 0.01
-    endloop
-  endfacet
-  facet normal -0.973875 -0.227085 -0
-    outer loop
-       vertex -0.0588471 -0.0117054 0.01
-       vertex -0.0588471 -0.0117054 0
-       vertex -0.0579555 -0.0155291 0
-    endloop
-  endfacet
-  facet normal -0.986642 -0.162902 0
-    outer loop
-       vertex -0.0588471 -0.0117054 0
-       vertex -0.0588471 -0.0117054 0.01
-       vertex -0.0594867 -0.00783157 0.01
-    endloop
-  endfacet
-  facet normal -0.986642 -0.162902 -0
-    outer loop
-       vertex -0.0594867 -0.00783157 0.01
-       vertex -0.0594867 -0.00783157 0
-       vertex -0.0588471 -0.0117054 0
-    endloop
-  endfacet
-  facet normal -0.995186 -0.0980062 0
-    outer loop
-       vertex -0.0594867 -0.00783157 0
-       vertex -0.0594867 -0.00783157 0.01
-       vertex -0.0598715 -0.00392419 0.01
-    endloop
-  endfacet
-  facet normal -0.995186 -0.0980062 -0
-    outer loop
-       vertex -0.0598715 -0.00392419 0.01
-       vertex -0.0598715 -0.00392419 0
-       vertex -0.0594867 -0.00783157 0
-    endloop
-  endfacet
-  facet normal -0.999464 -0.0327281 0
-    outer loop
-       vertex -0.0598715 -0.00392419 0
-       vertex -0.0598715 -0.00392419 0.01
-       vertex -0.06 2.15388e-10 0.01
-    endloop
-  endfacet
-  facet normal -0.999464 -0.0327281 -0
-    outer loop
-       vertex -0.06 2.15388e-10 0.01
-       vertex -0.06 2.15388e-10 0
-       vertex -0.0598715 -0.00392419 0
-    endloop
-  endfacet
-  facet normal -0.999464 0.0327281 0
-    outer loop
-       vertex -0.06 2.15388e-10 0
-       vertex -0.06 2.15388e-10 0.01
-       vertex -0.0598715 0.00392419 0.01
-    endloop
-  endfacet
-  facet normal -0.999464 0.0327281 0
-    outer loop
-       vertex -0.0598715 0.00392419 0.01
-       vertex -0.0598715 0.00392419 0
-       vertex -0.06 2.15388e-10 0
-    endloop
-  endfacet
-  facet normal -0.995186 0.0980062 0
-    outer loop
-       vertex -0.0598715 0.00392419 0
-       vertex -0.0598715 0.00392419 0.01
-       vertex -0.0594867 0.00783157 0.01
-    endloop
-  endfacet
-  facet normal -0.995186 0.0980062 0
-    outer loop
-       vertex -0.0594867 0.00783157 0.01
-       vertex -0.0594867 0.00783157 0
-       vertex -0.0598715 0.00392419 0
-    endloop
-  endfacet
-  facet normal -0.986642 0.162902 0
-    outer loop
-       vertex -0.0594867 0.00783157 0
-       vertex -0.0594867 0.00783157 0.01
-       vertex -0.0588471 0.0117054 0.01
-    endloop
-  endfacet
-  facet normal -0.986642 0.162902 0
-    outer loop
-       vertex -0.0588471 0.0117054 0.01
-       vertex -0.0588471 0.0117054 0
-       vertex -0.0594867 0.00783157 0
-    endloop
-  endfacet
-  facet normal -0.973875 0.227085 0
-    outer loop
-       vertex -0.0588471 0.0117054 0
-       vertex -0.0588471 0.0117054 0.01
-       vertex -0.0579555 0.0155291 0.01
-    endloop
-  endfacet
-  facet normal -0.973875 0.227085 0
-    outer loop
-       vertex -0.0579555 0.0155291 0.01
-       vertex -0.0579555 0.0155291 0
-       vertex -0.0588471 0.0117054 0
-    endloop
-  endfacet
-  facet normal -0.956945 0.29027 0
-    outer loop
-       vertex -0.0579555 0.0155291 0
-       vertex -0.0579555 0.0155291 0.01
-       vertex -0.0568158 0.0192864 0.01
-    endloop
-  endfacet
-  facet normal -0.956945 0.29027 0
-    outer loop
-       vertex -0.0568158 0.0192864 0.01
-       vertex -0.0568158 0.0192864 0
-       vertex -0.0579555 0.0155291 0
-    endloop
-  endfacet
-  facet normal -0.935908 0.352245 0
-    outer loop
-       vertex -0.0568158 0.0192864 0
-       vertex -0.0568158 0.0192864 0.01
-       vertex -0.0554328 0.022961 0.01
-    endloop
-  endfacet
-  facet normal -0.935908 0.352245 0
-    outer loop
-       vertex -0.0554328 0.022961 0.01
-       vertex -0.0554328 0.022961 0
-       vertex -0.0568158 0.0192864 0
-    endloop
-  endfacet
-  facet normal -0.910864 0.412707 0
-    outer loop
-       vertex -0.0554328 0.022961 0
-       vertex -0.0554328 0.022961 0.01
-       vertex -0.0538124 0.0265373 0.01
-    endloop
-  endfacet
-  facet normal -0.910864 0.412707 0
-    outer loop
-       vertex -0.0538124 0.0265373 0.01
-       vertex -0.0538124 0.0265373 0
-       vertex -0.0554328 0.022961 0
-    endloop
-  endfacet
-  facet normal -0.881916 0.471406 0
-    outer loop
-       vertex -0.0538124 0.0265373 0
-       vertex -0.0538124 0.0265373 0.01
-       vertex -0.0519615 0.03 0.01
-    endloop
-  endfacet
-  facet normal -0.881916 0.471406 0
-    outer loop
-       vertex -0.0519615 0.03 0.01
-       vertex -0.0519615 0.03 0
-       vertex -0.0538124 0.0265373 0
-    endloop
-  endfacet
-  facet normal -0.849207 0.528061 0
-    outer loop
-       vertex -0.0519615 0.03 0
-       vertex -0.0519615 0.03 0.01
-       vertex -0.0498882 0.0333342 0.01
-    endloop
-  endfacet
-  facet normal -0.849207 0.528061 0
-    outer loop
-       vertex -0.0498882 0.0333342 0.01
-       vertex -0.0498882 0.0333342 0
-       vertex -0.0519615 0.03 0
-    endloop
-  endfacet
-  facet normal -0.812846 0.582478 0
-    outer loop
-       vertex -0.0498882 0.0333342 0
-       vertex -0.0498882 0.0333342 0.01
-       vertex -0.0476012 0.0365257 0.01
-    endloop
-  endfacet
-  facet normal -0.812846 0.582478 0
-    outer loop
-       vertex -0.0476012 0.0365257 0.01
-       vertex -0.0476012 0.0365257 0
-       vertex -0.0498882 0.0333342 0
-    endloop
-  endfacet
-  facet normal -0.773005 0.634399 0
-    outer loop
-       vertex -0.0476012 0.0365257 0
-       vertex -0.0476012 0.0365257 0.01
-       vertex -0.0451104 0.0395607 0.01
-    endloop
-  endfacet
-  facet normal -0.773005 0.634399 0
-    outer loop
-       vertex -0.0451104 0.0395607 0.01
-       vertex -0.0451104 0.0395607 0
-       vertex -0.0476012 0.0365257 0
-    endloop
-  endfacet
-  facet normal -0.729867 0.683589 0
-    outer loop
-       vertex -0.0451104 0.0395607 0
-       vertex -0.0451104 0.0395607 0.01
-       vertex -0.0424264 0.0424264 0.01
-    endloop
-  endfacet
-  facet normal -0.729867 0.683589 0
-    outer loop
-       vertex -0.0424264 0.0424264 0.01
-       vertex -0.0424264 0.0424264 0
-       vertex -0.0451104 0.0395607 0
-    endloop
-  endfacet
-  facet normal -0.683589 0.729867 0
-    outer loop
-       vertex -0.0424264 0.0424264 0
-       vertex -0.0424264 0.0424264 0.01
-       vertex -0.0395607 0.0451104 0.01
-    endloop
-  endfacet
-  facet normal -0.683589 0.729867 0
-    outer loop
-       vertex -0.0395607 0.0451104 0.01
-       vertex -0.0395607 0.0451104 0
-       vertex -0.0424264 0.0424264 0
-    endloop
-  endfacet
-  facet normal -0.634399 0.773005 0
-    outer loop
-       vertex -0.0395607 0.0451104 0
-       vertex -0.0395607 0.0451104 0.01
-       vertex -0.0365257 0.0476012 0.01
-    endloop
-  endfacet
-  facet normal -0.634399 0.773005 0
-    outer loop
-       vertex -0.0365257 0.0476012 0.01
-       vertex -0.0365257 0.0476012 0
-       vertex -0.0395607 0.0451104 0
-    endloop
-  endfacet
-  facet normal -0.582478 0.812846 0
-    outer loop
-       vertex -0.0365257 0.0476012 0
-       vertex -0.0365257 0.0476012 0.01
-       vertex -0.0333342 0.0498882 0.01
-    endloop
-  endfacet
-  facet normal -0.582478 0.812846 0
-    outer loop
-       vertex -0.0333342 0.0498882 0.01
-       vertex -0.0333342 0.0498882 0
-       vertex -0.0365257 0.0476012 0
-    endloop
-  endfacet
-  facet normal -0.528061 0.849207 0
-    outer loop
-       vertex -0.0333342 0.0498882 0
-       vertex -0.0333342 0.0498882 0.01
-       vertex -0.03 0.0519615 0.01
-    endloop
-  endfacet
-  facet normal -0.528061 0.849207 0
-    outer loop
-       vertex -0.03 0.0519615 0.01
-       vertex -0.03 0.0519615 0
-       vertex -0.0333342 0.0498882 0
-    endloop
-  endfacet
-  facet normal -0.471406 0.881916 0
-    outer loop
-       vertex -0.03 0.0519615 0
-       vertex -0.03 0.0519615 0.01
-       vertex -0.0265373 0.0538124 0.01
-    endloop
-  endfacet
-  facet normal -0.471406 0.881916 0
-    outer loop
-       vertex -0.0265373 0.0538124 0.01
-       vertex -0.0265373 0.0538124 0
-       vertex -0.03 0.0519615 0
-    endloop
-  endfacet
-  facet normal -0.412707 0.910864 0
-    outer loop
-       vertex -0.0265373 0.0538124 0
-       vertex -0.0265373 0.0538124 0.01
-       vertex -0.022961 0.0554328 0.01
-    endloop
-  endfacet
-  facet normal -0.412707 0.910864 0
-    outer loop
-       vertex -0.022961 0.0554328 0.01
-       vertex -0.022961 0.0554328 0
-       vertex -0.0265373 0.0538124 0
-    endloop
-  endfacet
-  facet normal -0.352245 0.935908 0
-    outer loop
-       vertex -0.022961 0.0554328 0
-       vertex -0.022961 0.0554328 0.01
-       vertex -0.0192864 0.0568158 0.01
-    endloop
-  endfacet
-  facet normal -0.352245 0.935908 0
-    outer loop
-       vertex -0.0192864 0.0568158 0.01
-       vertex -0.0192864 0.0568158 0
-       vertex -0.022961 0.0554328 0
-    endloop
-  endfacet
-  facet normal -0.29027 0.956945 0
-    outer loop
-       vertex -0.0192864 0.0568158 0
-       vertex -0.0192864 0.0568158 0.01
-       vertex -0.0155291 0.0579555 0.01
-    endloop
-  endfacet
-  facet normal -0.29027 0.956945 0
-    outer loop
-       vertex -0.0155291 0.0579555 0.01
-       vertex -0.0155291 0.0579555 0
-       vertex -0.0192864 0.0568158 0
-    endloop
-  endfacet
-  facet normal -0.227085 0.973875 0
-    outer loop
-       vertex -0.0155291 0.0579555 0
-       vertex -0.0155291 0.0579555 0.01
-       vertex -0.0117054 0.0588471 0.01
-    endloop
-  endfacet
-  facet normal -0.227085 0.973875 0
-    outer loop
-       vertex -0.0117054 0.0588471 0.01
-       vertex -0.0117054 0.0588471 0
-       vertex -0.0155291 0.0579555 0
-    endloop
-  endfacet
-  facet normal -0.162902 0.986642 0
-    outer loop
-       vertex -0.0117054 0.0588471 0
-       vertex -0.0117054 0.0588471 0.01
-       vertex -0.00783157 0.0594867 0.01
-    endloop
-  endfacet
-  facet normal -0.162902 0.986642 0
-    outer loop
-       vertex -0.00783157 0.0594867 0.01
-       vertex -0.00783157 0.0594867 0
-       vertex -0.0117054 0.0588471 0
-    endloop
-  endfacet
-  facet normal -0.0980062 0.995186 0
-    outer loop
-       vertex -0.00783157 0.0594867 0
-       vertex -0.00783157 0.0594867 0.01
-       vertex -0.00392419 0.0598715 0.01
-    endloop
-  endfacet
-  facet normal -0.0980062 0.995186 0
-    outer loop
-       vertex -0.00392419 0.0598715 0.01
-       vertex -0.00392419 0.0598715 0
-       vertex -0.00783157 0.0594867 0
-    endloop
-  endfacet
-  facet normal -0.0327281 0.999464 0
-    outer loop
-       vertex -0.00392419 0.0598715 0
-       vertex -0.00392419 0.0598715 0.01
-       vertex 1.07694e-10 0.06 0.01
-    endloop
-  endfacet
-  facet normal -0.0327281 0.999464 0
-    outer loop
-       vertex 1.07694e-10 0.06 0.01
-       vertex 1.07694e-10 0.06 0
-       vertex -0.00392419 0.0598715 0
-    endloop
-  endfacet
-  facet normal 0.0327281 0.999464 -0
-    outer loop
-       vertex 1.07694e-10 0.06 0
-       vertex 1.07694e-10 0.06 0.01
-       vertex 0.00392419 0.0598715 0.01
-    endloop
-  endfacet
-  facet normal 0.0327281 0.999464 0
-    outer loop
-       vertex 0.00392419 0.0598715 0.01
-       vertex 0.00392419 0.0598715 0
-       vertex 1.07694e-10 0.06 0
-    endloop
-  endfacet
-  facet normal 0.0980062 0.995186 -0
-    outer loop
-       vertex 0.00392419 0.0598715 0
-       vertex 0.00392419 0.0598715 0.01
-       vertex 0.00783157 0.0594867 0.01
-    endloop
-  endfacet
-  facet normal 0.0980062 0.995186 0
-    outer loop
-       vertex 0.00783157 0.0594867 0.01
-       vertex 0.00783157 0.0594867 0
-       vertex 0.00392419 0.0598715 0
-    endloop
-  endfacet
-  facet normal 0.162902 0.986642 -0
-    outer loop
-       vertex 0.00783157 0.0594867 0
-       vertex 0.00783157 0.0594867 0.01
-       vertex 0.0117054 0.0588471 0.01
-    endloop
-  endfacet
-  facet normal 0.162902 0.986642 0
-    outer loop
-       vertex 0.0117054 0.0588471 0.01
-       vertex 0.0117054 0.0588471 0
-       vertex 0.00783157 0.0594867 0
-    endloop
-  endfacet
-  facet normal 0.227085 0.973875 -0
-    outer loop
-       vertex 0.0117054 0.0588471 0
-       vertex 0.0117054 0.0588471 0.01
-       vertex 0.0155291 0.0579555 0.01
-    endloop
-  endfacet
-  facet normal 0.227085 0.973875 0
-    outer loop
-       vertex 0.0155291 0.0579555 0.01
-       vertex 0.0155291 0.0579555 0
-       vertex 0.0117054 0.0588471 0
-    endloop
-  endfacet
-  facet normal 0.29027 0.956945 -0
-    outer loop
-       vertex 0.0155291 0.0579555 0
-       vertex 0.0155291 0.0579555 0.01
-       vertex 0.0192864 0.0568158 0.01
-    endloop
-  endfacet
-  facet normal 0.29027 0.956945 0
-    outer loop
-       vertex 0.0192864 0.0568158 0.01
-       vertex 0.0192864 0.0568158 0
-       vertex 0.0155291 0.0579555 0
-    endloop
-  endfacet
-  facet normal 0.352245 0.935908 -0
-    outer loop
-       vertex 0.0192864 0.0568158 0
-       vertex 0.0192864 0.0568158 0.01
-       vertex 0.022961 0.0554328 0.01
-    endloop
-  endfacet
-  facet normal 0.352245 0.935908 0
-    outer loop
-       vertex 0.022961 0.0554328 0.01
-       vertex 0.022961 0.0554328 0
-       vertex 0.0192864 0.0568158 0
-    endloop
-  endfacet
-  facet normal 0.412707 0.910864 -0
-    outer loop
-       vertex 0.022961 0.0554328 0
-       vertex 0.022961 0.0554328 0.01
-       vertex 0.0265373 0.0538124 0.01
-    endloop
-  endfacet
-  facet normal 0.412707 0.910864 0
-    outer loop
-       vertex 0.0265373 0.0538124 0.01
-       vertex 0.0265373 0.0538124 0
-       vertex 0.022961 0.0554328 0
-    endloop
-  endfacet
-  facet normal 0.471406 0.881916 -0
-    outer loop
-       vertex 0.0265373 0.0538124 0
-       vertex 0.0265373 0.0538124 0.01
-       vertex 0.03 0.0519615 0.01
-    endloop
-  endfacet
-  facet normal 0.471406 0.881916 0
-    outer loop
-       vertex 0.03 0.0519615 0.01
-       vertex 0.03 0.0519615 0
-       vertex 0.0265373 0.0538124 0
-    endloop
-  endfacet
-  facet normal 0.528061 0.849207 -0
-    outer loop
-       vertex 0.03 0.0519615 0
-       vertex 0.03 0.0519615 0.01
-       vertex 0.0333342 0.0498882 0.01
-    endloop
-  endfacet
-  facet normal 0.528061 0.849207 0
-    outer loop
-       vertex 0.0333342 0.0498882 0.01
-       vertex 0.0333342 0.0498882 0
-       vertex 0.03 0.0519615 0
-    endloop
-  endfacet
-  facet normal 0.582478 0.812846 -0
-    outer loop
-       vertex 0.0333342 0.0498882 0
-       vertex 0.0333342 0.0498882 0.01
-       vertex 0.0365257 0.0476012 0.01
-    endloop
-  endfacet
-  facet normal 0.582478 0.812846 0
-    outer loop
-       vertex 0.0365257 0.0476012 0.01
-       vertex 0.0365257 0.0476012 0
-       vertex 0.0333342 0.0498882 0
-    endloop
-  endfacet
-  facet normal 0.634399 0.773005 -0
-    outer loop
-       vertex 0.0365257 0.0476012 0
-       vertex 0.0365257 0.0476012 0.01
-       vertex 0.0395607 0.0451104 0.01
-    endloop
-  endfacet
-  facet normal 0.634399 0.773005 0
-    outer loop
-       vertex 0.0395607 0.0451104 0.01
-       vertex 0.0395607 0.0451104 0
-       vertex 0.0365257 0.0476012 0
-    endloop
-  endfacet
-  facet normal 0.683589 0.729867 -0
-    outer loop
-       vertex 0.0395607 0.0451104 0
-       vertex 0.0395607 0.0451104 0.01
-       vertex 0.0424264 0.0424264 0.01
-    endloop
-  endfacet
-  facet normal 0.683589 0.729867 0
-    outer loop
-       vertex 0.0424264 0.0424264 0.01
-       vertex 0.0424264 0.0424264 0
-       vertex 0.0395607 0.0451104 0
-    endloop
-  endfacet
-  facet normal 0.729867 0.683589 -0
-    outer loop
-       vertex 0.0424264 0.0424264 0
-       vertex 0.0424264 0.0424264 0.01
-       vertex 0.0451104 0.0395607 0.01
-    endloop
-  endfacet
-  facet normal 0.729867 0.683589 0
-    outer loop
-       vertex 0.0451104 0.0395607 0.01
-       vertex 0.0451104 0.0395607 0
-       vertex 0.0424264 0.0424264 0
-    endloop
-  endfacet
-  facet normal 0.773005 0.634399 -0
-    outer loop
-       vertex 0.0451104 0.0395607 0
-       vertex 0.0451104 0.0395607 0.01
-       vertex 0.0476012 0.0365257 0.01
-    endloop
-  endfacet
-  facet normal 0.773005 0.634399 0
-    outer loop
-       vertex 0.0476012 0.0365257 0.01
-       vertex 0.0476012 0.0365257 0
-       vertex 0.0451104 0.0395607 0
-    endloop
-  endfacet
-  facet normal 0.812846 0.582478 -0
-    outer loop
-       vertex 0.0476012 0.0365257 0
-       vertex 0.0476012 0.0365257 0.01
-       vertex 0.0498882 0.0333342 0.01
-    endloop
-  endfacet
-  facet normal 0.812846 0.582478 0
-    outer loop
-       vertex 0.0498882 0.0333342 0.01
-       vertex 0.0498882 0.0333342 0
-       vertex 0.0476012 0.0365257 0
-    endloop
-  endfacet
-  facet normal 0.849207 0.528061 -0
-    outer loop
-       vertex 0.0498882 0.0333342 0
-       vertex 0.0498882 0.0333342 0.01
-       vertex 0.0519615 0.03 0.01
-    endloop
-  endfacet
-  facet normal 0.849207 0.528061 0
-    outer loop
-       vertex 0.0519615 0.03 0.01
-       vertex 0.0519615 0.03 0
-       vertex 0.0498882 0.0333342 0
-    endloop
-  endfacet
-  facet normal 0.881916 0.471406 -0
-    outer loop
-       vertex 0.0519615 0.03 0
-       vertex 0.0519615 0.03 0.01
-       vertex 0.0538124 0.0265373 0.01
-    endloop
-  endfacet
-  facet normal 0.881916 0.471406 0
-    outer loop
-       vertex 0.0538124 0.0265373 0.01
-       vertex 0.0538124 0.0265373 0
-       vertex 0.0519615 0.03 0
-    endloop
-  endfacet
-  facet normal 0.910864 0.412707 -0
-    outer loop
-       vertex 0.0538124 0.0265373 0
-       vertex 0.0538124 0.0265373 0.01
-       vertex 0.0554328 0.022961 0.01
-    endloop
-  endfacet
-  facet normal 0.910864 0.412707 0
-    outer loop
-       vertex 0.0554328 0.022961 0.01
-       vertex 0.0554328 0.022961 0
-       vertex 0.0538124 0.0265373 0
-    endloop
-  endfacet
-  facet normal 0.935908 0.352245 -0
-    outer loop
-       vertex 0.0554328 0.022961 0
-       vertex 0.0554328 0.022961 0.01
-       vertex 0.0568158 0.0192864 0.01
-    endloop
-  endfacet
-  facet normal 0.935908 0.352245 0
-    outer loop
-       vertex 0.0568158 0.0192864 0.01
-       vertex 0.0568158 0.0192864 0
-       vertex 0.0554328 0.022961 0
-    endloop
-  endfacet
-  facet normal 0.956945 0.29027 -0
-    outer loop
-       vertex 0.0568158 0.0192864 0
-       vertex 0.0568158 0.0192864 0.01
-       vertex 0.0579555 0.0155291 0.01
-    endloop
-  endfacet
-  facet normal 0.956945 0.29027 0
-    outer loop
-       vertex 0.0579555 0.0155291 0.01
-       vertex 0.0579555 0.0155291 0
-       vertex 0.0568158 0.0192864 0
-    endloop
-  endfacet
-  facet normal 0.973875 0.227085 -0
-    outer loop
-       vertex 0.0579555 0.0155291 0
-       vertex 0.0579555 0.0155291 0.01
-       vertex 0.0588471 0.0117054 0.01
-    endloop
-  endfacet
-  facet normal 0.973875 0.227085 0
-    outer loop
-       vertex 0.0588471 0.0117054 0.01
-       vertex 0.0588471 0.0117054 0
-       vertex 0.0579555 0.0155291 0
-    endloop
-  endfacet
-  facet normal 0.986642 0.162902 -0
-    outer loop
-       vertex 0.0588471 0.0117054 0
-       vertex 0.0588471 0.0117054 0.01
-       vertex 0.0594867 0.00783157 0.01
-    endloop
-  endfacet
-  facet normal 0.986642 0.162902 0
-    outer loop
-       vertex 0.0594867 0.00783157 0.01
-       vertex 0.0594867 0.00783157 0
-       vertex 0.0588471 0.0117054 0
-    endloop
-  endfacet
-  facet normal 0.995186 0.0980062 -0
-    outer loop
-       vertex 0.0594867 0.00783157 0
-       vertex 0.0594867 0.00783157 0.01
-       vertex 0.0598715 0.00392419 0.01
-    endloop
-  endfacet
-  facet normal 0.995186 0.0980062 0
-    outer loop
-       vertex 0.0598715 0.00392419 0.01
-       vertex 0.0598715 0.00392419 0
-       vertex 0.0594867 0.00783157 0
-    endloop
-  endfacet
-  facet normal 0.999464 0.0327281 -0
-    outer loop
-       vertex 0.0598715 0.00392419 0
-       vertex 0.0598715 0.00392419 0.01
-       vertex 0.06 0 0.01
-    endloop
-  endfacet
-  facet normal 0.999464 0.0327281 0
-    outer loop
-       vertex 0.06 0 0.01
-       vertex 0.06 0 0
-       vertex 0.0598715 0.00392419 0
-    endloop
-  endfacet
-endsolid AMI1
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh
deleted file mode 100755
index bcb12c0e9a..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/makeMesh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-
-runApplication blockMesh
-
-runApplication topoSet
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
deleted file mode 100644
index 7e2ea0cb6a..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,924 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(2, 0, Zb) vlabel(ris0b)
-    vert(2, 1, Zb) vlabel(ris1b)
-    vert(2, 2, Zb) vlabel(ris2b)
-    vert(2, 3, Zb) vlabel(ris3b)
-    vert(2, 4, Zb) vlabel(ris4b)
-    vert(2, 5, Zb) vlabel(ris5b)
-    vert(2, 6, Zb) vlabel(ris6b)
-    vert(2, 7, Zb) vlabel(ris7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(2, 0, Zt) vlabel(ris0t)
-    vert(2, 1, Zt) vlabel(ris1t)
-    vert(2, 2, Zt) vlabel(ris2t)
-    vert(2, 3, Zt) vlabel(ris3t)
-    vert(2, 4, Zt) vlabel(ris4t)
-    vert(2, 5, Zt) vlabel(ris5t)
-    vert(2, 6, Zt) vlabel(ris6t)
-    vert(2, 7, Zt) vlabel(ris7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ris0, ris1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ris1, ris2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ris2, ris3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ris3, ris4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ris4, ris5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ris5, ris6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ris6, ris7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ris7, ris0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc ris0b ris1b evert(2, 0, Zb)
-    arc ris1b ris2b evert(2, 1, Zb)
-    arc ris2b ris3b evert(2, 2, Zb)
-    arc ris3b ris4b evert(2, 3, Zb)
-    arc ris4b ris5b evert(2, 4, Zb)
-    arc ris5b ris6b evert(2, 5, Zb)
-    arc ris6b ris7b evert(2, 6, Zb)
-    arc ris7b ris0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc ris0t ris1t evert(2, 0, Zt)
-    arc ris1t ris2t evert(2, 1, Zt)
-    arc ris2t ris3t evert(2, 2, Zt)
-    arc ris3t ris4t evert(2, 3, Zt)
-    arc ris4t ris5t evert(2, 4, Zt)
-    arc ris5t ris6t evert(2, 5, Zt)
-    arc ris6t ris7t evert(2, 6, Zt)
-    arc ris7t ris0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-boundary
-(
-    rotor
-    {
-        type            wall;
-        faces
-        (
-            quad2D(r0, r1)
-            quad2D(r1, r2s)
-            quad2D(r2, r3)
-            quad2D(r3, r4s)
-            quad2D(r4, r5)
-            quad2D(r5, r6s)
-            quad2D(r6, r7)
-            quad2D(r7, r0s)
-
-            quad2D(r0, rb0)
-            quad2D(r0s, rb0)
-
-            quad2D(r2, rb2)
-            quad2D(r2s, rb2)
-
-            quad2D(r4, rb4)
-            quad2D(r4s, rb4)
-
-            quad2D(r6, rb6)
-            quad2D(r6s, rb6)
-        );
-    }
-
-    stator
-    {
-        type            wall;
-        faces
-        (
-            quad2D(R0, R1s)
-            quad2D(R1, R2)
-            quad2D(R2, R3s)
-            quad2D(R3, R4)
-            quad2D(R4, R5s)
-            quad2D(R5, R6)
-            quad2D(R6, R7s)
-            quad2D(R7, R0)
-
-            quad2D(R1, Rb1)
-            quad2D(R1s, Rb1)
-
-            quad2D(R3, Rb3)
-            quad2D(R3s, Rb3)
-
-            quad2D(R5, Rb5)
-            quad2D(R5s, Rb5)
-
-            quad2D(R7, Rb7)
-            quad2D(R7s, Rb7)
-        );
-    }
-
-    AMI1
-    {
-        type            cyclicAMI;
-        neighbourPatch  AMI2;
-        ordering        noOrdering;
-/* optional
-        surface
-        {
-            type            searchableCylinder; // none
-            point1          (0 0 -1);
-            point2          (0 0 1);
-            radius          0.5;
-        }
-*/
-        faces
-        (
-            quad2D(ri1, ri0)
-            quad2D(ri2, ri1)
-            quad2D(ri3, ri2)
-            quad2D(ri4, ri3)
-            quad2D(ri5, ri4)
-            quad2D(ri6, ri5)
-            quad2D(ri7, ri6)
-            quad2D(ri0, ri7)
-        );
-    }
-
-    AMI2
-    {
-        type            cyclicAMI;
-        neighbourPatch  AMI1;
-        ordering        noOrdering;
-/* optional
-        surface
-        {
-            type            searchableCylinder; // none
-            point1          (0 0 -1);
-            point2          (0 0 1);
-            radius          0.5;
-        }
-*/
-        faces
-        (
-            quad2D(ris1, ris0)
-            quad2D(ris2, ris1)
-            quad2D(ris3, ris2)
-            quad2D(ris4, ris3)
-            quad2D(ris5, ris4)
-            quad2D(ris6, ris5)
-            quad2D(ris7, ris6)
-            quad2D(ris0, ris7)
-        );
-    }
-
-    front
-    {
-        type            empty;
-        faces
-        (
-            frontQuad(r0, r1, rb1, rb0)
-            frontQuad(r1, r2s, rb2, rb1)
-            frontQuad(r2, r3, rb3, rb2)
-            frontQuad(r3, r4s, rb4, rb3)
-            frontQuad(r4, r5, rb5, rb4)
-            frontQuad(r5, r6s, rb6, rb5)
-            frontQuad(r6, r7, rb7, rb6)
-            frontQuad(r7, r0s, rb0, rb7)
-            frontQuad(rb0, rb1, ri1, ri0)
-            frontQuad(rb1, rb2, ri2, ri1)
-            frontQuad(rb2, rb3, ri3, ri2)
-            frontQuad(rb3, rb4, ri4, ri3)
-            frontQuad(rb4, rb5, ri5, ri4)
-            frontQuad(rb5, rb6, ri6, ri5)
-            frontQuad(rb6, rb7, ri7, ri6)
-            frontQuad(rb7, rb0, ri0, ri7)
-            frontQuad(ris0, ris1, Rb1, Rb0)
-            frontQuad(ris1, ris2, Rb2, Rb1)
-            frontQuad(ris2, ris3, Rb3, Rb2)
-            frontQuad(ris3, ris4, Rb4, Rb3)
-            frontQuad(ris4, ris5, Rb5, Rb4)
-            frontQuad(ris5, ris6, Rb6, Rb5)
-            frontQuad(ris6, ris7, Rb7, Rb6)
-            frontQuad(ris7, ris0, Rb0, Rb7)
-            frontQuad(Rb0, Rb1, R1s, R0)
-            frontQuad(Rb1, Rb2, R2, R1)
-            frontQuad(Rb2, Rb3, R3s, R2)
-            frontQuad(Rb3, Rb4, R4, R3)
-            frontQuad(Rb4, Rb5, R5s, R4)
-            frontQuad(Rb5, Rb6, R6, R5)
-            frontQuad(Rb6, Rb7, R7s, R6)
-            frontQuad(Rb7, Rb0, R0, R7)
-        );
-    }
-
-    back
-    {
-        type            empty;
-        faces
-        (
-            backQuad(r0, r1, rb1, rb0)
-            backQuad(r1, r2s, rb2, rb1)
-            backQuad(r2, r3, rb3, rb2)
-            backQuad(r3, r4s, rb4, rb3)
-            backQuad(r4, r5, rb5, rb4)
-            backQuad(r5, r6s, rb6, rb5)
-            backQuad(r6, r7, rb7, rb6)
-            backQuad(r7, r0s, rb0, rb7)
-            backQuad(rb0, rb1, ri1, ri0)
-            backQuad(rb1, rb2, ri2, ri1)
-            backQuad(rb2, rb3, ri3, ri2)
-            backQuad(rb3, rb4, ri4, ri3)
-            backQuad(rb4, rb5, ri5, ri4)
-            backQuad(rb5, rb6, ri6, ri5)
-            backQuad(rb6, rb7, ri7, ri6)
-            backQuad(rb7, rb0, ri0, ri7)
-            backQuad(ris0, ris1, Rb1, Rb0)
-            backQuad(ris1, ris2, Rb2, Rb1)
-            backQuad(ris2, ris3, Rb3, Rb2)
-            backQuad(ris3, ris4, Rb4, Rb3)
-            backQuad(ris4, ris5, Rb5, Rb4)
-            backQuad(ris5, ris6, Rb6, Rb5)
-            backQuad(ris6, ris7, Rb7, Rb6)
-            backQuad(ris7, ris0, Rb0, Rb7)
-            backQuad(Rb0, Rb1, R1s, R0)
-            backQuad(Rb1, Rb2, R2, R1)
-            backQuad(Rb2, Rb3, R3s, R2)
-            backQuad(Rb3, Rb4, R4, R3)
-            backQuad(Rb4, Rb5, R5s, R4)
-            backQuad(Rb5, Rb6, R6, R5)
-            backQuad(Rb6, Rb7, R7s, R6)
-            backQuad(Rb7, Rb0, R0, R7)
-        );
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
new file mode 100644
index 0000000000..1d13f7dff0
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      createBafflesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalFacesOnly true;
+
+#include "$FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D"
+
+baffles
+{
+    baffleFaces
+    {
+        type    searchableSurface;
+        surface searchableCylinder;
+        point1 (0 0 -100);
+        point2 (0 0 100);
+        radius  $rotorRegion;
+
+        patches
+        {
+            master
+            {
+                name            AMI1;
+                type            cyclicAMI;
+                matchTolerance  0.0001;
+                neighbourPatch  AMI2;
+                transform       none;
+            }
+            slave
+            {
+                $master;
+                name            AMI2;
+                neighbourPatch  AMI1;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
index 021754896d..e8486a4e1e 100755
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication $application
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
deleted file mode 100755
index 5cd24a5528..0000000000
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/makeMesh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-
-runApplication blockMesh
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
deleted file mode 100644
index dc5344465d..0000000000
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,818 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ri0, ri1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ri1, ri2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ri2, ri3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ri3, ri4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ri4, ri5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ri5, ri6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ri6, ri7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ri7, ri0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-patches
-(
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
-
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
-
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
-
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/Allrun
index ac4e385790..663789514a 100755
--- a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/Allrun
@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
 
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-
-runApplication blockMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
+runApplication createBaffles -overwrite
+runApplication mergeOrSplitBaffles -split -overwrite
 
 runApplication $(getApplication)
diff --git a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/blockMeshDict.m4
deleted file mode 100644
index 2e721f5646..0000000000
--- a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,940 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(2, 0, Zb) vlabel(ris0b)
-    vert(2, 1, Zb) vlabel(ris1b)
-    vert(2, 2, Zb) vlabel(ris2b)
-    vert(2, 3, Zb) vlabel(ris3b)
-    vert(2, 4, Zb) vlabel(ris4b)
-    vert(2, 5, Zb) vlabel(ris5b)
-    vert(2, 6, Zb) vlabel(ris6b)
-    vert(2, 7, Zb) vlabel(ris7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(2, 0, Zt) vlabel(ris0t)
-    vert(2, 1, Zt) vlabel(ris1t)
-    vert(2, 2, Zt) vlabel(ris2t)
-    vert(2, 3, Zt) vlabel(ris3t)
-    vert(2, 4, Zt) vlabel(ris4t)
-    vert(2, 5, Zt) vlabel(ris5t)
-    vert(2, 6, Zt) vlabel(ris6t)
-    vert(2, 7, Zt) vlabel(ris7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ris0, ris1, Rb1, Rb0)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ris1, ris2, Rb2, Rb1)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ris2, ris3, Rb3, Rb2)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ris3, ris4, Rb4, Rb3)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ris4, ris5, Rb5, Rb4)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ris5, ris6, Rb6, Rb5)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ris6, ris7, Rb7, Rb6)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ris7, ris0, Rb0, Rb7)
-    stator
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    stator
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc ris0b ris1b evert(2, 0, Zb)
-    arc ris1b ris2b evert(2, 1, Zb)
-    arc ris2b ris3b evert(2, 2, Zb)
-    arc ris3b ris4b evert(2, 3, Zb)
-    arc ris4b ris5b evert(2, 4, Zb)
-    arc ris5b ris6b evert(2, 5, Zb)
-    arc ris6b ris7b evert(2, 6, Zb)
-    arc ris7b ris0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc ris0t ris1t evert(2, 0, Zt)
-    arc ris1t ris2t evert(2, 1, Zt)
-    arc ris2t ris3t evert(2, 2, Zt)
-    arc ris3t ris4t evert(2, 3, Zt)
-    arc ris4t ris5t evert(2, 4, Zt)
-    arc ris5t ris6t evert(2, 5, Zt)
-    arc ris6t ris7t evert(2, 6, Zt)
-    arc ris7t ris0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-boundary
-(
-    rotor
-    {
-        type            wall;
-        faces
-        (
-            quad2D(r0, r1)
-            quad2D(r1, r2s)
-            quad2D(r2, r3)
-            quad2D(r3, r4s)
-            quad2D(r4, r5)
-            quad2D(r5, r6s)
-            quad2D(r6, r7)
-            quad2D(r7, r0s)
-
-            quad2D(r0, rb0)
-            quad2D(r0s, rb0)
-
-            quad2D(r2, rb2)
-            quad2D(r2s, rb2)
-
-            quad2D(r4, rb4)
-            quad2D(r4s, rb4)
-
-            quad2D(r6, rb6)
-            quad2D(r6s, rb6)
-        );
-    }
-
-    stator
-    {
-        type            wall;
-        faces
-        (
-            quad2D(R0, R1s)
-            quad2D(R1, R2)
-            quad2D(R2, R3s)
-            quad2D(R3, R4)
-            quad2D(R4, R5s)
-            quad2D(R5, R6)
-            quad2D(R6, R7s)
-            quad2D(R7, R0)
-
-            quad2D(R1, Rb1)
-            quad2D(R1s, Rb1)
-
-            quad2D(R3, Rb3)
-            quad2D(R3s, Rb3)
-
-            quad2D(R5, Rb5)
-            quad2D(R5s, Rb5)
-
-            quad2D(R7, Rb7)
-            quad2D(R7s, Rb7)
-        );
-    }
-
-    AMI1
-    {
-        type            cyclicAMI;
-        neighbourPatch  AMI2;
-        ordering        noOrdering;
-/* optional
-        surface
-        {
-            type            searchableCylinder; // none
-            point1          (0 0 -1);
-            point2          (0 0 1);
-            radius          0.5;
-        }
-*/
-        faces
-        (
-            quad2D(ri1, ri0)
-            quad2D(ri2, ri1)
-            quad2D(ri3, ri2)
-            quad2D(ri4, ri3)
-            quad2D(ri5, ri4)
-            quad2D(ri6, ri5)
-            quad2D(ri7, ri6)
-            quad2D(ri0, ri7)
-        );
-    }
-
-    AMI2
-    {
-        type            cyclicAMI;
-        neighbourPatch  AMI1;
-        ordering        noOrdering;
-/* optional
-        surface
-        {
-            type            searchableCylinder; // none
-            point1          (0 0 -1);
-            point2          (0 0 1);
-            radius          0.5;
-        }
-*/
-        faces
-        (
-            quad2D(ris1, ris0)
-            quad2D(ris2, ris1)
-            quad2D(ris3, ris2)
-            quad2D(ris4, ris3)
-            quad2D(ris5, ris4)
-            quad2D(ris6, ris5)
-            quad2D(ris7, ris6)
-            quad2D(ris0, ris7)
-        );
-    }
-
-    front
-    {
-        type            empty;
-        faces
-        (
-            frontQuad(r0, r1, rb1, rb0)
-            frontQuad(r1, r2s, rb2, rb1)
-            frontQuad(r2, r3, rb3, rb2)
-            frontQuad(r3, r4s, rb4, rb3)
-            frontQuad(r4, r5, rb5, rb4)
-            frontQuad(r5, r6s, rb6, rb5)
-            frontQuad(r6, r7, rb7, rb6)
-            frontQuad(r7, r0s, rb0, rb7)
-            frontQuad(rb0, rb1, ri1, ri0)
-            frontQuad(rb1, rb2, ri2, ri1)
-            frontQuad(rb2, rb3, ri3, ri2)
-            frontQuad(rb3, rb4, ri4, ri3)
-            frontQuad(rb4, rb5, ri5, ri4)
-            frontQuad(rb5, rb6, ri6, ri5)
-            frontQuad(rb6, rb7, ri7, ri6)
-            frontQuad(rb7, rb0, ri0, ri7)
-            frontQuad(ris0, ris1, Rb1, Rb0)
-            frontQuad(ris1, ris2, Rb2, Rb1)
-            frontQuad(ris2, ris3, Rb3, Rb2)
-            frontQuad(ris3, ris4, Rb4, Rb3)
-            frontQuad(ris4, ris5, Rb5, Rb4)
-            frontQuad(ris5, ris6, Rb6, Rb5)
-            frontQuad(ris6, ris7, Rb7, Rb6)
-            frontQuad(ris7, ris0, Rb0, Rb7)
-            frontQuad(Rb0, Rb1, R1s, R0)
-            frontQuad(Rb1, Rb2, R2, R1)
-            frontQuad(Rb2, Rb3, R3s, R2)
-            frontQuad(Rb3, Rb4, R4, R3)
-            frontQuad(Rb4, Rb5, R5s, R4)
-            frontQuad(Rb5, Rb6, R6, R5)
-            frontQuad(Rb6, Rb7, R7s, R6)
-            frontQuad(Rb7, Rb0, R0, R7)
-        );
-    }
-
-    back
-    {
-        type            empty;
-        faces
-        (
-            backQuad(r0, r1, rb1, rb0)
-            backQuad(r1, r2s, rb2, rb1)
-            backQuad(r2, r3, rb3, rb2)
-            backQuad(r3, r4s, rb4, rb3)
-            backQuad(r4, r5, rb5, rb4)
-            backQuad(r5, r6s, rb6, rb5)
-            backQuad(r6, r7, rb7, rb6)
-            backQuad(r7, r0s, rb0, rb7)
-            backQuad(rb0, rb1, ri1, ri0)
-            backQuad(rb1, rb2, ri2, ri1)
-            backQuad(rb2, rb3, ri3, ri2)
-            backQuad(rb3, rb4, ri4, ri3)
-            backQuad(rb4, rb5, ri5, ri4)
-            backQuad(rb5, rb6, ri6, ri5)
-            backQuad(rb6, rb7, ri7, ri6)
-            backQuad(rb7, rb0, ri0, ri7)
-            backQuad(ris0, ris1, Rb1, Rb0)
-            backQuad(ris1, ris2, Rb2, Rb1)
-            backQuad(ris2, ris3, Rb3, Rb2)
-            backQuad(ris3, ris4, Rb4, Rb3)
-            backQuad(ris4, ris5, Rb5, Rb4)
-            backQuad(ris5, ris6, Rb6, Rb5)
-            backQuad(ris6, ris7, Rb7, Rb6)
-            backQuad(ris7, ris0, Rb0, Rb7)
-            backQuad(Rb0, Rb1, R1s, R0)
-            backQuad(Rb1, Rb2, R2, R1)
-            backQuad(Rb2, Rb3, R3s, R2)
-            backQuad(Rb3, Rb4, R4, R3)
-            backQuad(Rb4, Rb5, R5s, R4)
-            backQuad(Rb5, Rb6, R6, R5)
-            backQuad(Rb6, Rb7, R7s, R6)
-            backQuad(Rb7, Rb0, R0, R7)
-        );
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
new file mode 100644
index 0000000000..1d13f7dff0
--- /dev/null
+++ b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/createBafflesDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      createBafflesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalFacesOnly true;
+
+#include "$FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D"
+
+baffles
+{
+    baffleFaces
+    {
+        type    searchableSurface;
+        surface searchableCylinder;
+        point1 (0 0 -100);
+        point2 (0 0 100);
+        radius  $rotorRegion;
+
+        patches
+        {
+            master
+            {
+                name            AMI1;
+                type            cyclicAMI;
+                matchTolerance  0.0001;
+                neighbourPatch  AMI2;
+                transform       none;
+            }
+            slave
+            {
+                $master;
+                name            AMI2;
+                neighbourPatch  AMI1;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
index f5e6c61a9e..e8486a4e1e 100755
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-runApplication ./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication $application
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh
deleted file mode 100755
index 4d667956a0..0000000000
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/makeMesh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-blockMesh
-topoSet
-setsToZones -noFlipMap
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
deleted file mode 100644
index dc5344465d..0000000000
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,818 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ri0, ri1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ri1, ri2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ri2, ri3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ri3, ri4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ri4, ri5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ri5, ri6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ri6, ri7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ri7, ri0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-patches
-(
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
-
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
-
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
-
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
deleted file mode 100644
index 9e967fa2fe..0000000000
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
-    volScalarFieldValue alpha.water 0
-);
-
-regions
-(
-    boxToCell
-    {
-        box (0 0 -1) (1 1 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 1
-        );
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
deleted file mode 100644
index f1f39e6588..0000000000
--- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    rotor;
-        type    cellSet;
-        action  new;
-        source  zoneToCell;
-        sourceInfo
-        {
-            name rotor;
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
index 272c2a7ee3..72dd71ce56 100755
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-runApplication ./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh
deleted file mode 100755
index 4d667956a0..0000000000
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/makeMesh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-blockMesh
-topoSet
-setsToZones -noFlipMap
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
deleted file mode 100644
index dc5344465d..0000000000
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,818 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ri0, ri1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ri1, ri2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ri2, ri3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ri3, ri4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ri4, ri5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ri5, ri6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ri6, ri7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ri7, ri0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-patches
-(
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
-
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
-
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
-
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
deleted file mode 100644
index f1f39e6588..0000000000
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    rotor;
-        type    cellSet;
-        action  new;
-        source  zoneToCell;
-        sourceInfo
-        {
-            name rotor;
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/Allrun
index f5e6c61a9e..e8486a4e1e 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-runApplication ./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication $application
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/makeMesh
deleted file mode 100755
index 4d667956a0..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/makeMesh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-blockMesh
-topoSet
-setsToZones -noFlipMap
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
deleted file mode 100644
index dc5344465d..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,818 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ri0, ri1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ri1, ri2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ri2, ri3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ri3, ri4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ri4, ri5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ri5, ri6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ri6, ri7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ri7, ri0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-patches
-(
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
-
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
-
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
-
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
deleted file mode 100644
index f1f39e6588..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    rotor;
-        type    cellSet;
-        action  new;
-        source  zoneToCell;
-        sourceInfo
-        {
-            name rotor;
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/Allrun
index 021754896d..1c5bd7ee61 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/Allrun
@@ -6,7 +6,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
+runApplication createBaffles -overwrite
+runApplication mergeOrSplitBaffles -split -overwrite
+
 runApplication $application
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/makeMesh
deleted file mode 100755
index bcb12c0e9a..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/makeMesh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-
-runApplication blockMesh
-
-runApplication topoSet
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
deleted file mode 100644
index 7e2ea0cb6a..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,924 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(2, 0, Zb) vlabel(ris0b)
-    vert(2, 1, Zb) vlabel(ris1b)
-    vert(2, 2, Zb) vlabel(ris2b)
-    vert(2, 3, Zb) vlabel(ris3b)
-    vert(2, 4, Zb) vlabel(ris4b)
-    vert(2, 5, Zb) vlabel(ris5b)
-    vert(2, 6, Zb) vlabel(ris6b)
-    vert(2, 7, Zb) vlabel(ris7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(2, 0, Zt) vlabel(ris0t)
-    vert(2, 1, Zt) vlabel(ris1t)
-    vert(2, 2, Zt) vlabel(ris2t)
-    vert(2, 3, Zt) vlabel(ris3t)
-    vert(2, 4, Zt) vlabel(ris4t)
-    vert(2, 5, Zt) vlabel(ris5t)
-    vert(2, 6, Zt) vlabel(ris6t)
-    vert(2, 7, Zt) vlabel(ris7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ris0, ris1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ris1, ris2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ris2, ris3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ris3, ris4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ris4, ris5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ris5, ris6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ris6, ris7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ris7, ris0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc ris0b ris1b evert(2, 0, Zb)
-    arc ris1b ris2b evert(2, 1, Zb)
-    arc ris2b ris3b evert(2, 2, Zb)
-    arc ris3b ris4b evert(2, 3, Zb)
-    arc ris4b ris5b evert(2, 4, Zb)
-    arc ris5b ris6b evert(2, 5, Zb)
-    arc ris6b ris7b evert(2, 6, Zb)
-    arc ris7b ris0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc ris0t ris1t evert(2, 0, Zt)
-    arc ris1t ris2t evert(2, 1, Zt)
-    arc ris2t ris3t evert(2, 2, Zt)
-    arc ris3t ris4t evert(2, 3, Zt)
-    arc ris4t ris5t evert(2, 4, Zt)
-    arc ris5t ris6t evert(2, 5, Zt)
-    arc ris6t ris7t evert(2, 6, Zt)
-    arc ris7t ris0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-boundary
-(
-    rotor
-    {
-        type            wall;
-        faces
-        (
-            quad2D(r0, r1)
-            quad2D(r1, r2s)
-            quad2D(r2, r3)
-            quad2D(r3, r4s)
-            quad2D(r4, r5)
-            quad2D(r5, r6s)
-            quad2D(r6, r7)
-            quad2D(r7, r0s)
-
-            quad2D(r0, rb0)
-            quad2D(r0s, rb0)
-
-            quad2D(r2, rb2)
-            quad2D(r2s, rb2)
-
-            quad2D(r4, rb4)
-            quad2D(r4s, rb4)
-
-            quad2D(r6, rb6)
-            quad2D(r6s, rb6)
-        );
-    }
-
-    stator
-    {
-        type            wall;
-        faces
-        (
-            quad2D(R0, R1s)
-            quad2D(R1, R2)
-            quad2D(R2, R3s)
-            quad2D(R3, R4)
-            quad2D(R4, R5s)
-            quad2D(R5, R6)
-            quad2D(R6, R7s)
-            quad2D(R7, R0)
-
-            quad2D(R1, Rb1)
-            quad2D(R1s, Rb1)
-
-            quad2D(R3, Rb3)
-            quad2D(R3s, Rb3)
-
-            quad2D(R5, Rb5)
-            quad2D(R5s, Rb5)
-
-            quad2D(R7, Rb7)
-            quad2D(R7s, Rb7)
-        );
-    }
-
-    AMI1
-    {
-        type            cyclicAMI;
-        neighbourPatch  AMI2;
-        ordering        noOrdering;
-/* optional
-        surface
-        {
-            type            searchableCylinder; // none
-            point1          (0 0 -1);
-            point2          (0 0 1);
-            radius          0.5;
-        }
-*/
-        faces
-        (
-            quad2D(ri1, ri0)
-            quad2D(ri2, ri1)
-            quad2D(ri3, ri2)
-            quad2D(ri4, ri3)
-            quad2D(ri5, ri4)
-            quad2D(ri6, ri5)
-            quad2D(ri7, ri6)
-            quad2D(ri0, ri7)
-        );
-    }
-
-    AMI2
-    {
-        type            cyclicAMI;
-        neighbourPatch  AMI1;
-        ordering        noOrdering;
-/* optional
-        surface
-        {
-            type            searchableCylinder; // none
-            point1          (0 0 -1);
-            point2          (0 0 1);
-            radius          0.5;
-        }
-*/
-        faces
-        (
-            quad2D(ris1, ris0)
-            quad2D(ris2, ris1)
-            quad2D(ris3, ris2)
-            quad2D(ris4, ris3)
-            quad2D(ris5, ris4)
-            quad2D(ris6, ris5)
-            quad2D(ris7, ris6)
-            quad2D(ris0, ris7)
-        );
-    }
-
-    front
-    {
-        type            empty;
-        faces
-        (
-            frontQuad(r0, r1, rb1, rb0)
-            frontQuad(r1, r2s, rb2, rb1)
-            frontQuad(r2, r3, rb3, rb2)
-            frontQuad(r3, r4s, rb4, rb3)
-            frontQuad(r4, r5, rb5, rb4)
-            frontQuad(r5, r6s, rb6, rb5)
-            frontQuad(r6, r7, rb7, rb6)
-            frontQuad(r7, r0s, rb0, rb7)
-            frontQuad(rb0, rb1, ri1, ri0)
-            frontQuad(rb1, rb2, ri2, ri1)
-            frontQuad(rb2, rb3, ri3, ri2)
-            frontQuad(rb3, rb4, ri4, ri3)
-            frontQuad(rb4, rb5, ri5, ri4)
-            frontQuad(rb5, rb6, ri6, ri5)
-            frontQuad(rb6, rb7, ri7, ri6)
-            frontQuad(rb7, rb0, ri0, ri7)
-            frontQuad(ris0, ris1, Rb1, Rb0)
-            frontQuad(ris1, ris2, Rb2, Rb1)
-            frontQuad(ris2, ris3, Rb3, Rb2)
-            frontQuad(ris3, ris4, Rb4, Rb3)
-            frontQuad(ris4, ris5, Rb5, Rb4)
-            frontQuad(ris5, ris6, Rb6, Rb5)
-            frontQuad(ris6, ris7, Rb7, Rb6)
-            frontQuad(ris7, ris0, Rb0, Rb7)
-            frontQuad(Rb0, Rb1, R1s, R0)
-            frontQuad(Rb1, Rb2, R2, R1)
-            frontQuad(Rb2, Rb3, R3s, R2)
-            frontQuad(Rb3, Rb4, R4, R3)
-            frontQuad(Rb4, Rb5, R5s, R4)
-            frontQuad(Rb5, Rb6, R6, R5)
-            frontQuad(Rb6, Rb7, R7s, R6)
-            frontQuad(Rb7, Rb0, R0, R7)
-        );
-    }
-
-    back
-    {
-        type            empty;
-        faces
-        (
-            backQuad(r0, r1, rb1, rb0)
-            backQuad(r1, r2s, rb2, rb1)
-            backQuad(r2, r3, rb3, rb2)
-            backQuad(r3, r4s, rb4, rb3)
-            backQuad(r4, r5, rb5, rb4)
-            backQuad(r5, r6s, rb6, rb5)
-            backQuad(r6, r7, rb7, rb6)
-            backQuad(r7, r0s, rb0, rb7)
-            backQuad(rb0, rb1, ri1, ri0)
-            backQuad(rb1, rb2, ri2, ri1)
-            backQuad(rb2, rb3, ri3, ri2)
-            backQuad(rb3, rb4, ri4, ri3)
-            backQuad(rb4, rb5, ri5, ri4)
-            backQuad(rb5, rb6, ri6, ri5)
-            backQuad(rb6, rb7, ri7, ri6)
-            backQuad(rb7, rb0, ri0, ri7)
-            backQuad(ris0, ris1, Rb1, Rb0)
-            backQuad(ris1, ris2, Rb2, Rb1)
-            backQuad(ris2, ris3, Rb3, Rb2)
-            backQuad(ris3, ris4, Rb4, Rb3)
-            backQuad(ris4, ris5, Rb5, Rb4)
-            backQuad(ris5, ris6, Rb6, Rb5)
-            backQuad(ris6, ris7, Rb7, Rb6)
-            backQuad(ris7, ris0, Rb0, Rb7)
-            backQuad(Rb0, Rb1, R1s, R0)
-            backQuad(Rb1, Rb2, R2, R1)
-            backQuad(Rb2, Rb3, R3s, R2)
-            backQuad(Rb3, Rb4, R4, R3)
-            backQuad(Rb4, Rb5, R5s, R4)
-            backQuad(Rb5, Rb6, R6, R5)
-            backQuad(Rb6, Rb7, R7s, R6)
-            backQuad(Rb7, Rb0, R0, R7)
-        );
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
new file mode 100644
index 0000000000..1d13f7dff0
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/createBafflesDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      createBafflesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalFacesOnly true;
+
+#include "$FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D"
+
+baffles
+{
+    baffleFaces
+    {
+        type    searchableSurface;
+        surface searchableCylinder;
+        point1 (0 0 -100);
+        point2 (0 0 100);
+        radius  $rotorRegion;
+
+        patches
+        {
+            master
+            {
+                name            AMI1;
+                type            cyclicAMI;
+                matchTolerance  0.0001;
+                neighbourPatch  AMI2;
+                transform       none;
+            }
+            slave
+            {
+                $master;
+                name            AMI2;
+                neighbourPatch  AMI1;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/topoSetDict
deleted file mode 100644
index f1f39e6588..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/topoSetDict
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    rotor;
-        type    cellSet;
-        action  new;
-        source  zoneToCell;
-        sourceInfo
-        {
-            name rotor;
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
index 272c2a7ee3..72dd71ce56 100755
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=$(getApplication)
 
-runApplication ./makeMesh
+runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
deleted file mode 100755
index 4d667956a0..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/makeMesh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-m4 < system/blockMeshDict.m4 > system/blockMeshDict
-blockMesh
-topoSet
-setsToZones -noFlipMap
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
deleted file mode 100644
index dc5344465d..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ /dev/null
@@ -1,818 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    `format'      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-changecom(//)changequote([,])
-define(calc, [esyscmd(perl -e 'print ($1)')])
-define(VCOUNT, 0)
-define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
-define(pi, 3.14159265)
-
-define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
-define(quad2D, ($1b $2b $2t $1t))
-define(frontQuad, ($1t $2t $3t $4t))
-define(backQuad, ($1b $4b $3b $2b))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-define(r, 0.2)
-
-// Impeller-tip radius
-define(rb, 0.5)
-
-// Baffle-tip radius
-define(Rb, 0.7)
-
-// Tank radius
-define(R, 1)
-
-// MRF region radius
-define(ri, calc(0.5*(rb + Rb)))
-
-// Thickness of 2D slab
-define(z, 0.1)
-
-// Base z
-define(Zb, 0)
-
-// Top z
-define(Zt, calc(Zb + z))
-
-// Number of cells radially between hub and impeller tip
-define(Nr, 12)
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-define(Ni, 4)
-
-// Number of cells radially between baffle tip and tank
-define(NR, 12)
-
-// Number of cells azimuthally in each of the 8 blocks
-define(Na, 12)
-
-// Number of cells in the thickness of the slab
-define(Nz, 1)
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-define(vert, (x$1$2 y$1$2 $3))
-define(evert, (ex$1$2 ey$1$2 $3))
-
-define(a0, 0)
-define(a1, -45)
-define(a2, -90)
-define(a3, -135)
-define(a4, 180)
-define(a5, 135)
-define(a6, 90)
-define(a7, 45)
-
-define(ea0, -22.5)
-define(ea1, -67.5)
-define(ea2, -112.5)
-define(ea3, -157.5)
-define(ea4, 157.5)
-define(ea5, 112.5)
-define(ea6, 67.5)
-define(ea7, 22.5)
-
-define(ca0, calc(cos((pi/180)*a0)))
-define(ca1, calc(cos((pi/180)*a1)))
-define(ca2, calc(cos((pi/180)*a2)))
-define(ca3, calc(cos((pi/180)*a3)))
-define(ca4, calc(cos((pi/180)*a4)))
-define(ca5, calc(cos((pi/180)*a5)))
-define(ca6, calc(cos((pi/180)*a6)))
-define(ca7, calc(cos((pi/180)*a7)))
-
-define(sa0, calc(sin((pi/180)*a0)))
-define(sa1, calc(sin((pi/180)*a1)))
-define(sa2, calc(sin((pi/180)*a2)))
-define(sa3, calc(sin((pi/180)*a3)))
-define(sa4, calc(sin((pi/180)*a4)))
-define(sa5, calc(sin((pi/180)*a5)))
-define(sa6, calc(sin((pi/180)*a6)))
-define(sa7, calc(sin((pi/180)*a7)))
-
-define(cea0, calc(cos((pi/180)*ea0)))
-define(cea1, calc(cos((pi/180)*ea1)))
-define(cea2, calc(cos((pi/180)*ea2)))
-define(cea3, calc(cos((pi/180)*ea3)))
-define(cea4, calc(cos((pi/180)*ea4)))
-define(cea5, calc(cos((pi/180)*ea5)))
-define(cea6, calc(cos((pi/180)*ea6)))
-define(cea7, calc(cos((pi/180)*ea7)))
-
-define(sea0, calc(sin((pi/180)*ea0)))
-define(sea1, calc(sin((pi/180)*ea1)))
-define(sea2, calc(sin((pi/180)*ea2)))
-define(sea3, calc(sin((pi/180)*ea3)))
-define(sea4, calc(sin((pi/180)*ea4)))
-define(sea5, calc(sin((pi/180)*ea5)))
-define(sea6, calc(sin((pi/180)*ea6)))
-define(sea7, calc(sin((pi/180)*ea7)))
-
-define(x00, calc(r*ca0))
-define(x01, calc(r*ca1))
-define(x02, calc(r*ca2))
-define(x03, calc(r*ca3))
-define(x04, calc(r*ca4))
-define(x05, calc(r*ca5))
-define(x06, calc(r*ca6))
-define(x07, calc(r*ca7))
-
-define(x10, calc(rb*ca0))
-define(x11, calc(rb*ca1))
-define(x12, calc(rb*ca2))
-define(x13, calc(rb*ca3))
-define(x14, calc(rb*ca4))
-define(x15, calc(rb*ca5))
-define(x16, calc(rb*ca6))
-define(x17, calc(rb*ca7))
-
-define(x20, calc(ri*ca0))
-define(x21, calc(ri*ca1))
-define(x22, calc(ri*ca2))
-define(x23, calc(ri*ca3))
-define(x24, calc(ri*ca4))
-define(x25, calc(ri*ca5))
-define(x26, calc(ri*ca6))
-define(x27, calc(ri*ca7))
-
-define(x30, calc(Rb*ca0))
-define(x31, calc(Rb*ca1))
-define(x32, calc(Rb*ca2))
-define(x33, calc(Rb*ca3))
-define(x34, calc(Rb*ca4))
-define(x35, calc(Rb*ca5))
-define(x36, calc(Rb*ca6))
-define(x37, calc(Rb*ca7))
-
-define(x40, calc(R*ca0))
-define(x41, calc(R*ca1))
-define(x42, calc(R*ca2))
-define(x43, calc(R*ca3))
-define(x44, calc(R*ca4))
-define(x45, calc(R*ca5))
-define(x46, calc(R*ca6))
-define(x47, calc(R*ca7))
-
-define(y00, calc(r*sa0))
-define(y01, calc(r*sa1))
-define(y02, calc(r*sa2))
-define(y03, calc(r*sa3))
-define(y04, calc(r*sa4))
-define(y05, calc(r*sa5))
-define(y06, calc(r*sa6))
-define(y07, calc(r*sa7))
-
-define(y10, calc(rb*sa0))
-define(y11, calc(rb*sa1))
-define(y12, calc(rb*sa2))
-define(y13, calc(rb*sa3))
-define(y14, calc(rb*sa4))
-define(y15, calc(rb*sa5))
-define(y16, calc(rb*sa6))
-define(y17, calc(rb*sa7))
-
-define(y20, calc(ri*sa0))
-define(y21, calc(ri*sa1))
-define(y22, calc(ri*sa2))
-define(y23, calc(ri*sa3))
-define(y24, calc(ri*sa4))
-define(y25, calc(ri*sa5))
-define(y26, calc(ri*sa6))
-define(y27, calc(ri*sa7))
-
-define(y30, calc(Rb*sa0))
-define(y31, calc(Rb*sa1))
-define(y32, calc(Rb*sa2))
-define(y33, calc(Rb*sa3))
-define(y34, calc(Rb*sa4))
-define(y35, calc(Rb*sa5))
-define(y36, calc(Rb*sa6))
-define(y37, calc(Rb*sa7))
-
-define(y40, calc(R*sa0))
-define(y41, calc(R*sa1))
-define(y42, calc(R*sa2))
-define(y43, calc(R*sa3))
-define(y44, calc(R*sa4))
-define(y45, calc(R*sa5))
-define(y46, calc(R*sa6))
-define(y47, calc(R*sa7))
-
-define(ex00, calc(r*cea0))
-define(ex01, calc(r*cea1))
-define(ex02, calc(r*cea2))
-define(ex03, calc(r*cea3))
-define(ex04, calc(r*cea4))
-define(ex05, calc(r*cea5))
-define(ex06, calc(r*cea6))
-define(ex07, calc(r*cea7))
-
-define(ex10, calc(rb*cea0))
-define(ex11, calc(rb*cea1))
-define(ex12, calc(rb*cea2))
-define(ex13, calc(rb*cea3))
-define(ex14, calc(rb*cea4))
-define(ex15, calc(rb*cea5))
-define(ex16, calc(rb*cea6))
-define(ex17, calc(rb*cea7))
-
-define(ex20, calc(ri*cea0))
-define(ex21, calc(ri*cea1))
-define(ex22, calc(ri*cea2))
-define(ex23, calc(ri*cea3))
-define(ex24, calc(ri*cea4))
-define(ex25, calc(ri*cea5))
-define(ex26, calc(ri*cea6))
-define(ex27, calc(ri*cea7))
-
-define(ex30, calc(Rb*cea0))
-define(ex31, calc(Rb*cea1))
-define(ex32, calc(Rb*cea2))
-define(ex33, calc(Rb*cea3))
-define(ex34, calc(Rb*cea4))
-define(ex35, calc(Rb*cea5))
-define(ex36, calc(Rb*cea6))
-define(ex37, calc(Rb*cea7))
-
-define(ex40, calc(R*cea0))
-define(ex41, calc(R*cea1))
-define(ex42, calc(R*cea2))
-define(ex43, calc(R*cea3))
-define(ex44, calc(R*cea4))
-define(ex45, calc(R*cea5))
-define(ex46, calc(R*cea6))
-define(ex47, calc(R*cea7))
-
-define(ey00, calc(r*sea0))
-define(ey01, calc(r*sea1))
-define(ey02, calc(r*sea2))
-define(ey03, calc(r*sea3))
-define(ey04, calc(r*sea4))
-define(ey05, calc(r*sea5))
-define(ey06, calc(r*sea6))
-define(ey07, calc(r*sea7))
-
-define(ey10, calc(rb*sea0))
-define(ey11, calc(rb*sea1))
-define(ey12, calc(rb*sea2))
-define(ey13, calc(rb*sea3))
-define(ey14, calc(rb*sea4))
-define(ey15, calc(rb*sea5))
-define(ey16, calc(rb*sea6))
-define(ey17, calc(rb*sea7))
-
-define(ey20, calc(ri*sea0))
-define(ey21, calc(ri*sea1))
-define(ey22, calc(ri*sea2))
-define(ey23, calc(ri*sea3))
-define(ey24, calc(ri*sea4))
-define(ey25, calc(ri*sea5))
-define(ey26, calc(ri*sea6))
-define(ey27, calc(ri*sea7))
-
-define(ey30, calc(Rb*sea0))
-define(ey31, calc(Rb*sea1))
-define(ey32, calc(Rb*sea2))
-define(ey33, calc(Rb*sea3))
-define(ey34, calc(Rb*sea4))
-define(ey35, calc(Rb*sea5))
-define(ey36, calc(Rb*sea6))
-define(ey37, calc(Rb*sea7))
-
-define(ey40, calc(R*sea0))
-define(ey41, calc(R*sea1))
-define(ey42, calc(R*sea2))
-define(ey43, calc(R*sea3))
-define(ey44, calc(R*sea4))
-define(ey45, calc(R*sea5))
-define(ey46, calc(R*sea6))
-define(ey47, calc(R*sea7))
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    vert(0, 0, Zb) vlabel(r0b)
-    vert(0, 0, Zb) vlabel(r0sb)
-    vert(0, 1, Zb) vlabel(r1b)
-    vert(0, 2, Zb) vlabel(r2b)
-    vert(0, 2, Zb) vlabel(r2sb)
-    vert(0, 3, Zb) vlabel(r3b)
-    vert(0, 4, Zb) vlabel(r4b)
-    vert(0, 4, Zb) vlabel(r4sb)
-    vert(0, 5, Zb) vlabel(r5b)
-    vert(0, 6, Zb) vlabel(r6b)
-    vert(0, 6, Zb) vlabel(r6sb)
-    vert(0, 7, Zb) vlabel(r7b)
-
-    vert(1, 0, Zb) vlabel(rb0b)
-    vert(1, 1, Zb) vlabel(rb1b)
-    vert(1, 2, Zb) vlabel(rb2b)
-    vert(1, 3, Zb) vlabel(rb3b)
-    vert(1, 4, Zb) vlabel(rb4b)
-    vert(1, 5, Zb) vlabel(rb5b)
-    vert(1, 6, Zb) vlabel(rb6b)
-    vert(1, 7, Zb) vlabel(rb7b)
-
-    vert(2, 0, Zb) vlabel(ri0b)
-    vert(2, 1, Zb) vlabel(ri1b)
-    vert(2, 2, Zb) vlabel(ri2b)
-    vert(2, 3, Zb) vlabel(ri3b)
-    vert(2, 4, Zb) vlabel(ri4b)
-    vert(2, 5, Zb) vlabel(ri5b)
-    vert(2, 6, Zb) vlabel(ri6b)
-    vert(2, 7, Zb) vlabel(ri7b)
-
-    vert(3, 0, Zb) vlabel(Rb0b)
-    vert(3, 1, Zb) vlabel(Rb1b)
-    vert(3, 2, Zb) vlabel(Rb2b)
-    vert(3, 3, Zb) vlabel(Rb3b)
-    vert(3, 4, Zb) vlabel(Rb4b)
-    vert(3, 5, Zb) vlabel(Rb5b)
-    vert(3, 6, Zb) vlabel(Rb6b)
-    vert(3, 7, Zb) vlabel(Rb7b)
-
-    vert(4, 0, Zb) vlabel(R0b)
-    vert(4, 1, Zb) vlabel(R1b)
-    vert(4, 1, Zb) vlabel(R1sb)
-    vert(4, 2, Zb) vlabel(R2b)
-    vert(4, 3, Zb) vlabel(R3b)
-    vert(4, 3, Zb) vlabel(R3sb)
-    vert(4, 4, Zb) vlabel(R4b)
-    vert(4, 5, Zb) vlabel(R5b)
-    vert(4, 5, Zb) vlabel(R5sb)
-    vert(4, 6, Zb) vlabel(R6b)
-    vert(4, 7, Zb) vlabel(R7b)
-    vert(4, 7, Zb) vlabel(R7sb)
-
-    vert(0, 0, Zt) vlabel(r0t)
-    vert(0, 0, Zt) vlabel(r0st)
-    vert(0, 1, Zt) vlabel(r1t)
-    vert(0, 2, Zt) vlabel(r2t)
-    vert(0, 2, Zt) vlabel(r2st)
-    vert(0, 3, Zt) vlabel(r3t)
-    vert(0, 4, Zt) vlabel(r4t)
-    vert(0, 4, Zt) vlabel(r4st)
-    vert(0, 5, Zt) vlabel(r5t)
-    vert(0, 6, Zt) vlabel(r6t)
-    vert(0, 6, Zt) vlabel(r6st)
-    vert(0, 7, Zt) vlabel(r7t)
-
-    vert(1, 0, Zt) vlabel(rb0t)
-    vert(1, 1, Zt) vlabel(rb1t)
-    vert(1, 2, Zt) vlabel(rb2t)
-    vert(1, 3, Zt) vlabel(rb3t)
-    vert(1, 4, Zt) vlabel(rb4t)
-    vert(1, 5, Zt) vlabel(rb5t)
-    vert(1, 6, Zt) vlabel(rb6t)
-    vert(1, 7, Zt) vlabel(rb7t)
-
-    vert(2, 0, Zt) vlabel(ri0t)
-    vert(2, 1, Zt) vlabel(ri1t)
-    vert(2, 2, Zt) vlabel(ri2t)
-    vert(2, 3, Zt) vlabel(ri3t)
-    vert(2, 4, Zt) vlabel(ri4t)
-    vert(2, 5, Zt) vlabel(ri5t)
-    vert(2, 6, Zt) vlabel(ri6t)
-    vert(2, 7, Zt) vlabel(ri7t)
-
-    vert(3, 0, Zt) vlabel(Rb0t)
-    vert(3, 1, Zt) vlabel(Rb1t)
-    vert(3, 2, Zt) vlabel(Rb2t)
-    vert(3, 3, Zt) vlabel(Rb3t)
-    vert(3, 4, Zt) vlabel(Rb4t)
-    vert(3, 5, Zt) vlabel(Rb5t)
-    vert(3, 6, Zt) vlabel(Rb6t)
-    vert(3, 7, Zt) vlabel(Rb7t)
-
-    vert(4, 0, Zt) vlabel(R0t)
-    vert(4, 1, Zt) vlabel(R1t)
-    vert(4, 1, Zt) vlabel(R1st)
-    vert(4, 2, Zt) vlabel(R2t)
-    vert(4, 3, Zt) vlabel(R3t)
-    vert(4, 3, Zt) vlabel(R3st)
-    vert(4, 4, Zt) vlabel(R4t)
-    vert(4, 5, Zt) vlabel(R5t)
-    vert(4, 5, Zt) vlabel(R5st)
-    vert(4, 6, Zt) vlabel(R6t)
-    vert(4, 7, Zt) vlabel(R7t)
-    vert(4, 7, Zt) vlabel(R7st)
-);
-
-blocks
-(
-    // block0
-    hex2D(r0, r1, rb1, rb0)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(r1, r2s, rb2, rb1)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(r2, r3, rb3, rb2)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(r3, r4s, rb4, rb3)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(r4, r5, rb5, rb4)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(r5, r6s, rb6, rb5)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(r6, r7, rb7, rb6)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(r7, r0s, rb0, rb7)
-    rotor
-    (Na Nr Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(rb0, rb1, ri1, ri0)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(rb1, rb2, ri2, ri1)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(rb2, rb3, ri3, ri2)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(rb3, rb4, ri4, ri3)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(rb4, rb5, ri5, ri4)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(rb5, rb6, ri6, ri5)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(rb6, rb7, ri7, ri6)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(rb7, rb0, ri0, ri7)
-    rotor
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(ri0, ri1, Rb1, Rb0)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(ri1, ri2, Rb2, Rb1)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(ri2, ri3, Rb3, Rb2)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(ri3, ri4, Rb4, Rb3)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(ri4, ri5, Rb5, Rb4)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(ri5, ri6, Rb6, Rb5)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(ri6, ri7, Rb7, Rb6)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(ri7, ri0, Rb0, Rb7)
-    (Na Ni Nz)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex2D(Rb0, Rb1, R1s, R0)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex2D(Rb1, Rb2, R2, R1)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex2D(Rb2, Rb3, R3s, R2)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex2D(Rb3, Rb4, R4, R3)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex2D(Rb4, Rb5, R5s, R4)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex2D(Rb5, Rb6, R6, R5)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex2D(Rb6, Rb7, R7s, R6)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex2D(Rb7, Rb0, R0, R7)
-    (Na NR Nz)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc r0b r1b evert(0, 0, Zb)
-    arc r1b r2sb evert(0, 1, Zb)
-    arc r2b r3b evert(0, 2, Zb)
-    arc r3b r4sb evert(0, 3, Zb)
-    arc r4b r5b evert(0, 4, Zb)
-    arc r5b r6sb evert(0, 5, Zb)
-    arc r6b r7b evert(0, 6, Zb)
-    arc r7b r0sb evert(0, 7, Zb)
-
-    arc rb0b rb1b evert(1, 0, Zb)
-    arc rb1b rb2b evert(1, 1, Zb)
-    arc rb2b rb3b evert(1, 2, Zb)
-    arc rb3b rb4b evert(1, 3, Zb)
-    arc rb4b rb5b evert(1, 4, Zb)
-    arc rb5b rb6b evert(1, 5, Zb)
-    arc rb6b rb7b evert(1, 6, Zb)
-    arc rb7b rb0b evert(1, 7, Zb)
-
-    arc ri0b ri1b evert(2, 0, Zb)
-    arc ri1b ri2b evert(2, 1, Zb)
-    arc ri2b ri3b evert(2, 2, Zb)
-    arc ri3b ri4b evert(2, 3, Zb)
-    arc ri4b ri5b evert(2, 4, Zb)
-    arc ri5b ri6b evert(2, 5, Zb)
-    arc ri6b ri7b evert(2, 6, Zb)
-    arc ri7b ri0b evert(2, 7, Zb)
-
-    arc Rb0b Rb1b evert(3, 0, Zb)
-    arc Rb1b Rb2b evert(3, 1, Zb)
-    arc Rb2b Rb3b evert(3, 2, Zb)
-    arc Rb3b Rb4b evert(3, 3, Zb)
-    arc Rb4b Rb5b evert(3, 4, Zb)
-    arc Rb5b Rb6b evert(3, 5, Zb)
-    arc Rb6b Rb7b evert(3, 6, Zb)
-    arc Rb7b Rb0b evert(3, 7, Zb)
-
-    arc R0b R1sb evert(4, 0, Zb)
-    arc R1b R2b evert(4, 1, Zb)
-    arc R2b R3sb evert(4, 2, Zb)
-    arc R3b R4b evert(4, 3, Zb)
-    arc R4b R5sb evert(4, 4, Zb)
-    arc R5b R6b evert(4, 5, Zb)
-    arc R6b R7sb evert(4, 6, Zb)
-    arc R7b R0b evert(4, 7, Zb)
-
-    arc r0t r1t evert(0, 0, Zt)
-    arc r1t r2st evert(0, 1, Zt)
-    arc r2t r3t evert(0, 2, Zt)
-    arc r3t r4st evert(0, 3, Zt)
-    arc r4t r5t evert(0, 4, Zt)
-    arc r5t r6st evert(0, 5, Zt)
-    arc r6t r7t evert(0, 6, Zt)
-    arc r7t r0st evert(0, 7, Zt)
-
-    arc rb0t rb1t evert(1, 0, Zt)
-    arc rb1t rb2t evert(1, 1, Zt)
-    arc rb2t rb3t evert(1, 2, Zt)
-    arc rb3t rb4t evert(1, 3, Zt)
-    arc rb4t rb5t evert(1, 4, Zt)
-    arc rb5t rb6t evert(1, 5, Zt)
-    arc rb6t rb7t evert(1, 6, Zt)
-    arc rb7t rb0t evert(1, 7, Zt)
-
-    arc ri0t ri1t evert(2, 0, Zt)
-    arc ri1t ri2t evert(2, 1, Zt)
-    arc ri2t ri3t evert(2, 2, Zt)
-    arc ri3t ri4t evert(2, 3, Zt)
-    arc ri4t ri5t evert(2, 4, Zt)
-    arc ri5t ri6t evert(2, 5, Zt)
-    arc ri6t ri7t evert(2, 6, Zt)
-    arc ri7t ri0t evert(2, 7, Zt)
-
-    arc Rb0t Rb1t evert(3, 0, Zt)
-    arc Rb1t Rb2t evert(3, 1, Zt)
-    arc Rb2t Rb3t evert(3, 2, Zt)
-    arc Rb3t Rb4t evert(3, 3, Zt)
-    arc Rb4t Rb5t evert(3, 4, Zt)
-    arc Rb5t Rb6t evert(3, 5, Zt)
-    arc Rb6t Rb7t evert(3, 6, Zt)
-    arc Rb7t Rb0t evert(3, 7, Zt)
-
-    arc R0t R1st evert(4, 0, Zt)
-    arc R1t R2t evert(4, 1, Zt)
-    arc R2t R3st evert(4, 2, Zt)
-    arc R3t R4t evert(4, 3, Zt)
-    arc R4t R5st evert(4, 4, Zt)
-    arc R5t R6t evert(4, 5, Zt)
-    arc R6t R7st evert(4, 6, Zt)
-    arc R7t R0t evert(4, 7, Zt)
-);
-
-patches
-(
-    wall rotor
-    (
-        quad2D(r0, r1)
-        quad2D(r1, r2s)
-        quad2D(r2, r3)
-        quad2D(r3, r4s)
-        quad2D(r4, r5)
-        quad2D(r5, r6s)
-        quad2D(r6, r7)
-        quad2D(r7, r0s)
-
-        quad2D(r0, rb0)
-        quad2D(r0s, rb0)
-
-        quad2D(r2, rb2)
-        quad2D(r2s, rb2)
-
-        quad2D(r4, rb4)
-        quad2D(r4s, rb4)
-
-        quad2D(r6, rb6)
-        quad2D(r6s, rb6)
-    )
-
-    wall stator
-    (
-        quad2D(R0, R1s)
-        quad2D(R1, R2)
-        quad2D(R2, R3s)
-        quad2D(R3, R4)
-        quad2D(R4, R5s)
-        quad2D(R5, R6)
-        quad2D(R6, R7s)
-        quad2D(R7, R0)
-
-        quad2D(R1, Rb1)
-        quad2D(R1s, Rb1)
-
-        quad2D(R3, Rb3)
-        quad2D(R3s, Rb3)
-
-        quad2D(R5, Rb5)
-        quad2D(R5s, Rb5)
-
-        quad2D(R7, Rb7)
-        quad2D(R7s, Rb7)
-    )
-
-    empty front
-    (
-        frontQuad(r0, r1, rb1, rb0)
-        frontQuad(r1, r2s, rb2, rb1)
-        frontQuad(r2, r3, rb3, rb2)
-        frontQuad(r3, r4s, rb4, rb3)
-        frontQuad(r4, r5, rb5, rb4)
-        frontQuad(r5, r6s, rb6, rb5)
-        frontQuad(r6, r7, rb7, rb6)
-        frontQuad(r7, r0s, rb0, rb7)
-        frontQuad(rb0, rb1, ri1, ri0)
-        frontQuad(rb1, rb2, ri2, ri1)
-        frontQuad(rb2, rb3, ri3, ri2)
-        frontQuad(rb3, rb4, ri4, ri3)
-        frontQuad(rb4, rb5, ri5, ri4)
-        frontQuad(rb5, rb6, ri6, ri5)
-        frontQuad(rb6, rb7, ri7, ri6)
-        frontQuad(rb7, rb0, ri0, ri7)
-        frontQuad(ri0, ri1, Rb1, Rb0)
-        frontQuad(ri1, ri2, Rb2, Rb1)
-        frontQuad(ri2, ri3, Rb3, Rb2)
-        frontQuad(ri3, ri4, Rb4, Rb3)
-        frontQuad(ri4, ri5, Rb5, Rb4)
-        frontQuad(ri5, ri6, Rb6, Rb5)
-        frontQuad(ri6, ri7, Rb7, Rb6)
-        frontQuad(ri7, ri0, Rb0, Rb7)
-        frontQuad(Rb0, Rb1, R1s, R0)
-        frontQuad(Rb1, Rb2, R2, R1)
-        frontQuad(Rb2, Rb3, R3s, R2)
-        frontQuad(Rb3, Rb4, R4, R3)
-        frontQuad(Rb4, Rb5, R5s, R4)
-        frontQuad(Rb5, Rb6, R6, R5)
-        frontQuad(Rb6, Rb7, R7s, R6)
-        frontQuad(Rb7, Rb0, R0, R7)
-    )
-
-    empty back
-    (
-        backQuad(r0, r1, rb1, rb0)
-        backQuad(r1, r2s, rb2, rb1)
-        backQuad(r2, r3, rb3, rb2)
-        backQuad(r3, r4s, rb4, rb3)
-        backQuad(r4, r5, rb5, rb4)
-        backQuad(r5, r6s, rb6, rb5)
-        backQuad(r6, r7, rb7, rb6)
-        backQuad(r7, r0s, rb0, rb7)
-        backQuad(rb0, rb1, ri1, ri0)
-        backQuad(rb1, rb2, ri2, ri1)
-        backQuad(rb2, rb3, ri3, ri2)
-        backQuad(rb3, rb4, ri4, ri3)
-        backQuad(rb4, rb5, ri5, ri4)
-        backQuad(rb5, rb6, ri6, ri5)
-        backQuad(rb6, rb7, ri7, ri6)
-        backQuad(rb7, rb0, ri0, ri7)
-        backQuad(ri0, ri1, Rb1, Rb0)
-        backQuad(ri1, ri2, Rb2, Rb1)
-        backQuad(ri2, ri3, Rb3, Rb2)
-        backQuad(ri3, ri4, Rb4, Rb3)
-        backQuad(ri4, ri5, Rb5, Rb4)
-        backQuad(ri5, ri6, Rb6, Rb5)
-        backQuad(ri6, ri7, Rb7, Rb6)
-        backQuad(ri7, ri0, Rb0, Rb7)
-        backQuad(Rb0, Rb1, R1s, R0)
-        backQuad(Rb1, Rb2, R2, R1)
-        backQuad(Rb2, Rb3, R3s, R2)
-        backQuad(Rb3, Rb4, R4, R3)
-        backQuad(Rb4, Rb5, R5s, R4)
-        backQuad(Rb5, Rb6, R6, R5)
-        backQuad(Rb6, Rb7, R7s, R6)
-        backQuad(Rb7, Rb0, R0, R7)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
deleted file mode 100644
index f1f39e6588..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    rotor;
-        type    cellSet;
-        action  new;
-        source  zoneToCell;
-        sourceInfo
-        {
-            name rotor;
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/resources/blockMesh/mixerVessel2D b/tutorials/resources/blockMesh/mixerVessel2D
new file mode 100644
index 0000000000..b93ffc2402
--- /dev/null
+++ b/tutorials/resources/blockMesh/mixerVessel2D
@@ -0,0 +1,351 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1.0;
+
+hub            0.02;
+rotorBlades    0.05;
+rotorRegion    0.06;
+statorBlades   0.07;
+stator          0.1;
+halfDepth     0.005;
+angle            45;
+
+nRadialEndsCells 12;
+nRadialMidsCells  4;
+nCircCells       12;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+vertices #codeStream
+{
+    codeInclude
+    #{
+        #include "pointField.H"
+        #include "transformField.H"
+    #};
+
+    code
+    #{
+        const pointField initPoints
+        ({
+            point(-$stator,       0, -$halfDepth),
+            point(-$stator,       0, -$halfDepth),
+            point(-$statorBlades, 0, -$halfDepth),
+            point(-$rotorRegion,  0, -$halfDepth),
+            point(-$rotorBlades,  0, -$halfDepth),
+            point(-$hub,          0, -$halfDepth),
+            point(-$hub,          0, -$halfDepth),
+        });
+
+        pointField points;
+
+        // Rotate points around z-axis and append
+        for (label i = 0; i < 8; i++)
+        {
+            points.append(transform(Rz(-degToRad(i*$angle)), initPoints));
+        }
+
+        // Duplicate z points
+        points.append(points + vector(0, 0, 2*$halfDepth));
+
+        os  << points;
+    #};
+};
+
+hubTankBlocks ($nCircCells $nRadialEndsCells 1) simpleGrading (1 1 1);
+middleBocks   ($nCircCells $nRadialMidsCells 1) simpleGrading (1 1 1);
+
+blocks
+(
+    hex (0 8 9 2 56 64 65 58) stator $hubTankBlocks
+    hex (2 9 10 3 58 65 66 59) stator $middleBocks
+    hex (3 10 11 4 59 66 67 60) rotor $middleBocks
+    hex (4 11 12 5 60 67 68 61) rotor $hubTankBlocks
+
+    hex (7 14 16 9 63 70 72 65) stator $hubTankBlocks
+    hex (9 16 17 10 65 72 73 66) stator $middleBocks
+    hex (10 17 18 11 66 73 74 67) rotor $middleBocks
+    hex (11 18 20 12 67 74 76 68) rotor $hubTankBlocks
+
+    hex (14 22 23 16 70 78 79 72) stator $hubTankBlocks
+    hex (16 23 24 17 72 79 80 73) stator $middleBocks
+    hex (17 24 25 18 73 80 81 74) rotor $middleBocks
+    hex (18 25 26 19 74 81 82 75) rotor $hubTankBlocks
+
+    hex (21 28 30 23 77 84 86 79) stator $hubTankBlocks
+    hex (23 30 31 24 79 86 87 80) stator $middleBocks
+    hex (24 31 32 25 80 87 88 81) rotor $middleBocks
+    hex (25 32 34 26 81 88 90 82) rotor $hubTankBlocks
+
+    hex (28 36 37 30 84 92 93 86) stator $hubTankBlocks
+    hex (30 37 38 31 86 93 94 87) stator $middleBocks
+    hex (31 38 39 32 87 94 95 88) rotor $middleBocks
+    hex (32 39 40 33 88 95 96 89) rotor $hubTankBlocks
+
+    hex (35 42 44 37 91 98 100 93) stator $hubTankBlocks
+    hex (37 44 45 38 93 100 101 94) stator $middleBocks
+    hex (38 45 46 39 94 101 102 95) rotor $middleBocks
+    hex (39 46 48 40 95 102 104 96) rotor $hubTankBlocks
+
+    hex (42 50 51 44 98 106 107 100) stator $hubTankBlocks
+    hex (44 51 52 45 100 107 108 101) stator $middleBocks
+    hex (45 52 53 46 101 108 109 102) rotor $middleBocks
+    hex (46 53 54 47 102 109 110 103) rotor $hubTankBlocks
+
+    hex (49 0 2 51 105 56 58 107) stator $hubTankBlocks
+    hex (51 2 3 52 107 58 59 108) stator $middleBocks
+    hex (52 3 4 53 108 59 60 109) rotor $middleBocks
+    hex (53 4 6 54 109 60 62 110) rotor $hubTankBlocks
+);
+
+circle $angle (0 0 1);
+
+edges
+(
+    arc 0 8 $circle
+    arc 7 14 $circle
+    arc 14 22 $circle
+    arc 21 28 $circle
+    arc 28 36 $circle
+    arc 35 42 $circle
+    arc 42 50 $circle
+    arc 49 0 $circle
+    arc 56 64 $circle
+    arc 63 70 $circle
+    arc 70 78 $circle
+    arc 77 84 $circle
+    arc 84 92 $circle
+    arc 91 98 $circle
+    arc 98 106 $circle
+    arc 105 56 $circle
+
+    arc 2 9 $circle
+    arc 9 16 $circle
+    arc 16 23 $circle
+    arc 23 30 $circle
+    arc 30 37 $circle
+    arc 37 44 $circle
+    arc 44 51 $circle
+    arc 51 2 $circle
+    arc 58 65 $circle
+    arc 65 72 $circle
+    arc 72 79 $circle
+    arc 79 86 $circle
+    arc 86 93 $circle
+    arc 93 100 $circle
+    arc 100 107 $circle
+    arc 107 58 $circle
+
+    arc 3 10 $circle
+    arc 10 17 $circle
+    arc 17 24 $circle
+    arc 24 31 $circle
+    arc 31 38 $circle
+    arc 38 45 $circle
+    arc 45 52 $circle
+    arc 52 3 $circle
+    arc 59 66 $circle
+    arc 66 73 $circle
+    arc 73 80 $circle
+    arc 80 87 $circle
+    arc 87 94 $circle
+    arc 94 101 $circle
+    arc 101 108 $circle
+    arc 108 59 $circle
+
+    arc 4 11 $circle
+    arc 11 18 $circle
+    arc 18 25 $circle
+    arc 25 32 $circle
+    arc 32 39 $circle
+    arc 39 46 $circle
+    arc 46 53 $circle
+    arc 53 4 $circle
+    arc 60 67 $circle
+    arc 67 74 $circle
+    arc 74 81 $circle
+    arc 81 88 $circle
+    arc 88 95 $circle
+    arc 95 102 $circle
+    arc 102 109 $circle
+    arc 109 60 $circle
+
+    arc 5 12 $circle
+    arc 12 20 $circle
+    arc 19 26 $circle
+    arc 26 34 $circle
+    arc 33 40 $circle
+    arc 40 48 $circle
+    arc 47 54 $circle
+    arc 54 6 $circle
+    arc 61 68 $circle
+    arc 68 76 $circle
+    arc 75 82 $circle
+    arc 82 90 $circle
+    arc 89 96 $circle
+    arc 96 104 $circle
+    arc 103 110 $circle
+    arc 110 62 $circle
+);
+
+defaultPatch
+{
+    name walls;
+    type wall;
+}
+
+boundary
+(
+    rotor
+    {
+        type wall;
+        faces
+        (
+            (5 61 68 12)
+            (12 68 76 20)
+            (19 75 82 26)
+            (26 82 90 34)
+            (33 89 96 40)
+            (40 96 104 48)
+            (47 103 110 54)
+            (54 110 62 6)
+
+            (4 60 62 6)
+            (18 74 76 20)
+            (32 88 90 34)
+            (46 102 104 48)
+            (4 5 61 60)
+            (18 19 75 74)
+            (32 33 89 88)
+            (46 47 103 102)
+        );
+    }
+    stator
+    {
+        type wall;
+        faces
+        (
+            (0 8 64 56)
+            (7 14 70 63)
+            (14 22 78 70)
+            (21 28 84 77)
+            (28 36 92 84)
+            (35 42 98 91)
+            (42 50 106 98)
+            (49 0 56 105)
+
+            (8 64 65 9)
+            (22 78 79 23)
+            (36 92 93 37)
+            (50 106 107 51)
+            (7 9 65 63)
+            (21 23 79 77)
+            (35 37 93 91)
+            (49 51 107 105)
+        );
+    }
+    front
+    {
+        type empty;
+        faces
+        (
+            (56 58 65 64)
+            (63 65 72 70)
+            (70 72 79 78)
+            (77 79 86 84)
+            (84 86 93 92)
+            (91 93 100 98)
+            (98 100 107 106)
+            (105 107 58 56)
+
+            (58 59 66 65)
+            (65 66 73 72)
+            (72 73 80 79)
+            (79 80 87 86)
+            (86 87 94 93)
+            (93 94 101 100)
+            (100 101 108 107)
+            (107 108 59 58)
+
+            (59 60 67 66)
+            (66 67 74 73)
+            (73 74 81 80)
+            (80 81 88 87)
+            (87 88 95 94)
+            (94 95 102 101)
+            (101 102 109 108)
+            (108 109 60 59)
+
+            (60 61 68 67)
+            (67 68 76 74)
+            (74 75 82 81)
+            (81 82 90 88)
+            (88 89 96 95)
+            (95 96 104 102)
+            (102 103 110 109)
+            (109 110 62 60)
+        );
+    }
+    back
+    {
+        type empty;
+        faces
+        (
+            (0 2 9 8)
+            (7 9 16 14)
+            (14 16 23 22)
+            (21 23 30 28)
+            (28 30 37 36)
+            (35 37 44 42)
+            (42 44 51 50)
+            (49 51 2 0)
+
+            (2 3 10 9)
+            (9 10 17 16)
+            (16 17 24 23)
+            (23 24 31 30)
+            (30 31 38 37)
+            (37 38 45 44)
+            (44 45 52 51)
+            (51 52 3 2)
+
+            (3 4 11 10)
+            (10 11 18 17)
+            (17 18 25 24)
+            (24 25 32 31)
+            (31 32 39 38)
+            (38 39 46 45)
+            (45 46 53 52)
+            (52 53 4 3)
+
+            (4 5 12 11)
+            (11 12 20 18)
+            (18 19 26 25)
+            (25 26 34 32)
+            (32 33 40 39)
+            (39 40 48 46)
+            (46 47 54 53)
+            (53 54 6 4)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //