Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # Remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/propeller.obj.gz > /dev/null 2>&1
 
 cleanCase
 

tutorials/incompressible/pimpleFoam/RAS/propeller/Allmesh

@@ -5,22 +5,18 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Copy propeller surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
+cp $FOAM_TUTORIALS/resources/geometry/propeller.obj.gz constant/triSurface/
 
 # Meshing
 runApplication blockMesh
 runApplication surfaceFeatures
 runApplication snappyHexMesh -overwrite
 
-# Generate face/cell sets and zones
-runApplication topoSet -dict system/createInletOutletSets.topoSetDict
-
 # Create the inlet/outlet and AMI patches
-runApplication createPatch -overwrite
+runApplication createBaffles -overwrite
+runApplication mergeOrSplitBaffles -split -overwrite
 
+# Renumbering
 runApplication renumberMesh -noFields -overwrite
 
-# Test by running moveDynamicMes
-#runApplication moveDynamicMesh -checkAMI
-
 #------------------------------------------------------------------------------

tutorials/incompressible/pimpleFoam/RAS/propeller/constant/dynamicMeshDict

@@ -21,7 +21,7 @@ motionSolverLibs ("libfvMotionSolvers.so");
 
 motionSolver    solidBody;
 
-cellZone        innerCylinderSmall;
+cellZone        innerCylinder;
 
 solidBodyMotionFunction  rotatingMotion;
 

tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/innerCylinder.obj

@@ -1,304 +1,364 @@
 # Wavefront OBJ file
 # Regions:
-#     0    ascii
+#     0    innerCylinder
 #
-# points    : 100
-# triangles : 196
+# points    : 120
+# triangles : 236
 #
-v 0.0857323 0.1 -0.135092
-v -0.0857323 0.1 -0.135092
-v -0.0857323 0.1 0.135092
-v 0.0857323 0.1 0.135092
-v 0.158738 0.1 -0.0200533
-v -0.158738 0.1 -0.0200533
-v -0.158738 0.1 0.0200533
-v 0.158738 0.1 0.0200533
-v 0.0681247 0.1 -0.144772
-v -0.0681247 0.1 -0.144772
-v -0.0681247 0.1 0.144772
-v 0.0681247 0.1 0.144772
-v 0.154973 0.1 -0.0397904
-v -0.154973 0.1 -0.0397904
-v -0.154973 0.1 0.0397904
-v 0.154973 0.1 0.0397904
-v 0.0100465 0.1 -0.159684
-v -0.0100465 0.1 -0.159684
-v -0.0100465 0.1 0.159684
-v 0.0100465 0.1 0.159684
-v 0.148764 0.1 -0.0588999
-v -0.148764 0.1 -0.0588999
-v -0.148764 0.1 0.0588999
-v 0.148764 0.1 0.0588999
-v 0.140209 0.1 -0.0770806
-v -0.140209 0.1 -0.0770806
-v -0.140209 0.1 0.0770806
-v 0.140209 0.1 0.0770806
-v 0.0494427 0.1 -0.152169
-v -0.0494427 0.1 -0.152169
-v -0.0494427 0.1 0.152169
-v 0.0494427 0.1 0.152169
-v 0.16 0.1 0
-v -0.16 0.1 6.56331e-11
-v 0.101988 0.1 -0.123282
-v -0.101988 0.1 -0.123282
-v -0.101988 0.1 0.123282
-v 0.101988 0.1 0.123282
-v 0.029981 0.1 -0.157166
-v -0.029981 0.1 -0.157166
-v -0.029981 0.1 0.157166
-v 0.029981 0.1 0.157166
-v 0.129443 0.1 -0.0940456
-v -0.129443 0.1 -0.0940456
-v -0.129443 0.1 0.0940456
-v 0.129443 0.1 0.0940456
-v 0.116635 0.1 -0.109528
-v -0.116635 0.1 -0.109528
-v -0.116635 0.1 0.109528
-v 0.116635 0.1 0.109528
-v 0.0857323 -0.6 -0.135092
-v -0.0857323 -0.6 -0.135092
-v -0.0857323 -0.6 0.135092
-v 0.0857323 -0.6 0.135092
-v 0.158738 -0.6 -0.0200533
-v -0.158738 -0.6 -0.0200533
-v -0.158738 -0.6 0.0200533
-v 0.158738 -0.6 0.0200533
-v 0.0681247 -0.6 -0.144772
-v -0.0681247 -0.6 -0.144772
-v -0.0681247 -0.6 0.144772
-v 0.0681247 -0.6 0.144772
-v 0.154973 -0.6 -0.0397904
-v -0.154973 -0.6 -0.0397904
-v -0.154973 -0.6 0.0397904
-v 0.154973 -0.6 0.0397904
-v 0.0100465 -0.6 -0.159684
-v -0.0100465 -0.6 -0.159684
-v -0.0100465 -0.6 0.159684
-v 0.0100465 -0.6 0.159684
-v 0.148764 -0.6 -0.0588999
-v -0.148764 -0.6 -0.0588999
-v -0.148764 -0.6 0.0588999
-v 0.148764 -0.6 0.0588999
-v 0.140209 -0.6 -0.0770806
-v -0.140209 -0.6 -0.0770806
-v -0.140209 -0.6 0.0770806
-v 0.140209 -0.6 0.0770806
-v 0.0494427 -0.6 -0.152169
-v -0.0494427 -0.6 -0.152169
-v -0.0494427 -0.6 0.152169
-v 0.0494427 -0.6 0.152169
-v 0.16 -0.6 0
-v -0.16 -0.6 6.56331e-11
-v 0.101988 -0.6 -0.123282
-v -0.101988 -0.6 -0.123282
-v -0.101988 -0.6 0.123282
-v 0.101988 -0.6 0.123282
-v 0.029981 -0.6 -0.157166
-v -0.029981 -0.6 -0.157166
-v -0.029981 -0.6 0.157166
-v 0.029981 -0.6 0.157166
-v 0.129443 -0.6 -0.0940456
-v -0.129443 -0.6 -0.0940456
-v -0.129443 -0.6 0.0940456
-v 0.129443 -0.6 0.0940456
-v 0.116635 -0.6 -0.109528
-v -0.116635 -0.6 -0.109528
-v -0.116635 -0.6 0.109528
-v 0.116635 -0.6 0.109528
-g ascii
-f 33 83 5
-f 55 5 83
-f 5 55 13
-f 63 13 55
-f 13 63 21
-f 71 21 63
-f 21 71 25
-f 75 25 71
-f 25 75 43
-f 93 43 75
-f 43 93 47
-f 97 47 93
-f 47 97 35
-f 85 35 97
-f 35 85 1
-f 51 1 85
-f 1 51 9
-f 59 9 51
-f 9 59 29
-f 79 29 59
-f 29 79 39
-f 89 39 79
-f 39 89 17
-f 67 17 89
-f 17 67 18
-f 68 18 67
-f 18 68 40
-f 90 40 68
-f 40 90 30
-f 80 30 90
-f 30 80 10
-f 60 10 80
-f 10 60 2
-f 52 2 60
-f 2 52 36
-f 86 36 52
-f 36 86 48
-f 98 48 86
-f 48 98 44
-f 94 44 98
-f 44 94 26
-f 76 26 94
-f 26 76 22
-f 72 22 76
-f 22 72 14
-f 64 14 72
-f 14 64 6
-f 56 6 64
-f 6 56 34
-f 84 34 56
-f 34 84 7
-f 57 7 84
-f 7 57 15
-f 65 15 57
-f 15 65 23
-f 73 23 65
-f 23 73 27
-f 77 27 73
-f 27 77 45
-f 95 45 77
-f 45 95 49
-f 99 49 95
-f 49 99 37
-f 87 37 99
-f 37 87 3
-f 53 3 87
-f 3 53 11
-f 61 11 53
-f 11 61 31
-f 81 31 61
-f 31 81 41
-f 91 41 81
-f 41 91 19
-f 69 19 91
-f 19 69 20
-f 70 20 69
-f 20 70 42
-f 92 42 70
-f 42 92 32
-f 82 32 92
-f 32 82 12
-f 62 12 82
-f 12 62 4
-f 54 4 62
-f 4 54 38
-f 88 38 54
-f 38 88 50
-f 100 50 88
-f 50 100 46
-f 96 46 100
-f 46 96 28
-f 78 28 96
-f 28 78 24
-f 74 24 78
-f 24 74 16
-f 66 16 74
-f 16 66 8
-f 58 8 66
-f 8 58 33
-f 83 33 58
-f 13 21 5
-f 21 25 5
-f 5 25 33
-f 33 25 8
-f 25 43 8
-f 43 47 8
-f 47 35 8
-f 35 1 8
-f 1 9 8
-f 9 29 8
-f 29 39 8
-f 39 17 8
-f 17 18 8
-f 18 40 8
-f 40 30 8
-f 30 10 8
-f 10 2 8
-f 2 36 8
-f 36 48 8
-f 48 44 8
-f 44 26 8
-f 26 22 8
-f 22 14 8
-f 14 6 8
-f 6 34 8
-f 34 7 8
-f 8 7 16
-f 16 7 24
-f 7 15 24
-f 15 23 24
-f 24 23 28
-f 28 23 46
-f 46 23 50
-f 50 23 38
-f 38 23 4
-f 23 27 4
-f 27 45 4
-f 45 49 4
-f 49 37 4
-f 37 3 4
-f 4 3 12
-f 12 3 32
-f 32 3 42
-f 42 3 20
-f 20 3 19
-f 19 3 41
-f 41 3 31
-f 11 31 3
-f 66 74 58
-f 74 78 58
-f 58 78 83
-f 83 78 55
-f 78 96 55
-f 96 100 55
-f 100 88 55
-f 88 54 55
-f 54 62 55
-f 62 82 55
-f 82 92 55
-f 92 70 55
-f 70 69 55
-f 69 91 55
-f 91 81 55
-f 81 61 55
-f 61 53 55
-f 53 87 55
-f 87 99 55
-f 99 95 55
-f 95 77 55
-f 77 73 55
-f 73 65 55
-f 65 57 55
-f 57 84 55
-f 84 56 55
-f 55 56 63
-f 63 56 71
-f 56 64 71
-f 64 72 71
-f 71 72 75
-f 75 72 93
-f 93 72 97
-f 97 72 85
-f 85 72 51
-f 72 76 51
-f 76 94 51
-f 94 98 51
-f 98 86 51
-f 86 52 51
-f 51 52 59
-f 59 52 79
-f 79 52 89
-f 89 52 67
-f 67 52 68
-f 68 52 90
-f 90 52 80
-f 60 80 52
+v 0.109625 0.06 -0.0488084
+v 0.0488084 0.06 -0.109625
+v -0.0488084 0.06 -0.109625
+v -0.109625 0.06 -0.0488084
+v -0.109625 0.06 0.0488084
+v -0.0488084 0.06 0.109625
+v 0.0488084 0.06 0.109625
+v 0.109625 0.06 0.0488084
+v 0.097082 0.06 -0.0705342
+v 0.0705342 0.06 -0.097082
+v -0.0705342 0.06 -0.097082
+v -0.097082 0.06 -0.0705342
+v -0.097082 0.06 0.0705342
+v -0.0705342 0.06 0.097082
+v 0.0705342 0.06 0.097082
+v 0.097082 0.06 0.0705342
+v 0.103923 0.06 -0.06
+v 0.06 0.06 -0.103923
+v -0.06 0.06 -0.103923
+v -0.103923 0.06 -0.06
+v -0.103923 0.06 0.06
+v -0.06 0.06 0.103923
+v 0.06 0.06 0.103923
+v 0.103923 0.06 0.06
+v 0.12 0.06 0
+v -2.46124e-11 0.06 -0.12
+v -0.12 0.06 4.92248e-11
+v 7.38372e-11 0.06 0.12
+v 0.0891774 0.06 -0.0802957
+v 0.0802957 0.06 -0.0891774
+v -0.0802957 0.06 -0.0891774
+v -0.0891774 0.06 -0.0802957
+v -0.0891774 0.06 0.0802957
+v -0.0802957 0.06 0.0891774
+v 0.0802957 0.06 0.0891774
+v 0.0891774 0.06 0.0802957
+v 0.114127 0.06 -0.037082
+v 0.037082 0.06 -0.114127
+v -0.037082 0.06 -0.114127
+v -0.114127 0.06 -0.037082
+v -0.114127 0.06 0.037082
+v -0.037082 0.06 0.114127
+v 0.037082 0.06 0.114127
+v 0.114127 0.06 0.037082
+v 0.117378 0.06 -0.0249494
+v 0.0249494 0.06 -0.117378
+v -0.0249494 0.06 -0.117378
+v -0.117378 0.06 -0.0249494
+v -0.117378 0.06 0.0249494
+v -0.0249494 0.06 0.117378
+v 0.0249494 0.06 0.117378
+v 0.117378 0.06 0.0249494
+v 0.119343 0.06 -0.0125434
+v 0.0125434 0.06 -0.119343
+v -0.0125434 0.06 -0.119343
+v -0.119343 0.06 -0.0125434
+v -0.119343 0.06 0.0125434
+v -0.0125434 0.06 0.119343
+v 0.0125434 0.06 0.119343
+v 0.119343 0.06 0.0125434
+v 0.109625 -0.08 -0.0488084
+v 0.0488084 -0.08 -0.109625
+v -0.0488084 -0.08 -0.109625
+v -0.109625 -0.08 -0.0488084
+v -0.109625 -0.08 0.0488084
+v -0.0488084 -0.08 0.109625
+v 0.0488084 -0.08 0.109625
+v 0.109625 -0.08 0.0488084
+v 0.097082 -0.08 -0.0705342
+v 0.0705342 -0.08 -0.097082
+v -0.0705342 -0.08 -0.097082
+v -0.097082 -0.08 -0.0705342
+v -0.097082 -0.08 0.0705342
+v -0.0705342 -0.08 0.097082
+v 0.0705342 -0.08 0.097082
+v 0.097082 -0.08 0.0705342
+v 0.103923 -0.08 -0.06
+v 0.06 -0.08 -0.103923
+v -0.06 -0.08 -0.103923
+v -0.103923 -0.08 -0.06
+v -0.103923 -0.08 0.06
+v -0.06 -0.08 0.103923
+v 0.06 -0.08 0.103923
+v 0.103923 -0.08 0.06
+v 0.12 -0.08 0
+v -2.46124e-11 -0.08 -0.12
+v -0.12 -0.08 4.92248e-11
+v 7.38372e-11 -0.08 0.12
+v 0.0891774 -0.08 -0.0802957
+v 0.0802957 -0.08 -0.0891774
+v -0.0802957 -0.08 -0.0891774
+v -0.0891774 -0.08 -0.0802957
+v -0.0891774 -0.08 0.0802957
+v -0.0802957 -0.08 0.0891774
+v 0.0802957 -0.08 0.0891774
+v 0.0891774 -0.08 0.0802957
+v 0.114127 -0.08 -0.037082
+v 0.037082 -0.08 -0.114127
+v -0.037082 -0.08 -0.114127
+v -0.114127 -0.08 -0.037082
+v -0.114127 -0.08 0.037082
+v -0.037082 -0.08 0.114127
+v 0.037082 -0.08 0.114127
+v 0.114127 -0.08 0.037082
+v 0.117378 -0.08 -0.0249494
+v 0.0249494 -0.08 -0.117378
+v -0.0249494 -0.08 -0.117378
+v -0.117378 -0.08 -0.0249494
+v -0.117378 -0.08 0.0249494
+v -0.0249494 -0.08 0.117378
+v 0.0249494 -0.08 0.117378
+v 0.117378 -0.08 0.0249494
+v 0.119343 -0.08 -0.0125434
+v 0.0125434 -0.08 -0.119343
+v -0.0125434 -0.08 -0.119343
+v -0.119343 -0.08 -0.0125434
+v -0.119343 -0.08 0.0125434
+v -0.0125434 -0.08 0.119343
+v 0.0125434 -0.08 0.119343
+v 0.119343 -0.08 0.0125434
+g innerCylinder
+f 25 85 53
+f 113 53 85
+f 53 113 45
+f 45 113 105
+f 45 105 37
+f 97 37 105
+f 37 97 1
+f 61 1 97
+f 1 61 17
+f 17 61 77
+f 17 77 9
+f 9 77 69
+f 9 69 29
+f 89 29 69
+f 29 89 30
+f 90 30 89
+f 30 90 10
+f 70 10 90
+f 10 70 18
+f 18 70 78
+f 18 78 2
+f 2 78 62
+f 2 62 38
+f 98 38 62
+f 38 98 46
+f 106 46 98
+f 46 106 54
+f 54 106 114
+f 54 114 26
+f 86 26 114
+f 26 86 55
+f 115 55 86
+f 55 115 47
+f 47 115 107
+f 47 107 39
+f 99 39 107
+f 39 99 3
+f 63 3 99
+f 3 63 19
+f 19 63 79
+f 19 79 11
+f 11 79 71
+f 11 71 31
+f 91 31 71
+f 31 91 32
+f 92 32 91
+f 32 92 12
+f 72 12 92
+f 12 72 20
+f 20 72 80
+f 20 80 4
+f 4 80 64
+f 4 64 40
+f 100 40 64
+f 40 100 48
+f 108 48 100
+f 48 108 56
+f 56 108 116
+f 56 116 27
+f 87 27 116
+f 27 87 57
+f 117 57 87
+f 57 117 49
+f 49 117 109
+f 49 109 41
+f 101 41 109
+f 41 101 5
+f 65 5 101
+f 5 65 21
+f 21 65 81
+f 21 81 13
+f 13 81 73
+f 13 73 33
+f 93 33 73
+f 33 93 34
+f 94 34 93
+f 34 94 14
+f 74 14 94
+f 14 74 22
+f 22 74 82
+f 22 82 6
+f 6 82 66
+f 6 66 42
+f 102 42 66
+f 42 102 50
+f 110 50 102
+f 50 110 58
+f 58 110 118
+f 58 118 28
+f 88 28 118
+f 28 88 59
+f 119 59 88
+f 59 119 51
+f 51 119 111
+f 51 111 43
+f 103 43 111
+f 43 103 7
+f 67 7 103
+f 7 67 23
+f 23 67 83
+f 23 83 15
+f 15 83 75
+f 15 75 35
+f 95 35 75
+f 35 95 36
+f 96 36 95
+f 36 96 16
+f 76 16 96
+f 16 76 24
+f 24 76 84
+f 24 84 8
+f 8 84 68
+f 8 68 44
+f 104 44 68
+f 44 104 52
+f 112 52 104
+f 52 112 60
+f 60 112 120
+f 60 120 25
+f 85 25 120
+f 45 37 53
+f 37 1 53
+f 53 1 25
+f 25 1 60
+f 1 17 60
+f 60 17 52
+f 52 17 44
+f 44 17 8
+f 8 17 24
+f 24 17 16
+f 16 17 36
+f 36 17 35
+f 35 17 15
+f 15 17 23
+f 23 17 7
+f 7 17 43
+f 43 17 51
+f 51 17 59
+f 59 17 28
+f 28 17 58
+f 58 17 50
+f 50 17 42
+f 42 17 6
+f 6 17 22
+f 22 17 14
+f 14 17 34
+f 17 9 34
+f 9 29 34
+f 34 29 33
+f 33 29 13
+f 13 29 21
+f 21 29 5
+f 5 29 41
+f 41 29 49
+f 49 29 57
+f 57 29 27
+f 27 29 56
+f 56 29 48
+f 48 29 40
+f 40 29 4
+f 4 29 20
+f 20 29 12
+f 12 29 32
+f 32 29 31
+f 31 29 11
+f 29 30 11
+f 30 10 11
+f 11 10 19
+f 19 10 3
+f 3 10 39
+f 39 10 47
+f 47 10 55
+f 55 10 26
+f 26 10 54
+f 54 10 46
+f 46 10 38
+f 38 10 2
+f 18 2 10
+f 112 104 120
+f 104 68 120
+f 120 68 85
+f 85 68 113
+f 68 84 113
+f 113 84 105
+f 105 84 97
+f 97 84 61
+f 61 84 77
+f 77 84 69
+f 69 84 89
+f 89 84 90
+f 90 84 70
+f 70 84 78
+f 78 84 62
+f 62 84 98
+f 98 84 106
+f 106 84 114
+f 114 84 86
+f 86 84 115
+f 115 84 107
+f 107 84 99
+f 99 84 63
+f 63 84 79
+f 79 84 71
+f 71 84 91
+f 84 76 91
+f 76 96 91
+f 91 96 92
+f 92 96 72
+f 72 96 80
+f 80 96 64
+f 64 96 100
+f 100 96 108
+f 108 96 116
+f 116 96 87
+f 87 96 117
+f 117 96 109
+f 109 96 101
+f 101 96 65
+f 65 96 81
+f 81 96 73
+f 73 96 93
+f 93 96 94
+f 94 96 74
+f 96 95 74
+f 95 75 74
+f 74 75 82
+f 82 75 66
+f 66 75 102
+f 102 75 110
+f 110 75 118
+f 118 75 88
+f 88 75 119
+f 119 75 111
+f 111 75 103
+f 103 75 67
+f 83 67 75

tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/innerCylinderSmall.obj

@@ -1,364 +0,0 @@
-# Wavefront OBJ file
-# Regions:
-#     0    ascii
-#
-# points    : 120
-# triangles : 236
-#
-v 0.109625 0.06 -0.0488084
-v 0.0488084 0.06 -0.109625
-v -0.0488084 0.06 -0.109625
-v -0.109625 0.06 -0.0488084
-v -0.109625 0.06 0.0488084
-v -0.0488084 0.06 0.109625
-v 0.0488084 0.06 0.109625
-v 0.109625 0.06 0.0488084
-v 0.097082 0.06 -0.0705342
-v 0.0705342 0.06 -0.097082
-v -0.0705342 0.06 -0.097082
-v -0.097082 0.06 -0.0705342
-v -0.097082 0.06 0.0705342
-v -0.0705342 0.06 0.097082
-v 0.0705342 0.06 0.097082
-v 0.097082 0.06 0.0705342
-v 0.103923 0.06 -0.06
-v 0.06 0.06 -0.103923
-v -0.06 0.06 -0.103923
-v -0.103923 0.06 -0.06
-v -0.103923 0.06 0.06
-v -0.06 0.06 0.103923
-v 0.06 0.06 0.103923
-v 0.103923 0.06 0.06
-v 0.12 0.06 0
-v -2.46124e-11 0.06 -0.12
-v -0.12 0.06 4.92248e-11
-v 7.38372e-11 0.06 0.12
-v 0.0891774 0.06 -0.0802957
-v 0.0802957 0.06 -0.0891774
-v -0.0802957 0.06 -0.0891774
-v -0.0891774 0.06 -0.0802957
-v -0.0891774 0.06 0.0802957
-v -0.0802957 0.06 0.0891774
-v 0.0802957 0.06 0.0891774
-v 0.0891774 0.06 0.0802957
-v 0.114127 0.06 -0.037082
-v 0.037082 0.06 -0.114127
-v -0.037082 0.06 -0.114127
-v -0.114127 0.06 -0.037082
-v -0.114127 0.06 0.037082
-v -0.037082 0.06 0.114127
-v 0.037082 0.06 0.114127
-v 0.114127 0.06 0.037082
-v 0.117378 0.06 -0.0249494
-v 0.0249494 0.06 -0.117378
-v -0.0249494 0.06 -0.117378
-v -0.117378 0.06 -0.0249494
-v -0.117378 0.06 0.0249494
-v -0.0249494 0.06 0.117378
-v 0.0249494 0.06 0.117378
-v 0.117378 0.06 0.0249494
-v 0.119343 0.06 -0.0125434
-v 0.0125434 0.06 -0.119343
-v -0.0125434 0.06 -0.119343
-v -0.119343 0.06 -0.0125434
-v -0.119343 0.06 0.0125434
-v -0.0125434 0.06 0.119343
-v 0.0125434 0.06 0.119343
-v 0.119343 0.06 0.0125434
-v 0.109625 -0.08 -0.0488084
-v 0.0488084 -0.08 -0.109625
-v -0.0488084 -0.08 -0.109625
-v -0.109625 -0.08 -0.0488084
-v -0.109625 -0.08 0.0488084
-v -0.0488084 -0.08 0.109625
-v 0.0488084 -0.08 0.109625
-v 0.109625 -0.08 0.0488084
-v 0.097082 -0.08 -0.0705342
-v 0.0705342 -0.08 -0.097082
-v -0.0705342 -0.08 -0.097082
-v -0.097082 -0.08 -0.0705342
-v -0.097082 -0.08 0.0705342
-v -0.0705342 -0.08 0.097082
-v 0.0705342 -0.08 0.097082
-v 0.097082 -0.08 0.0705342
-v 0.103923 -0.08 -0.06
-v 0.06 -0.08 -0.103923
-v -0.06 -0.08 -0.103923
-v -0.103923 -0.08 -0.06
-v -0.103923 -0.08 0.06
-v -0.06 -0.08 0.103923
-v 0.06 -0.08 0.103923
-v 0.103923 -0.08 0.06
-v 0.12 -0.08 0
-v -2.46124e-11 -0.08 -0.12
-v -0.12 -0.08 4.92248e-11
-v 7.38372e-11 -0.08 0.12
-v 0.0891774 -0.08 -0.0802957
-v 0.0802957 -0.08 -0.0891774
-v -0.0802957 -0.08 -0.0891774
-v -0.0891774 -0.08 -0.0802957
-v -0.0891774 -0.08 0.0802957
-v -0.0802957 -0.08 0.0891774
-v 0.0802957 -0.08 0.0891774
-v 0.0891774 -0.08 0.0802957
-v 0.114127 -0.08 -0.037082
-v 0.037082 -0.08 -0.114127
-v -0.037082 -0.08 -0.114127
-v -0.114127 -0.08 -0.037082
-v -0.114127 -0.08 0.037082
-v -0.037082 -0.08 0.114127
-v 0.037082 -0.08 0.114127
-v 0.114127 -0.08 0.037082
-v 0.117378 -0.08 -0.0249494
-v 0.0249494 -0.08 -0.117378
-v -0.0249494 -0.08 -0.117378
-v -0.117378 -0.08 -0.0249494
-v -0.117378 -0.08 0.0249494
-v -0.0249494 -0.08 0.117378
-v 0.0249494 -0.08 0.117378
-v 0.117378 -0.08 0.0249494
-v 0.119343 -0.08 -0.0125434
-v 0.0125434 -0.08 -0.119343
-v -0.0125434 -0.08 -0.119343
-v -0.119343 -0.08 -0.0125434
-v -0.119343 -0.08 0.0125434
-v -0.0125434 -0.08 0.119343
-v 0.0125434 -0.08 0.119343
-v 0.119343 -0.08 0.0125434
-g ascii
-f 25 85 53
-f 113 53 85
-f 53 113 45
-f 45 113 105
-f 45 105 37
-f 97 37 105
-f 37 97 1
-f 61 1 97
-f 1 61 17
-f 17 61 77
-f 17 77 9
-f 9 77 69
-f 9 69 29
-f 89 29 69
-f 29 89 30
-f 90 30 89
-f 30 90 10
-f 70 10 90
-f 10 70 18
-f 18 70 78
-f 18 78 2
-f 2 78 62
-f 2 62 38
-f 98 38 62
-f 38 98 46
-f 106 46 98
-f 46 106 54
-f 54 106 114
-f 54 114 26
-f 86 26 114
-f 26 86 55
-f 115 55 86
-f 55 115 47
-f 47 115 107
-f 47 107 39
-f 99 39 107
-f 39 99 3
-f 63 3 99
-f 3 63 19
-f 19 63 79
-f 19 79 11
-f 11 79 71
-f 11 71 31
-f 91 31 71
-f 31 91 32
-f 92 32 91
-f 32 92 12
-f 72 12 92
-f 12 72 20
-f 20 72 80
-f 20 80 4
-f 4 80 64
-f 4 64 40
-f 100 40 64
-f 40 100 48
-f 108 48 100
-f 48 108 56
-f 56 108 116
-f 56 116 27
-f 87 27 116
-f 27 87 57
-f 117 57 87
-f 57 117 49
-f 49 117 109
-f 49 109 41
-f 101 41 109
-f 41 101 5
-f 65 5 101
-f 5 65 21
-f 21 65 81
-f 21 81 13
-f 13 81 73
-f 13 73 33
-f 93 33 73
-f 33 93 34
-f 94 34 93
-f 34 94 14
-f 74 14 94
-f 14 74 22
-f 22 74 82
-f 22 82 6
-f 6 82 66
-f 6 66 42
-f 102 42 66
-f 42 102 50
-f 110 50 102
-f 50 110 58
-f 58 110 118
-f 58 118 28
-f 88 28 118
-f 28 88 59
-f 119 59 88
-f 59 119 51
-f 51 119 111
-f 51 111 43
-f 103 43 111
-f 43 103 7
-f 67 7 103
-f 7 67 23
-f 23 67 83
-f 23 83 15
-f 15 83 75
-f 15 75 35
-f 95 35 75
-f 35 95 36
-f 96 36 95
-f 36 96 16
-f 76 16 96
-f 16 76 24
-f 24 76 84
-f 24 84 8
-f 8 84 68
-f 8 68 44
-f 104 44 68
-f 44 104 52
-f 112 52 104
-f 52 112 60
-f 60 112 120
-f 60 120 25
-f 85 25 120
-f 45 37 53
-f 37 1 53
-f 53 1 25
-f 25 1 60
-f 1 17 60
-f 60 17 52
-f 52 17 44
-f 44 17 8
-f 8 17 24
-f 24 17 16
-f 16 17 36
-f 36 17 35
-f 35 17 15
-f 15 17 23
-f 23 17 7
-f 7 17 43
-f 43 17 51
-f 51 17 59
-f 59 17 28
-f 28 17 58
-f 58 17 50
-f 50 17 42
-f 42 17 6
-f 6 17 22
-f 22 17 14
-f 14 17 34
-f 17 9 34
-f 9 29 34
-f 34 29 33
-f 33 29 13
-f 13 29 21
-f 21 29 5
-f 5 29 41
-f 41 29 49
-f 49 29 57
-f 57 29 27
-f 27 29 56
-f 56 29 48
-f 48 29 40
-f 40 29 4
-f 4 29 20
-f 20 29 12
-f 12 29 32
-f 32 29 31
-f 31 29 11
-f 29 30 11
-f 30 10 11
-f 11 10 19
-f 19 10 3
-f 3 10 39
-f 39 10 47
-f 47 10 55
-f 55 10 26
-f 26 10 54
-f 54 10 46
-f 46 10 38
-f 38 10 2
-f 18 2 10
-f 112 104 120
-f 104 68 120
-f 120 68 85
-f 85 68 113
-f 68 84 113
-f 113 84 105
-f 105 84 97
-f 97 84 61
-f 61 84 77
-f 77 84 69
-f 69 84 89
-f 89 84 90
-f 90 84 70
-f 70 84 78
-f 78 84 62
-f 62 84 98
-f 98 84 106
-f 106 84 114
-f 114 84 86
-f 86 84 115
-f 115 84 107
-f 107 84 99
-f 99 84 63
-f 63 84 79
-f 79 84 71
-f 71 84 91
-f 84 76 91
-f 76 96 91
-f 91 96 92
-f 92 96 72
-f 72 96 80
-f 80 96 64
-f 64 96 100
-f 100 96 108
-f 108 96 116
-f 116 96 87
-f 87 96 117
-f 117 96 109
-f 109 96 101
-f 101 96 65
-f 65 96 81
-f 81 96 73
-f 73 96 93
-f 93 96 94
-f 94 96 74
-f 96 95 74
-f 95 75 74
-f 74 75 82
-f 82 75 66
-f 66 75 102
-f 102 75 110
-f 110 75 118
-f 118 75 88
-f 88 75 119
-f 119 75 111
-f 111 75 103
-f 103 75 67
-f 83 67 75

tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/middleCylinder.obj

@@ -0,0 +1,304 @@
+# Wavefront OBJ file
+# Regions:
+#     0    middleCylinder
+#
+# points    : 100
+# triangles : 196
+#
+v 0.0857323 0.1 -0.135092
+v -0.0857323 0.1 -0.135092
+v -0.0857323 0.1 0.135092
+v 0.0857323 0.1 0.135092
+v 0.158738 0.1 -0.0200533
+v -0.158738 0.1 -0.0200533
+v -0.158738 0.1 0.0200533
+v 0.158738 0.1 0.0200533
+v 0.0681247 0.1 -0.144772
+v -0.0681247 0.1 -0.144772
+v -0.0681247 0.1 0.144772
+v 0.0681247 0.1 0.144772
+v 0.154973 0.1 -0.0397904
+v -0.154973 0.1 -0.0397904
+v -0.154973 0.1 0.0397904
+v 0.154973 0.1 0.0397904
+v 0.0100465 0.1 -0.159684
+v -0.0100465 0.1 -0.159684
+v -0.0100465 0.1 0.159684
+v 0.0100465 0.1 0.159684
+v 0.148764 0.1 -0.0588999
+v -0.148764 0.1 -0.0588999
+v -0.148764 0.1 0.0588999
+v 0.148764 0.1 0.0588999
+v 0.140209 0.1 -0.0770806
+v -0.140209 0.1 -0.0770806
+v -0.140209 0.1 0.0770806
+v 0.140209 0.1 0.0770806
+v 0.0494427 0.1 -0.152169
+v -0.0494427 0.1 -0.152169
+v -0.0494427 0.1 0.152169
+v 0.0494427 0.1 0.152169
+v 0.16 0.1 0
+v -0.16 0.1 6.56331e-11
+v 0.101988 0.1 -0.123282
+v -0.101988 0.1 -0.123282
+v -0.101988 0.1 0.123282
+v 0.101988 0.1 0.123282
+v 0.029981 0.1 -0.157166
+v -0.029981 0.1 -0.157166
+v -0.029981 0.1 0.157166
+v 0.029981 0.1 0.157166
+v 0.129443 0.1 -0.0940456
+v -0.129443 0.1 -0.0940456
+v -0.129443 0.1 0.0940456
+v 0.129443 0.1 0.0940456
+v 0.116635 0.1 -0.109528
+v -0.116635 0.1 -0.109528
+v -0.116635 0.1 0.109528
+v 0.116635 0.1 0.109528
+v 0.0857323 -0.6 -0.135092
+v -0.0857323 -0.6 -0.135092
+v -0.0857323 -0.6 0.135092
+v 0.0857323 -0.6 0.135092
+v 0.158738 -0.6 -0.0200533
+v -0.158738 -0.6 -0.0200533
+v -0.158738 -0.6 0.0200533
+v 0.158738 -0.6 0.0200533
+v 0.0681247 -0.6 -0.144772
+v -0.0681247 -0.6 -0.144772
+v -0.0681247 -0.6 0.144772
+v 0.0681247 -0.6 0.144772
+v 0.154973 -0.6 -0.0397904
+v -0.154973 -0.6 -0.0397904
+v -0.154973 -0.6 0.0397904
+v 0.154973 -0.6 0.0397904
+v 0.0100465 -0.6 -0.159684
+v -0.0100465 -0.6 -0.159684
+v -0.0100465 -0.6 0.159684
+v 0.0100465 -0.6 0.159684
+v 0.148764 -0.6 -0.0588999
+v -0.148764 -0.6 -0.0588999
+v -0.148764 -0.6 0.0588999
+v 0.148764 -0.6 0.0588999
+v 0.140209 -0.6 -0.0770806
+v -0.140209 -0.6 -0.0770806
+v -0.140209 -0.6 0.0770806
+v 0.140209 -0.6 0.0770806
+v 0.0494427 -0.6 -0.152169
+v -0.0494427 -0.6 -0.152169
+v -0.0494427 -0.6 0.152169
+v 0.0494427 -0.6 0.152169
+v 0.16 -0.6 0
+v -0.16 -0.6 6.56331e-11
+v 0.101988 -0.6 -0.123282
+v -0.101988 -0.6 -0.123282
+v -0.101988 -0.6 0.123282
+v 0.101988 -0.6 0.123282
+v 0.029981 -0.6 -0.157166
+v -0.029981 -0.6 -0.157166
+v -0.029981 -0.6 0.157166
+v 0.029981 -0.6 0.157166
+v 0.129443 -0.6 -0.0940456
+v -0.129443 -0.6 -0.0940456
+v -0.129443 -0.6 0.0940456
+v 0.129443 -0.6 0.0940456
+v 0.116635 -0.6 -0.109528
+v -0.116635 -0.6 -0.109528
+v -0.116635 -0.6 0.109528
+v 0.116635 -0.6 0.109528
+g middleCylinder
+f 33 83 5
+f 55 5 83
+f 5 55 13
+f 63 13 55
+f 13 63 21
+f 71 21 63
+f 21 71 25
+f 75 25 71
+f 25 75 43
+f 93 43 75
+f 43 93 47
+f 97 47 93
+f 47 97 35
+f 85 35 97
+f 35 85 1
+f 51 1 85
+f 1 51 9
+f 59 9 51
+f 9 59 29
+f 79 29 59
+f 29 79 39
+f 89 39 79
+f 39 89 17
+f 67 17 89
+f 17 67 18
+f 68 18 67
+f 18 68 40
+f 90 40 68
+f 40 90 30
+f 80 30 90
+f 30 80 10
+f 60 10 80
+f 10 60 2
+f 52 2 60
+f 2 52 36
+f 86 36 52
+f 36 86 48
+f 98 48 86
+f 48 98 44
+f 94 44 98
+f 44 94 26
+f 76 26 94
+f 26 76 22
+f 72 22 76
+f 22 72 14
+f 64 14 72
+f 14 64 6
+f 56 6 64
+f 6 56 34
+f 84 34 56
+f 34 84 7
+f 57 7 84
+f 7 57 15
+f 65 15 57
+f 15 65 23
+f 73 23 65
+f 23 73 27
+f 77 27 73
+f 27 77 45
+f 95 45 77
+f 45 95 49
+f 99 49 95
+f 49 99 37
+f 87 37 99
+f 37 87 3
+f 53 3 87
+f 3 53 11
+f 61 11 53
+f 11 61 31
+f 81 31 61
+f 31 81 41
+f 91 41 81
+f 41 91 19
+f 69 19 91
+f 19 69 20
+f 70 20 69
+f 20 70 42
+f 92 42 70
+f 42 92 32
+f 82 32 92
+f 32 82 12
+f 62 12 82
+f 12 62 4
+f 54 4 62
+f 4 54 38
+f 88 38 54
+f 38 88 50
+f 100 50 88
+f 50 100 46
+f 96 46 100
+f 46 96 28
+f 78 28 96
+f 28 78 24
+f 74 24 78
+f 24 74 16
+f 66 16 74
+f 16 66 8
+f 58 8 66
+f 8 58 33
+f 83 33 58
+f 13 21 5
+f 21 25 5
+f 5 25 33
+f 33 25 8
+f 25 43 8
+f 43 47 8
+f 47 35 8
+f 35 1 8
+f 1 9 8
+f 9 29 8
+f 29 39 8
+f 39 17 8
+f 17 18 8
+f 18 40 8
+f 40 30 8
+f 30 10 8
+f 10 2 8
+f 2 36 8
+f 36 48 8
+f 48 44 8
+f 44 26 8
+f 26 22 8
+f 22 14 8
+f 14 6 8
+f 6 34 8
+f 34 7 8
+f 8 7 16
+f 16 7 24
+f 7 15 24
+f 15 23 24
+f 24 23 28
+f 28 23 46
+f 46 23 50
+f 50 23 38
+f 38 23 4
+f 23 27 4
+f 27 45 4
+f 45 49 4
+f 49 37 4
+f 37 3 4
+f 4 3 12
+f 12 3 32
+f 32 3 42
+f 42 3 20
+f 20 3 19
+f 19 3 41
+f 41 3 31
+f 11 31 3
+f 66 74 58
+f 74 78 58
+f 58 78 83
+f 83 78 55
+f 78 96 55
+f 96 100 55
+f 100 88 55
+f 88 54 55
+f 54 62 55
+f 62 82 55
+f 82 92 55
+f 92 70 55
+f 70 69 55
+f 69 91 55
+f 91 81 55
+f 81 61 55
+f 61 53 55
+f 53 87 55
+f 87 99 55
+f 99 95 55
+f 95 77 55
+f 77 73 55
+f 73 65 55
+f 65 57 55
+f 57 84 55
+f 84 56 55
+f 55 56 63
+f 63 56 71
+f 56 64 71
+f 64 72 71
+f 71 72 75
+f 75 72 93
+f 93 72 97
+f 97 72 85
+f 85 72 51
+f 72 76 51
+f 76 94 51
+f 94 98 51
+f 98 86 51
+f 86 52 51
+f 51 52 59
+f 59 52 79
+f 79 52 89
+f 89 52 67
+f 67 52 68
+f 68 52 90
+f 90 52 80
+f 60 80 52

tutorials/incompressible/pimpleFoam/RAS/propeller/constant/triSurface/outerCylinder.obj

@@ -1,6 +1,8 @@
 # Wavefront OBJ file
 # Regions:
-#     0    ascii
+#     0    outerCylinderWall
+#     1    outerCylinderInlet
+#     2    outerCylinderOutlet
 #
 # points    : 100
 # triangles : 196
@@ -105,7 +107,7 @@ v 0.218691 -0.8 -0.205364
 v -0.218691 -0.8 -0.205364
 v -0.218691 -0.8 0.205364
 v 0.218691 -0.8 0.205364
-g ascii
+g outerCylinderWall
 f 33 83 1
 f 51 1 83
 f 1 51 39
@@ -206,6 +208,7 @@ f 42 92 4
 f 54 4 92
 f 4 54 33
 f 83 33 54
+g outerCylinderInlet
 f 17 21 39
 f 21 43 39
 f 43 47 39
@@ -254,6 +257,7 @@ f 27 15 11
 f 11 15 37
 f 37 15 31
 f 7 31 15
+g outerCylinderOutlet
 f 70 74 92
 f 74 96 92
 f 96 100 92

tutorials/incompressible/pimpleFoam/RAS/propeller/system/createBafflesDict

@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      createPatchDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalFacesOnly true;
+
+baffles
+{
+    rotating
+    {
+        type        faceZone;
+        zoneName    innerCylinder;
+
+        patches
+        {
+            master
+            {
+                name            AMI1;
+                type            cyclicAMI;
+                neighbourPatch  AMI2;
+            }
+
+            slave
+            {
+                name            AMI2;
+                type            cyclicAMI;
+                neighbourPatch  AMI1;
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //

tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict

@@ -1,78 +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      topoSetDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    boundaryFaces;
-        type    faceSet;
-        action  new;
-        source  patchToFace;
-        sourceInfo
-        {
-            name outerCylinder;
-        }
-    }
-
-    {
-        name    outletFaces;
-        type    faceSet;
-        action  new;
-        source  faceToFace;
-        sourceInfo
-        {
-            set boundaryFaces;
-        }
-    }
-
-    {
-        name    inletFaces;
-        type    faceSet;
-        action  new;
-        source  faceToFace;
-        sourceInfo
-        {
-            set boundaryFaces;
-        }
-    }
-
-    {
-        name    outletFaces;
-        type    faceSet;
-        action  subset;
-        source  normalToFace;
-        sourceInfo
-        {
-            normal  (0 -1 0);   // Vector
-            cos     0.3;        // Tolerance (max cos of angle)
-        }
-    }
-
-    {
-        name    inletFaces;
-        type    faceSet;
-        action  subset;
-        source  normalToFace;
-        sourceInfo
-        {
-            normal  (0 1 0);    // Vector
-            cos     0.3;        // Tolerance (max cos of angle)
-        }
-    }
-);
-
-// ************************************************************************* //

tutorials/incompressible/pimpleFoam/RAS/propeller/system/createPatchDict

@@ -1,78 +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      createPatchDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Do a synchronisation of coupled points after creation of any patches.
-// Note: this does not work with points that are on multiple coupled patches
-//       with transformations (i.e. cyclics).
-pointSync false;
-
-// Optional: Write cyclic matches into .obj format; defaults to false.
-writeCyclicMatch  false;
-
-// Patches to create.
-patches
-(
-    {
-        //- Master side patch
-        name            AMI1;
-        patchInfo
-        {
-            type            cyclicAMI;
-            matchTolerance  0.0001;
-            neighbourPatch  AMI2;
-            transform       noOrdering;
-        }
-        constructFrom patches;
-        patches (innerCylinderSmall);
-    }
-
-    {
-        //- Slave side patch
-        name            AMI2;
-        patchInfo
-        {
-            type            cyclicAMI;
-            matchTolerance  0.0001;
-            neighbourPatch  AMI1;
-            transform       noOrdering;
-        }
-        constructFrom patches;
-        patches (innerCylinderSmall_slave);
-    }
-
-
-    {
-        name inlet;
-        patchInfo
-        {
-            type            patch;
-        }
-        constructFrom set;
-        set inletFaces;
-    }
-    {
-        name outlet;
-        patchInfo
-        {
-            type            patch;
-        }
-        constructFrom set;
-        set outletFaces;
-    }
-);
-
-// ************************************************************************* //

tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict

@@ -34,21 +34,21 @@ geometry
         file        "innerCylinder.obj";
         regions
         {
-            ascii
+            innerCylinder
             {
                  name       innerCylinder;
             }
         }
     }
-    innerCylinderSmall
+    middleCylinder
     {
         type        triSurfaceMesh;
-        file        "innerCylinderSmall.obj";
+        file        "middleCylinder.obj";
         regions
         {
-            ascii
+            middleCylinder
             {
-                 name       innerCylinderSmall;
+                 name       middleCylinder;
             }
         }
     }
@@ -58,60 +58,36 @@ geometry
         file        "outerCylinder.obj";
         regions
         {
-            ascii
+            outerCylinderWall
             {
                  name       outerCylinder;
             }
+            outerCylinderInlet
+            {
+                 name       inlet;
+            }
+            outerCylinderOutlet
+            {
+                 name       outlet;
+            }
         }
     }
-    propellerTip
+    propeller
     {
         type        triSurfaceMesh;
-        file        "propellerTip.obj";
+        file        "propeller.obj";
         regions
         {
-            ascii
+            propellerStem
+            {
+                 name       propellerStem;
+            }
+            propellerTip
             {
                  name       propellerTip;
             }
         }
     }
-    propellerStem1
-    {
-        type        triSurfaceMesh;
-        file        "propellerStem1.obj";
-        regions
-        {
-            ascii
-            {
-                 name       propellerStem1;
-            }
-        }
-    }
-    propellerStem2
-    {
-        type        triSurfaceMesh;
-        file        "propellerStem2.obj";
-        regions
-        {
-            ascii
-            {
-                 name       propellerStem2;
-            }
-        }
-    }
-    propellerStem3
-    {
-        type        triSurfaceMesh;
-        file        "propellerStem3.obj";
-        regions
-        {
-            ascii
-            {
-                 name       propellerStem3;
-            }
-        }
-    }
 };
 
 
@@ -163,7 +139,7 @@ castellatedMeshControls
     features
     (
         {
-            file        "innerCylinderSmall.eMesh";
+            file        "innerCylinder.eMesh";
             level       4;
         }
         {
@@ -171,19 +147,7 @@ castellatedMeshControls
             level       0;
         }
         {
-            file        "propellerTip.eMesh";
-            level       4;
-        }
-//        {
-//            file        "propellerStem1.eMesh";
-//            level       4;
-//        }
-        {
-            file        "propellerStem2.eMesh";
-            level       4;
-        }
-        {
-            file        "propellerStem3.eMesh";
+            file        "propeller.eMesh";
             level       4;
         }
     );
@@ -201,34 +165,46 @@ castellatedMeshControls
 
     refinementSurfaces
     {
-        innerCylinderSmall
+        innerCylinder
         {
             level       (4 4);
-
-            faceType    boundary;
-            cellZone    innerCylinderSmall;
-            faceZone    innerCylinderSmall;
+            cellZone    innerCylinder;
+            faceZone    innerCylinder;
             cellZoneInside  inside;
         }
         outerCylinder
         {
             level       (0 0);
+            regions
+            {
+                inlet
+                {
+                    level       (0 0);
+                    patchInfo
+                    {
+                        type        patch;
+                    }
+                }
+                outlet
+                {
+                    level       (0 0);
+                    patchInfo
+                    {
+                        type        patch;
+                    }
+                }
+            }
         }
-        propellerTip
-        {
-            level       (4 5);
-        }
-        propellerStem1
-        {
-            level       (4 4);
-        }
-        propellerStem2
-        {
-            level       (4 4);
-        }
-        propellerStem3
+        propeller
         {
             level       (4 4);
+            regions
+            {
+                propellerTip
+                {
+                    level (4 5);
+                }
+            }
         }
     }
 
@@ -254,12 +230,12 @@ castellatedMeshControls
         innerCylinder
         {
             mode        inside;
-            levels      ((1E15 3));
+            levels      ((1E15 4));
         }
-        innerCylinderSmall
+        middleCylinder
         {
             mode        inside;
-            levels      ((1E15 4));
+            levels      ((1E15 3));
         }
     }
 

tutorials/incompressible/pimpleFoam/RAS/propeller/system/surfaceFeaturesDict

@@ -16,12 +16,9 @@ FoamFile
 
 surfaces
 (
-    "innerCylinderSmall.obj"
+    "innerCylinder.obj"
     "outerCylinder.obj"
-    "propellerStem1.obj"
-    "propellerStem2.obj"
-    "propellerStem3.obj"
-    "propellerTip.obj"
+    "propeller.obj"
 );
 
 // Identify a feature when angle between faces < includedAngle

tutorials/multiphase/interPhaseChangeFoam/propeller/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/propeller.obj.gz > /dev/null 2>&1
 
 cleanCase
 

tutorials/multiphase/interPhaseChangeFoam/propeller/Allmesh

@@ -5,21 +5,17 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Copy propeller surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
+cp $FOAM_TUTORIALS/resources/geometry/propeller.obj.gz constant/triSurface/
 
 runApplication blockMesh
 runApplication surfaceFeatures
 runApplication snappyHexMesh -overwrite
 
-# Generate face/cell sets and zones
-runApplication topoSet -dict system/createInletOutletSets.topoSetDict
-
 # Create the inlet/outlet and AMI patches
-runApplication createPatch -overwrite
+runApplication createBaffles -overwrite
+runApplication mergeOrSplitBaffles -split -overwrite
 
+# Renumbering
 runApplication renumberMesh -noFields -overwrite
 
-# Test by running moveDynamicMesh
-#runApplication moveDynamicMesh -checkAMI
-
 #------------------------------------------------------------------------------

tutorials/multiphase/interPhaseChangeFoam/propeller/constant/dynamicMeshDict

@@ -21,7 +21,7 @@ motionSolverLibs ( "libfvMotionSolvers.so" );
 
 motionSolver    solidBody;
 
-cellZone        innerCylinderSmall;
+cellZone        innerCylinder;
 
 solidBodyMotionFunction  rotatingMotion;
 

tutorials/multiphase/interPhaseChangeFoam/propeller/constant/triSurface/innerCylinder.obj

@@ -1,304 +1,364 @@
 # Wavefront OBJ file
 # Regions:
-#     0    ascii
+#     0    innerCylinder
 #
-# points    : 100
-# triangles : 196
+# points    : 120
+# triangles : 236
 #
-v 0.0857323 0.1 -0.135092
-v -0.0857323 0.1 -0.135092
-v -0.0857323 0.1 0.135092
-v 0.0857323 0.1 0.135092
-v 0.158738 0.1 -0.0200533
-v -0.158738 0.1 -0.0200533
-v -0.158738 0.1 0.0200533
-v 0.158738 0.1 0.0200533
-v 0.0681247 0.1 -0.144772
-v -0.0681247 0.1 -0.144772
-v -0.0681247 0.1 0.144772
-v 0.0681247 0.1 0.144772
-v 0.154973 0.1 -0.0397904
-v -0.154973 0.1 -0.0397904
-v -0.154973 0.1 0.0397904
-v 0.154973 0.1 0.0397904
-v 0.0100465 0.1 -0.159684
-v -0.0100465 0.1 -0.159684
-v -0.0100465 0.1 0.159684
-v 0.0100465 0.1 0.159684
-v 0.148764 0.1 -0.0588999
-v -0.148764 0.1 -0.0588999
-v -0.148764 0.1 0.0588999
-v 0.148764 0.1 0.0588999
-v 0.140209 0.1 -0.0770806
-v -0.140209 0.1 -0.0770806
-v -0.140209 0.1 0.0770806
-v 0.140209 0.1 0.0770806
-v 0.0494427 0.1 -0.152169
-v -0.0494427 0.1 -0.152169
-v -0.0494427 0.1 0.152169
-v 0.0494427 0.1 0.152169
-v 0.16 0.1 0
-v -0.16 0.1 6.56331e-11
-v 0.101988 0.1 -0.123282
-v -0.101988 0.1 -0.123282
-v -0.101988 0.1 0.123282
-v 0.101988 0.1 0.123282
-v 0.029981 0.1 -0.157166
-v -0.029981 0.1 -0.157166
-v -0.029981 0.1 0.157166
-v 0.029981 0.1 0.157166
-v 0.129443 0.1 -0.0940456
-v -0.129443 0.1 -0.0940456
-v -0.129443 0.1 0.0940456
-v 0.129443 0.1 0.0940456
-v 0.116635 0.1 -0.109528
-v -0.116635 0.1 -0.109528
-v -0.116635 0.1 0.109528
-v 0.116635 0.1 0.109528
-v 0.0857323 -0.6 -0.135092
-v -0.0857323 -0.6 -0.135092
-v -0.0857323 -0.6 0.135092
-v 0.0857323 -0.6 0.135092
-v 0.158738 -0.6 -0.0200533
-v -0.158738 -0.6 -0.0200533
-v -0.158738 -0.6 0.0200533
-v 0.158738 -0.6 0.0200533
-v 0.0681247 -0.6 -0.144772
-v -0.0681247 -0.6 -0.144772
-v -0.0681247 -0.6 0.144772
-v 0.0681247 -0.6 0.144772
-v 0.154973 -0.6 -0.0397904
-v -0.154973 -0.6 -0.0397904
-v -0.154973 -0.6 0.0397904
-v 0.154973 -0.6 0.0397904
-v 0.0100465 -0.6 -0.159684
-v -0.0100465 -0.6 -0.159684
-v -0.0100465 -0.6 0.159684
-v 0.0100465 -0.6 0.159684
-v 0.148764 -0.6 -0.0588999
-v -0.148764 -0.6 -0.0588999
-v -0.148764 -0.6 0.0588999
-v 0.148764 -0.6 0.0588999
-v 0.140209 -0.6 -0.0770806
-v -0.140209 -0.6 -0.0770806
-v -0.140209 -0.6 0.0770806
-v 0.140209 -0.6 0.0770806
-v 0.0494427 -0.6 -0.152169
-v -0.0494427 -0.6 -0.152169
-v -0.0494427 -0.6 0.152169
-v 0.0494427 -0.6 0.152169
-v 0.16 -0.6 0
-v -0.16 -0.6 6.56331e-11
-v 0.101988 -0.6 -0.123282
-v -0.101988 -0.6 -0.123282
-v -0.101988 -0.6 0.123282
-v 0.101988 -0.6 0.123282
-v 0.029981 -0.6 -0.157166
-v -0.029981 -0.6 -0.157166
-v -0.029981 -0.6 0.157166
-v 0.029981 -0.6 0.157166
-v 0.129443 -0.6 -0.0940456
-v -0.129443 -0.6 -0.0940456
-v -0.129443 -0.6 0.0940456
-v 0.129443 -0.6 0.0940456
-v 0.116635 -0.6 -0.109528
-v -0.116635 -0.6 -0.109528
-v -0.116635 -0.6 0.109528
-v 0.116635 -0.6 0.109528
-g ascii
-f 33 83 5
-f 55 5 83
-f 5 55 13
-f 63 13 55
-f 13 63 21
-f 71 21 63
-f 21 71 25
-f 75 25 71
-f 25 75 43
-f 93 43 75
-f 43 93 47
-f 97 47 93
-f 47 97 35
-f 85 35 97
-f 35 85 1
-f 51 1 85
-f 1 51 9
-f 59 9 51
-f 9 59 29
-f 79 29 59
-f 29 79 39
-f 89 39 79
-f 39 89 17
-f 67 17 89
-f 17 67 18
-f 68 18 67
-f 18 68 40
-f 90 40 68
-f 40 90 30
-f 80 30 90
-f 30 80 10
-f 60 10 80
-f 10 60 2
-f 52 2 60
-f 2 52 36
-f 86 36 52
-f 36 86 48
-f 98 48 86
-f 48 98 44
-f 94 44 98
-f 44 94 26
-f 76 26 94
-f 26 76 22
-f 72 22 76
-f 22 72 14
-f 64 14 72
-f 14 64 6
-f 56 6 64
-f 6 56 34
-f 84 34 56
-f 34 84 7
-f 57 7 84
-f 7 57 15
-f 65 15 57
-f 15 65 23
-f 73 23 65
-f 23 73 27
-f 77 27 73
-f 27 77 45
-f 95 45 77
-f 45 95 49
-f 99 49 95
-f 49 99 37
-f 87 37 99
-f 37 87 3
-f 53 3 87
-f 3 53 11
-f 61 11 53
-f 11 61 31
-f 81 31 61
-f 31 81 41
-f 91 41 81
-f 41 91 19
-f 69 19 91
-f 19 69 20
-f 70 20 69
-f 20 70 42
-f 92 42 70
-f 42 92 32
-f 82 32 92
-f 32 82 12
-f 62 12 82
-f 12 62 4
-f 54 4 62
-f 4 54 38
-f 88 38 54
-f 38 88 50
-f 100 50 88
-f 50 100 46
-f 96 46 100
-f 46 96 28
-f 78 28 96
-f 28 78 24
-f 74 24 78
-f 24 74 16
-f 66 16 74
-f 16 66 8
-f 58 8 66
-f 8 58 33
-f 83 33 58
-f 13 21 5
-f 21 25 5
-f 5 25 33
-f 33 25 8
-f 25 43 8
-f 43 47 8
-f 47 35 8
-f 35 1 8
-f 1 9 8
-f 9 29 8
-f 29 39 8
-f 39 17 8
-f 17 18 8
-f 18 40 8
-f 40 30 8
-f 30 10 8
-f 10 2 8
-f 2 36 8
-f 36 48 8
-f 48 44 8
-f 44 26 8
-f 26 22 8
-f 22 14 8
-f 14 6 8
-f 6 34 8
-f 34 7 8
-f 8 7 16
-f 16 7 24
-f 7 15 24
-f 15 23 24
-f 24 23 28
-f 28 23 46
-f 46 23 50
-f 50 23 38
-f 38 23 4
-f 23 27 4
-f 27 45 4
-f 45 49 4
-f 49 37 4
-f 37 3 4
-f 4 3 12
-f 12 3 32
-f 32 3 42
-f 42 3 20
-f 20 3 19
-f 19 3 41
-f 41 3 31
-f 11 31 3
-f 66 74 58
-f 74 78 58
-f 58 78 83
-f 83 78 55
-f 78 96 55
-f 96 100 55
-f 100 88 55
-f 88 54 55
-f 54 62 55
-f 62 82 55
-f 82 92 55
-f 92 70 55
-f 70 69 55
-f 69 91 55
-f 91 81 55
-f 81 61 55
-f 61 53 55
-f 53 87 55
-f 87 99 55
-f 99 95 55
-f 95 77 55
-f 77 73 55
-f 73 65 55
-f 65 57 55
-f 57 84 55
-f 84 56 55
-f 55 56 63
-f 63 56 71
-f 56 64 71
-f 64 72 71
-f 71 72 75
-f 75 72 93
-f 93 72 97
-f 97 72 85
-f 85 72 51
-f 72 76 51
-f 76 94 51
-f 94 98 51
-f 98 86 51
-f 86 52 51
-f 51 52 59
-f 59 52 79
-f 79 52 89
-f 89 52 67
-f 67 52 68
-f 68 52 90
-f 90 52 80
-f 60 80 52
+v 0.109625 0.06 -0.0488084
+v 0.0488084 0.06 -0.109625
+v -0.0488084 0.06 -0.109625
+v -0.109625 0.06 -0.0488084
+v -0.109625 0.06 0.0488084
+v -0.0488084 0.06 0.109625
+v 0.0488084 0.06 0.109625
+v 0.109625 0.06 0.0488084
+v 0.097082 0.06 -0.0705342
+v 0.0705342 0.06 -0.097082
+v -0.0705342 0.06 -0.097082
+v -0.097082 0.06 -0.0705342
+v -0.097082 0.06 0.0705342
+v -0.0705342 0.06 0.097082
+v 0.0705342 0.06 0.097082
+v 0.097082 0.06 0.0705342
+v 0.103923 0.06 -0.06
+v 0.06 0.06 -0.103923
+v -0.06 0.06 -0.103923
+v -0.103923 0.06 -0.06
+v -0.103923 0.06 0.06
+v -0.06 0.06 0.103923
+v 0.06 0.06 0.103923
+v 0.103923 0.06 0.06
+v 0.12 0.06 0
+v -2.46124e-11 0.06 -0.12
+v -0.12 0.06 4.92248e-11
+v 7.38372e-11 0.06 0.12
+v 0.0891774 0.06 -0.0802957
+v 0.0802957 0.06 -0.0891774
+v -0.0802957 0.06 -0.0891774
+v -0.0891774 0.06 -0.0802957
+v -0.0891774 0.06 0.0802957
+v -0.0802957 0.06 0.0891774
+v 0.0802957 0.06 0.0891774
+v 0.0891774 0.06 0.0802957
+v 0.114127 0.06 -0.037082
+v 0.037082 0.06 -0.114127
+v -0.037082 0.06 -0.114127
+v -0.114127 0.06 -0.037082
+v -0.114127 0.06 0.037082
+v -0.037082 0.06 0.114127
+v 0.037082 0.06 0.114127
+v 0.114127 0.06 0.037082
+v 0.117378 0.06 -0.0249494
+v 0.0249494 0.06 -0.117378
+v -0.0249494 0.06 -0.117378
+v -0.117378 0.06 -0.0249494
+v -0.117378 0.06 0.0249494
+v -0.0249494 0.06 0.117378
+v 0.0249494 0.06 0.117378
+v 0.117378 0.06 0.0249494
+v 0.119343 0.06 -0.0125434
+v 0.0125434 0.06 -0.119343
+v -0.0125434 0.06 -0.119343
+v -0.119343 0.06 -0.0125434
+v -0.119343 0.06 0.0125434
+v -0.0125434 0.06 0.119343
+v 0.0125434 0.06 0.119343
+v 0.119343 0.06 0.0125434
+v 0.109625 -0.08 -0.0488084
+v 0.0488084 -0.08 -0.109625
+v -0.0488084 -0.08 -0.109625
+v -0.109625 -0.08 -0.0488084
+v -0.109625 -0.08 0.0488084
+v -0.0488084 -0.08 0.109625
+v 0.0488084 -0.08 0.109625
+v 0.109625 -0.08 0.0488084
+v 0.097082 -0.08 -0.0705342
+v 0.0705342 -0.08 -0.097082
+v -0.0705342 -0.08 -0.097082
+v -0.097082 -0.08 -0.0705342
+v -0.097082 -0.08 0.0705342
+v -0.0705342 -0.08 0.097082
+v 0.0705342 -0.08 0.097082
+v 0.097082 -0.08 0.0705342
+v 0.103923 -0.08 -0.06
+v 0.06 -0.08 -0.103923
+v -0.06 -0.08 -0.103923
+v -0.103923 -0.08 -0.06
+v -0.103923 -0.08 0.06
+v -0.06 -0.08 0.103923
+v 0.06 -0.08 0.103923
+v 0.103923 -0.08 0.06
+v 0.12 -0.08 0
+v -2.46124e-11 -0.08 -0.12
+v -0.12 -0.08 4.92248e-11
+v 7.38372e-11 -0.08 0.12
+v 0.0891774 -0.08 -0.0802957
+v 0.0802957 -0.08 -0.0891774
+v -0.0802957 -0.08 -0.0891774
+v -0.0891774 -0.08 -0.0802957
+v -0.0891774 -0.08 0.0802957
+v -0.0802957 -0.08 0.0891774
+v 0.0802957 -0.08 0.0891774
+v 0.0891774 -0.08 0.0802957
+v 0.114127 -0.08 -0.037082
+v 0.037082 -0.08 -0.114127
+v -0.037082 -0.08 -0.114127
+v -0.114127 -0.08 -0.037082
+v -0.114127 -0.08 0.037082
+v -0.037082 -0.08 0.114127
+v 0.037082 -0.08 0.114127
+v 0.114127 -0.08 0.037082
+v 0.117378 -0.08 -0.0249494
+v 0.0249494 -0.08 -0.117378
+v -0.0249494 -0.08 -0.117378
+v -0.117378 -0.08 -0.0249494
+v -0.117378 -0.08 0.0249494
+v -0.0249494 -0.08 0.117378
+v 0.0249494 -0.08 0.117378
+v 0.117378 -0.08 0.0249494
+v 0.119343 -0.08 -0.0125434
+v 0.0125434 -0.08 -0.119343
+v -0.0125434 -0.08 -0.119343
+v -0.119343 -0.08 -0.0125434
+v -0.119343 -0.08 0.0125434
+v -0.0125434 -0.08 0.119343
+v 0.0125434 -0.08 0.119343
+v 0.119343 -0.08 0.0125434
+g innerCylinder
+f 25 85 53
+f 113 53 85
+f 53 113 45
+f 45 113 105
+f 45 105 37
+f 97 37 105
+f 37 97 1
+f 61 1 97
+f 1 61 17
+f 17 61 77
+f 17 77 9
+f 9 77 69
+f 9 69 29
+f 89 29 69
+f 29 89 30
+f 90 30 89
+f 30 90 10
+f 70 10 90
+f 10 70 18
+f 18 70 78
+f 18 78 2
+f 2 78 62
+f 2 62 38
+f 98 38 62
+f 38 98 46
+f 106 46 98
+f 46 106 54
+f 54 106 114
+f 54 114 26
+f 86 26 114
+f 26 86 55
+f 115 55 86
+f 55 115 47
+f 47 115 107
+f 47 107 39
+f 99 39 107
+f 39 99 3
+f 63 3 99
+f 3 63 19
+f 19 63 79
+f 19 79 11
+f 11 79 71
+f 11 71 31
+f 91 31 71
+f 31 91 32
+f 92 32 91
+f 32 92 12
+f 72 12 92
+f 12 72 20
+f 20 72 80
+f 20 80 4
+f 4 80 64
+f 4 64 40
+f 100 40 64
+f 40 100 48
+f 108 48 100
+f 48 108 56
+f 56 108 116
+f 56 116 27
+f 87 27 116
+f 27 87 57
+f 117 57 87
+f 57 117 49
+f 49 117 109
+f 49 109 41
+f 101 41 109
+f 41 101 5
+f 65 5 101
+f 5 65 21
+f 21 65 81
+f 21 81 13
+f 13 81 73
+f 13 73 33
+f 93 33 73
+f 33 93 34
+f 94 34 93
+f 34 94 14
+f 74 14 94
+f 14 74 22
+f 22 74 82
+f 22 82 6
+f 6 82 66
+f 6 66 42
+f 102 42 66
+f 42 102 50
+f 110 50 102
+f 50 110 58
+f 58 110 118
+f 58 118 28
+f 88 28 118
+f 28 88 59
+f 119 59 88
+f 59 119 51
+f 51 119 111
+f 51 111 43
+f 103 43 111
+f 43 103 7
+f 67 7 103
+f 7 67 23
+f 23 67 83
+f 23 83 15
+f 15 83 75
+f 15 75 35
+f 95 35 75
+f 35 95 36
+f 96 36 95
+f 36 96 16
+f 76 16 96
+f 16 76 24
+f 24 76 84
+f 24 84 8
+f 8 84 68
+f 8 68 44
+f 104 44 68
+f 44 104 52
+f 112 52 104
+f 52 112 60
+f 60 112 120
+f 60 120 25
+f 85 25 120
+f 45 37 53
+f 37 1 53
+f 53 1 25
+f 25 1 60
+f 1 17 60
+f 60 17 52
+f 52 17 44
+f 44 17 8
+f 8 17 24
+f 24 17 16
+f 16 17 36
+f 36 17 35
+f 35 17 15
+f 15 17 23
+f 23 17 7
+f 7 17 43
+f 43 17 51
+f 51 17 59
+f 59 17 28
+f 28 17 58
+f 58 17 50
+f 50 17 42
+f 42 17 6
+f 6 17 22
+f 22 17 14
+f 14 17 34
+f 17 9 34
+f 9 29 34
+f 34 29 33
+f 33 29 13
+f 13 29 21
+f 21 29 5
+f 5 29 41
+f 41 29 49
+f 49 29 57
+f 57 29 27
+f 27 29 56
+f 56 29 48
+f 48 29 40
+f 40 29 4
+f 4 29 20
+f 20 29 12
+f 12 29 32
+f 32 29 31
+f 31 29 11
+f 29 30 11
+f 30 10 11
+f 11 10 19
+f 19 10 3
+f 3 10 39
+f 39 10 47
+f 47 10 55
+f 55 10 26
+f 26 10 54
+f 54 10 46
+f 46 10 38
+f 38 10 2
+f 18 2 10
+f 112 104 120
+f 104 68 120
+f 120 68 85
+f 85 68 113
+f 68 84 113
+f 113 84 105
+f 105 84 97
+f 97 84 61
+f 61 84 77
+f 77 84 69
+f 69 84 89
+f 89 84 90
+f 90 84 70
+f 70 84 78
+f 78 84 62
+f 62 84 98
+f 98 84 106
+f 106 84 114
+f 114 84 86
+f 86 84 115
+f 115 84 107
+f 107 84 99
+f 99 84 63
+f 63 84 79
+f 79 84 71
+f 71 84 91
+f 84 76 91
+f 76 96 91
+f 91 96 92
+f 92 96 72
+f 72 96 80
+f 80 96 64
+f 64 96 100
+f 100 96 108
+f 108 96 116
+f 116 96 87
+f 87 96 117
+f 117 96 109
+f 109 96 101
+f 101 96 65
+f 65 96 81
+f 81 96 73
+f 73 96 93
+f 93 96 94
+f 94 96 74
+f 96 95 74
+f 95 75 74
+f 74 75 82
+f 82 75 66
+f 66 75 102
+f 102 75 110
+f 110 75 118
+f 118 75 88
+f 88 75 119
+f 119 75 111
+f 111 75 103
+f 103 75 67
+f 83 67 75

tutorials/multiphase/interPhaseChangeFoam/propeller/constant/triSurface/innerCylinderSmall.obj

@@ -1,364 +0,0 @@
-# Wavefront OBJ file
-# Regions:
-#     0    ascii
-#
-# points    : 120
-# triangles : 236
-#
-v 0.109625 0.06 -0.0488084
-v 0.0488084 0.06 -0.109625
-v -0.0488084 0.06 -0.109625
-v -0.109625 0.06 -0.0488084
-v -0.109625 0.06 0.0488084
-v -0.0488084 0.06 0.109625
-v 0.0488084 0.06 0.109625
-v 0.109625 0.06 0.0488084
-v 0.097082 0.06 -0.0705342
-v 0.0705342 0.06 -0.097082
-v -0.0705342 0.06 -0.097082
-v -0.097082 0.06 -0.0705342
-v -0.097082 0.06 0.0705342
-v -0.0705342 0.06 0.097082
-v 0.0705342 0.06 0.097082
-v 0.097082 0.06 0.0705342
-v 0.103923 0.06 -0.06
-v 0.06 0.06 -0.103923
-v -0.06 0.06 -0.103923
-v -0.103923 0.06 -0.06
-v -0.103923 0.06 0.06
-v -0.06 0.06 0.103923
-v 0.06 0.06 0.103923
-v 0.103923 0.06 0.06
-v 0.12 0.06 0
-v -2.46124e-11 0.06 -0.12
-v -0.12 0.06 4.92248e-11
-v 7.38372e-11 0.06 0.12
-v 0.0891774 0.06 -0.0802957
-v 0.0802957 0.06 -0.0891774
-v -0.0802957 0.06 -0.0891774
-v -0.0891774 0.06 -0.0802957
-v -0.0891774 0.06 0.0802957
-v -0.0802957 0.06 0.0891774
-v 0.0802957 0.06 0.0891774
-v 0.0891774 0.06 0.0802957
-v 0.114127 0.06 -0.037082
-v 0.037082 0.06 -0.114127
-v -0.037082 0.06 -0.114127
-v -0.114127 0.06 -0.037082
-v -0.114127 0.06 0.037082
-v -0.037082 0.06 0.114127
-v 0.037082 0.06 0.114127
-v 0.114127 0.06 0.037082
-v 0.117378 0.06 -0.0249494
-v 0.0249494 0.06 -0.117378
-v -0.0249494 0.06 -0.117378
-v -0.117378 0.06 -0.0249494
-v -0.117378 0.06 0.0249494
-v -0.0249494 0.06 0.117378
-v 0.0249494 0.06 0.117378
-v 0.117378 0.06 0.0249494
-v 0.119343 0.06 -0.0125434
-v 0.0125434 0.06 -0.119343
-v -0.0125434 0.06 -0.119343
-v -0.119343 0.06 -0.0125434
-v -0.119343 0.06 0.0125434
-v -0.0125434 0.06 0.119343
-v 0.0125434 0.06 0.119343
-v 0.119343 0.06 0.0125434
-v 0.109625 -0.08 -0.0488084
-v 0.0488084 -0.08 -0.109625
-v -0.0488084 -0.08 -0.109625
-v -0.109625 -0.08 -0.0488084
-v -0.109625 -0.08 0.0488084
-v -0.0488084 -0.08 0.109625
-v 0.0488084 -0.08 0.109625
-v 0.109625 -0.08 0.0488084
-v 0.097082 -0.08 -0.0705342
-v 0.0705342 -0.08 -0.097082
-v -0.0705342 -0.08 -0.097082
-v -0.097082 -0.08 -0.0705342
-v -0.097082 -0.08 0.0705342
-v -0.0705342 -0.08 0.097082
-v 0.0705342 -0.08 0.097082
-v 0.097082 -0.08 0.0705342
-v 0.103923 -0.08 -0.06
-v 0.06 -0.08 -0.103923
-v -0.06 -0.08 -0.103923
-v -0.103923 -0.08 -0.06
-v -0.103923 -0.08 0.06
-v -0.06 -0.08 0.103923
-v 0.06 -0.08 0.103923
-v 0.103923 -0.08 0.06
-v 0.12 -0.08 0
-v -2.46124e-11 -0.08 -0.12
-v -0.12 -0.08 4.92248e-11
-v 7.38372e-11 -0.08 0.12
-v 0.0891774 -0.08 -0.0802957
-v 0.0802957 -0.08 -0.0891774
-v -0.0802957 -0.08 -0.0891774
-v -0.0891774 -0.08 -0.0802957
-v -0.0891774 -0.08 0.0802957
-v -0.0802957 -0.08 0.0891774
-v 0.0802957 -0.08 0.0891774
-v 0.0891774 -0.08 0.0802957
-v 0.114127 -0.08 -0.037082
-v 0.037082 -0.08 -0.114127
-v -0.037082 -0.08 -0.114127
-v -0.114127 -0.08 -0.037082
-v -0.114127 -0.08 0.037082
-v -0.037082 -0.08 0.114127
-v 0.037082 -0.08 0.114127
-v 0.114127 -0.08 0.037082
-v 0.117378 -0.08 -0.0249494
-v 0.0249494 -0.08 -0.117378
-v -0.0249494 -0.08 -0.117378
-v -0.117378 -0.08 -0.0249494
-v -0.117378 -0.08 0.0249494
-v -0.0249494 -0.08 0.117378
-v 0.0249494 -0.08 0.117378
-v 0.117378 -0.08 0.0249494
-v 0.119343 -0.08 -0.0125434
-v 0.0125434 -0.08 -0.119343
-v -0.0125434 -0.08 -0.119343
-v -0.119343 -0.08 -0.0125434
-v -0.119343 -0.08 0.0125434
-v -0.0125434 -0.08 0.119343
-v 0.0125434 -0.08 0.119343
-v 0.119343 -0.08 0.0125434
-g ascii
-f 25 85 53
-f 113 53 85
-f 53 113 45
-f 45 113 105
-f 45 105 37
-f 97 37 105
-f 37 97 1
-f 61 1 97
-f 1 61 17
-f 17 61 77
-f 17 77 9
-f 9 77 69
-f 9 69 29
-f 89 29 69
-f 29 89 30
-f 90 30 89
-f 30 90 10
-f 70 10 90
-f 10 70 18
-f 18 70 78
-f 18 78 2
-f 2 78 62
-f 2 62 38
-f 98 38 62
-f 38 98 46
-f 106 46 98
-f 46 106 54
-f 54 106 114
-f 54 114 26
-f 86 26 114
-f 26 86 55
-f 115 55 86
-f 55 115 47
-f 47 115 107
-f 47 107 39
-f 99 39 107
-f 39 99 3
-f 63 3 99
-f 3 63 19
-f 19 63 79
-f 19 79 11
-f 11 79 71
-f 11 71 31
-f 91 31 71
-f 31 91 32
-f 92 32 91
-f 32 92 12
-f 72 12 92
-f 12 72 20
-f 20 72 80
-f 20 80 4
-f 4 80 64
-f 4 64 40
-f 100 40 64
-f 40 100 48
-f 108 48 100
-f 48 108 56
-f 56 108 116
-f 56 116 27
-f 87 27 116
-f 27 87 57
-f 117 57 87
-f 57 117 49
-f 49 117 109
-f 49 109 41
-f 101 41 109
-f 41 101 5
-f 65 5 101
-f 5 65 21
-f 21 65 81
-f 21 81 13
-f 13 81 73
-f 13 73 33
-f 93 33 73
-f 33 93 34
-f 94 34 93
-f 34 94 14
-f 74 14 94
-f 14 74 22
-f 22 74 82
-f 22 82 6
-f 6 82 66
-f 6 66 42
-f 102 42 66
-f 42 102 50
-f 110 50 102
-f 50 110 58
-f 58 110 118
-f 58 118 28
-f 88 28 118
-f 28 88 59
-f 119 59 88
-f 59 119 51
-f 51 119 111
-f 51 111 43
-f 103 43 111
-f 43 103 7
-f 67 7 103
-f 7 67 23
-f 23 67 83
-f 23 83 15
-f 15 83 75
-f 15 75 35
-f 95 35 75
-f 35 95 36
-f 96 36 95
-f 36 96 16
-f 76 16 96
-f 16 76 24
-f 24 76 84
-f 24 84 8
-f 8 84 68
-f 8 68 44
-f 104 44 68
-f 44 104 52
-f 112 52 104
-f 52 112 60
-f 60 112 120
-f 60 120 25
-f 85 25 120
-f 45 37 53
-f 37 1 53
-f 53 1 25
-f 25 1 60
-f 1 17 60
-f 60 17 52
-f 52 17 44
-f 44 17 8
-f 8 17 24
-f 24 17 16
-f 16 17 36
-f 36 17 35
-f 35 17 15
-f 15 17 23
-f 23 17 7
-f 7 17 43
-f 43 17 51
-f 51 17 59
-f 59 17 28
-f 28 17 58
-f 58 17 50
-f 50 17 42
-f 42 17 6
-f 6 17 22
-f 22 17 14
-f 14 17 34
-f 17 9 34
-f 9 29 34
-f 34 29 33
-f 33 29 13
-f 13 29 21
-f 21 29 5
-f 5 29 41
-f 41 29 49
-f 49 29 57
-f 57 29 27
-f 27 29 56
-f 56 29 48
-f 48 29 40
-f 40 29 4
-f 4 29 20
-f 20 29 12
-f 12 29 32
-f 32 29 31
-f 31 29 11
-f 29 30 11
-f 30 10 11
-f 11 10 19
-f 19 10 3
-f 3 10 39
-f 39 10 47
-f 47 10 55
-f 55 10 26
-f 26 10 54
-f 54 10 46
-f 46 10 38
-f 38 10 2
-f 18 2 10
-f 112 104 120
-f 104 68 120
-f 120 68 85
-f 85 68 113
-f 68 84 113
-f 113 84 105
-f 105 84 97
-f 97 84 61
-f 61 84 77
-f 77 84 69
-f 69 84 89
-f 89 84 90
-f 90 84 70
-f 70 84 78
-f 78 84 62
-f 62 84 98
-f 98 84 106
-f 106 84 114
-f 114 84 86
-f 86 84 115
-f 115 84 107
-f 107 84 99
-f 99 84 63
-f 63 84 79
-f 79 84 71
-f 71 84 91
-f 84 76 91
-f 76 96 91
-f 91 96 92
-f 92 96 72
-f 72 96 80
-f 80 96 64
-f 64 96 100
-f 100 96 108
-f 108 96 116
-f 116 96 87
-f 87 96 117
-f 117 96 109
-f 109 96 101
-f 101 96 65
-f 65 96 81
-f 81 96 73
-f 73 96 93
-f 93 96 94
-f 94 96 74
-f 96 95 74
-f 95 75 74
-f 74 75 82
-f 82 75 66
-f 66 75 102
-f 102 75 110
-f 110 75 118
-f 118 75 88
-f 88 75 119
-f 119 75 111
-f 111 75 103
-f 103 75 67
-f 83 67 75

tutorials/multiphase/interPhaseChangeFoam/propeller/constant/triSurface/middleCylinder.obj

@@ -0,0 +1,304 @@
+# Wavefront OBJ file
+# Regions:
+#     0    middleCylinder
+#
+# points    : 100
+# triangles : 196
+#
+v 0.0857323 0.1 -0.135092
+v -0.0857323 0.1 -0.135092
+v -0.0857323 0.1 0.135092
+v 0.0857323 0.1 0.135092
+v 0.158738 0.1 -0.0200533
+v -0.158738 0.1 -0.0200533
+v -0.158738 0.1 0.0200533
+v 0.158738 0.1 0.0200533
+v 0.0681247 0.1 -0.144772
+v -0.0681247 0.1 -0.144772
+v -0.0681247 0.1 0.144772
+v 0.0681247 0.1 0.144772
+v 0.154973 0.1 -0.0397904
+v -0.154973 0.1 -0.0397904
+v -0.154973 0.1 0.0397904
+v 0.154973 0.1 0.0397904
+v 0.0100465 0.1 -0.159684
+v -0.0100465 0.1 -0.159684
+v -0.0100465 0.1 0.159684
+v 0.0100465 0.1 0.159684
+v 0.148764 0.1 -0.0588999
+v -0.148764 0.1 -0.0588999
+v -0.148764 0.1 0.0588999
+v 0.148764 0.1 0.0588999
+v 0.140209 0.1 -0.0770806
+v -0.140209 0.1 -0.0770806
+v -0.140209 0.1 0.0770806
+v 0.140209 0.1 0.0770806
+v 0.0494427 0.1 -0.152169
+v -0.0494427 0.1 -0.152169
+v -0.0494427 0.1 0.152169
+v 0.0494427 0.1 0.152169
+v 0.16 0.1 0
+v -0.16 0.1 6.56331e-11
+v 0.101988 0.1 -0.123282
+v -0.101988 0.1 -0.123282
+v -0.101988 0.1 0.123282
+v 0.101988 0.1 0.123282
+v 0.029981 0.1 -0.157166
+v -0.029981 0.1 -0.157166
+v -0.029981 0.1 0.157166
+v 0.029981 0.1 0.157166
+v 0.129443 0.1 -0.0940456
+v -0.129443 0.1 -0.0940456
+v -0.129443 0.1 0.0940456
+v 0.129443 0.1 0.0940456
+v 0.116635 0.1 -0.109528
+v -0.116635 0.1 -0.109528
+v -0.116635 0.1 0.109528
+v 0.116635 0.1 0.109528
+v 0.0857323 -0.6 -0.135092
+v -0.0857323 -0.6 -0.135092
+v -0.0857323 -0.6 0.135092
+v 0.0857323 -0.6 0.135092
+v 0.158738 -0.6 -0.0200533
+v -0.158738 -0.6 -0.0200533
+v -0.158738 -0.6 0.0200533
+v 0.158738 -0.6 0.0200533
+v 0.0681247 -0.6 -0.144772
+v -0.0681247 -0.6 -0.144772
+v -0.0681247 -0.6 0.144772
+v 0.0681247 -0.6 0.144772
+v 0.154973 -0.6 -0.0397904
+v -0.154973 -0.6 -0.0397904
+v -0.154973 -0.6 0.0397904
+v 0.154973 -0.6 0.0397904
+v 0.0100465 -0.6 -0.159684
+v -0.0100465 -0.6 -0.159684
+v -0.0100465 -0.6 0.159684
+v 0.0100465 -0.6 0.159684
+v 0.148764 -0.6 -0.0588999
+v -0.148764 -0.6 -0.0588999
+v -0.148764 -0.6 0.0588999
+v 0.148764 -0.6 0.0588999
+v 0.140209 -0.6 -0.0770806
+v -0.140209 -0.6 -0.0770806
+v -0.140209 -0.6 0.0770806
+v 0.140209 -0.6 0.0770806
+v 0.0494427 -0.6 -0.152169
+v -0.0494427 -0.6 -0.152169
+v -0.0494427 -0.6 0.152169
+v 0.0494427 -0.6 0.152169
+v 0.16 -0.6 0
+v -0.16 -0.6 6.56331e-11
+v 0.101988 -0.6 -0.123282
+v -0.101988 -0.6 -0.123282
+v -0.101988 -0.6 0.123282
+v 0.101988 -0.6 0.123282
+v 0.029981 -0.6 -0.157166
+v -0.029981 -0.6 -0.157166
+v -0.029981 -0.6 0.157166
+v 0.029981 -0.6 0.157166
+v 0.129443 -0.6 -0.0940456
+v -0.129443 -0.6 -0.0940456
+v -0.129443 -0.6 0.0940456
+v 0.129443 -0.6 0.0940456
+v 0.116635 -0.6 -0.109528
+v -0.116635 -0.6 -0.109528
+v -0.116635 -0.6 0.109528
+v 0.116635 -0.6 0.109528
+g middleCylinder
+f 33 83 5
+f 55 5 83
+f 5 55 13
+f 63 13 55
+f 13 63 21
+f 71 21 63
+f 21 71 25
+f 75 25 71
+f 25 75 43
+f 93 43 75
+f 43 93 47
+f 97 47 93
+f 47 97 35
+f 85 35 97
+f 35 85 1
+f 51 1 85
+f 1 51 9
+f 59 9 51
+f 9 59 29
+f 79 29 59
+f 29 79 39
+f 89 39 79
+f 39 89 17
+f 67 17 89
+f 17 67 18
+f 68 18 67
+f 18 68 40
+f 90 40 68
+f 40 90 30
+f 80 30 90
+f 30 80 10
+f 60 10 80
+f 10 60 2
+f 52 2 60
+f 2 52 36
+f 86 36 52
+f 36 86 48
+f 98 48 86
+f 48 98 44
+f 94 44 98
+f 44 94 26
+f 76 26 94
+f 26 76 22
+f 72 22 76
+f 22 72 14
+f 64 14 72
+f 14 64 6
+f 56 6 64
+f 6 56 34
+f 84 34 56
+f 34 84 7
+f 57 7 84
+f 7 57 15
+f 65 15 57
+f 15 65 23
+f 73 23 65
+f 23 73 27
+f 77 27 73
+f 27 77 45
+f 95 45 77
+f 45 95 49
+f 99 49 95
+f 49 99 37
+f 87 37 99
+f 37 87 3
+f 53 3 87
+f 3 53 11
+f 61 11 53
+f 11 61 31
+f 81 31 61
+f 31 81 41
+f 91 41 81
+f 41 91 19
+f 69 19 91
+f 19 69 20
+f 70 20 69
+f 20 70 42
+f 92 42 70
+f 42 92 32
+f 82 32 92
+f 32 82 12
+f 62 12 82
+f 12 62 4
+f 54 4 62
+f 4 54 38
+f 88 38 54
+f 38 88 50
+f 100 50 88
+f 50 100 46
+f 96 46 100
+f 46 96 28
+f 78 28 96
+f 28 78 24
+f 74 24 78
+f 24 74 16
+f 66 16 74
+f 16 66 8
+f 58 8 66
+f 8 58 33
+f 83 33 58
+f 13 21 5
+f 21 25 5
+f 5 25 33
+f 33 25 8
+f 25 43 8
+f 43 47 8
+f 47 35 8
+f 35 1 8
+f 1 9 8
+f 9 29 8
+f 29 39 8
+f 39 17 8
+f 17 18 8
+f 18 40 8
+f 40 30 8
+f 30 10 8
+f 10 2 8
+f 2 36 8
+f 36 48 8
+f 48 44 8
+f 44 26 8
+f 26 22 8
+f 22 14 8
+f 14 6 8
+f 6 34 8
+f 34 7 8
+f 8 7 16
+f 16 7 24
+f 7 15 24
+f 15 23 24
+f 24 23 28
+f 28 23 46
+f 46 23 50
+f 50 23 38
+f 38 23 4
+f 23 27 4
+f 27 45 4
+f 45 49 4
+f 49 37 4
+f 37 3 4
+f 4 3 12
+f 12 3 32
+f 32 3 42
+f 42 3 20
+f 20 3 19
+f 19 3 41
+f 41 3 31
+f 11 31 3
+f 66 74 58
+f 74 78 58
+f 58 78 83
+f 83 78 55
+f 78 96 55
+f 96 100 55
+f 100 88 55
+f 88 54 55
+f 54 62 55
+f 62 82 55
+f 82 92 55
+f 92 70 55
+f 70 69 55
+f 69 91 55
+f 91 81 55
+f 81 61 55
+f 61 53 55
+f 53 87 55
+f 87 99 55
+f 99 95 55
+f 95 77 55
+f 77 73 55
+f 73 65 55
+f 65 57 55
+f 57 84 55
+f 84 56 55
+f 55 56 63
+f 63 56 71
+f 56 64 71
+f 64 72 71
+f 71 72 75
+f 75 72 93
+f 93 72 97
+f 97 72 85
+f 85 72 51
+f 72 76 51
+f 76 94 51
+f 94 98 51
+f 98 86 51
+f 86 52 51
+f 51 52 59
+f 59 52 79
+f 79 52 89
+f 89 52 67
+f 67 52 68
+f 68 52 90
+f 90 52 80
+f 60 80 52

tutorials/multiphase/interPhaseChangeFoam/propeller/constant/triSurface/outerCylinder.obj

@@ -1,6 +1,8 @@
 # Wavefront OBJ file
 # Regions:
-#     0    ascii
+#     0    outerCylinderWall
+#     1    outerCylinderInlet
+#     2    outerCylinderOutlet
 #
 # points    : 100
 # triangles : 196
@@ -105,7 +107,7 @@ v 0.218691 -0.8 -0.205364
 v -0.218691 -0.8 -0.205364
 v -0.218691 -0.8 0.205364
 v 0.218691 -0.8 0.205364
-g ascii
+g outerCylinderWall
 f 33 83 1
 f 51 1 83
 f 1 51 39
@@ -206,6 +208,7 @@ f 42 92 4
 f 54 4 92
 f 4 54 33
 f 83 33 54
+g outerCylinderInlet
 f 17 21 39
 f 21 43 39
 f 43 47 39
@@ -254,6 +257,7 @@ f 27 15 11
 f 11 15 37
 f 37 15 31
 f 7 31 15
+g outerCylinderOutlet
 f 70 74 92
 f 74 96 92
 f 96 100 92

tutorials/multiphase/interPhaseChangeFoam/propeller/system/createBafflesDict

@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      createPatchDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalFacesOnly true;
+
+baffles
+{
+    rotating
+    {
+        type        faceZone;
+        zoneName    innerCylinder;
+
+        patches
+        {
+            master
+            {
+                name            AMI1;
+                type            cyclicAMI;
+                neighbourPatch  AMI2;
+            }
+
+            slave
+            {
+                name            AMI2;
+                type            cyclicAMI;
+                neighbourPatch  AMI1;
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/interPhaseChangeFoam/propeller/system/createInletOutletSets.topoSetDict

@@ -1,78 +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      topoSetDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    boundaryFaces;
-        type    faceSet;
-        action  new;
-        source  patchToFace;
-        sourceInfo
-        {
-            name outerCylinder;
-        }
-    }
-
-    {
-        name    outletFaces;
-        type    faceSet;
-        action  new;
-        source  faceToFace;
-        sourceInfo
-        {
-            set boundaryFaces;
-        }
-    }
-
-    {
-        name    inletFaces;
-        type    faceSet;
-        action  new;
-        source  faceToFace;
-        sourceInfo
-        {
-            set boundaryFaces;
-        }
-    }
-
-    {
-        name    outletFaces;
-        type    faceSet;
-        action  subset;
-        source  normalToFace;
-        sourceInfo
-        {
-            normal  (0 -1 0);   // Vector
-            cos     0.3;        // Tolerance (max cos of angle)
-        }
-    }
-
-    {
-        name    inletFaces;
-        type    faceSet;
-        action  subset;
-        source  normalToFace;
-        sourceInfo
-        {
-            normal  (0 1 0);    // Vector
-            cos     0.3;        // Tolerance (max cos of angle)
-        }
-    }
-);
-
-// ************************************************************************* //

tutorials/multiphase/interPhaseChangeFoam/propeller/system/createPatchDict

@@ -1,78 +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      createPatchDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Do a synchronisation of coupled points after creation of any patches.
-// Note: this does not work with points that are on multiple coupled patches
-//       with transformations (i.e. cyclics).
-pointSync false;
-
-// Optional: Write cyclic matches into .obj format; defaults to false.
-writeCyclicMatch  false;
-
-// Patches to create.
-patches
-(
-    {
-        //- Master side patch
-        name            AMI1;
-        patchInfo
-        {
-            type            cyclicAMI;
-            matchTolerance  0.0001;
-            neighbourPatch  AMI2;
-            transform       noOrdering;
-        }
-        constructFrom patches;
-        patches (innerCylinderSmall);
-    }
-
-    {
-        //- Slave side patch
-        name            AMI2;
-        patchInfo
-        {
-            type            cyclicAMI;
-            matchTolerance  0.0001;
-            neighbourPatch  AMI1;
-            transform       noOrdering;
-        }
-        constructFrom patches;
-        patches (innerCylinderSmall_slave);
-    }
-
-
-    {
-        name inlet;
-        patchInfo
-        {
-            type            patch;
-        }
-        constructFrom set;
-        set inletFaces;
-    }
-    {
-        name outlet;
-        patchInfo
-        {
-            type            patch;
-        }
-        constructFrom set;
-        set outletFaces;
-    }
-);
-
-// ************************************************************************* //

tutorials/multiphase/interPhaseChangeFoam/propeller/system/snappyHexMeshDict

@@ -34,21 +34,21 @@ geometry
         file        "innerCylinder.obj";
         regions
         {
-            ascii
+            innerCylinder
             {
                  name       innerCylinder;
             }
         }
     }
-    innerCylinderSmall
+    middleCylinder
     {
         type        triSurfaceMesh;
-        file        "innerCylinderSmall.obj";
+        file        "middleCylinder.obj";
         regions
         {
-            ascii
+            middleCylinder
             {
-                 name       innerCylinderSmall;
+                 name       middleCylinder;
             }
         }
     }
@@ -58,62 +58,40 @@ geometry
         file        "outerCylinder.obj";
         regions
         {
-            ascii
+            outerCylinderWall
             {
                  name       outerCylinder;
             }
+            outerCylinderInlet
+            {
+                 name       inlet;
+            }
+            outerCylinderOutlet
+            {
+                 name       outlet;
+            }
         }
     }
-    propellerTip
+    propeller
     {
         type        triSurfaceMesh;
-        file        "propellerTip.obj";
+        file        "propeller.obj";
         regions
         {
-            ascii
+            propellerStem
+            {
+                 name       propellerStem;
+            }
+            propellerTip
             {
                  name       propellerTip;
             }
         }
     }
-    propellerStem1
-    {
-        type        triSurfaceMesh;
-        file        "propellerStem1.obj";
-        regions
-        {
-            ascii
-            {
-                 name       propellerStem1;
-            }
-        }
-    }
-    propellerStem2
-    {
-        type        triSurfaceMesh;
-        file        "propellerStem2.obj";
-        regions
-        {
-            ascii
-            {
-                 name       propellerStem2;
-            }
-        }
-    }
-    propellerStem3
-    {
-        type        triSurfaceMesh;
-        file        "propellerStem3.obj";
-        regions
-        {
-            ascii
-            {
-                 name       propellerStem3;
-            }
-        }
-    }
 };
 
+
+
 // Settings for the castellatedMesh generation.
 castellatedMeshControls
 {
@@ -161,7 +139,7 @@ castellatedMeshControls
     features
     (
         {
-            file        "innerCylinderSmall.eMesh";
+            file        "innerCylinder.eMesh";
             level       4;
         }
         {
@@ -169,19 +147,7 @@ castellatedMeshControls
             level       0;
         }
         {
-            file        "propellerTip.eMesh";
-            level       4;
-        }
-//        {
-//            file        "propellerStem1.eMesh";
-//            level       4;
-//        }
-        {
-            file        "propellerStem2.eMesh";
-            level       4;
-        }
-        {
-            file        "propellerStem3.eMesh";
+            file        "propeller.eMesh";
             level       4;
         }
     );
@@ -199,34 +165,46 @@ castellatedMeshControls
 
     refinementSurfaces
     {
-        innerCylinderSmall
+        innerCylinder
         {
             level       (4 4);
-
-            faceType    boundary;
-            cellZone    innerCylinderSmall;
-            faceZone    innerCylinderSmall;
+            cellZone    innerCylinder;
+            faceZone    innerCylinder;
             cellZoneInside  inside;
         }
         outerCylinder
         {
             level       (0 0);
+            regions
+            {
+                inlet
+                {
+                    level       (0 0);
+                    patchInfo
+                    {
+                        type        patch;
+                    }
+                }
+                outlet
+                {
+                    level       (0 0);
+                    patchInfo
+                    {
+                        type        patch;
+                    }
+                }
+            }
         }
-        propellerTip
-        {
-            level       (4 5);
-        }
-        propellerStem1
-        {
-            level       (4 4);
-        }
-        propellerStem2
-        {
-            level       (4 4);
-        }
-        propellerStem3
+        propeller
         {
             level       (4 4);
+            regions
+            {
+                propellerTip
+                {
+                    level (4 5);
+                }
+            }
         }
     }
 
@@ -252,12 +230,12 @@ castellatedMeshControls
         innerCylinder
         {
             mode        inside;
-            levels      ((1E15 3));
+            levels      ((1E15 4));
         }
-        innerCylinderSmall
+        middleCylinder
         {
             mode        inside;
-            levels      ((1E15 4));
+            levels      ((1E15 3));
         }
     }
 

tutorials/multiphase/interPhaseChangeFoam/propeller/system/surfaceFeaturesDict

@@ -16,12 +16,9 @@ FoamFile
 
 surfaces
 (
-    "innerCylinderSmall.obj"
+    "innerCylinder.obj"
     "outerCylinder.obj"
-    "propellerStem1.obj"
-    "propellerStem2.obj"
-    "propellerStem3.obj"
-    "propellerTip.obj"
+    "propeller.obj"
 );
 
 // Identify a feature when angle between faces < includedAngle