Commit a41584ff authored by Andrew Heather's avatar Andrew Heather
Browse files

Merge branch 'tut-multiphase-review.kbc' into 'develop'

TUT: clean up multiphase tutorials

See merge request !347
parents 647e1615 01514e4d
......@@ -31,7 +31,7 @@ writeControl adjustable;
writeInterval 2e-05;
cycleWrite 0;
purgeWrite 0;
writeFormat ascii;
......
......@@ -31,7 +31,7 @@ writeControl adjustable;
writeInterval 0.001;
cycleWrite 0;
purgeWrite 0;
writeFormat ascii;
......
......@@ -4,7 +4,8 @@ cd "${0%/*}" || exit # Run from this directory
#------------------------------------------------------------------------------
cleanCase0
rm -rf constant/extendedFeatureEdgeMesh
rm constant/triSurface/simpleCar.eMesh
rm -f constant/triSurface/simpleCar.eMesh
#------------------------------------------------------------------------------
......@@ -6,8 +6,7 @@ cd "${0%/*}" || exit # Run from this directory
cleanCase0
# Remove surfaces and features
rm -f constant/triSurface/propellerTip.obj.gz
rm -f constant/triSurface/*.eMesh*
rm -rf constant/triSurface
rm -rf constant/extendedFeatureEdgeMesh
#------------------------------------------------------------------------------
......@@ -5,8 +5,12 @@ cd "${0%/*}" || exit # Run from this directory
./Allrun.pre
restore0Dir
runApplication decomposePar
runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------
......@@ -3,29 +3,30 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
# copy propeller surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
mkdir -p constant/triSurface
# - meshing
# copy propeller surface from resources directory
cp -f $FOAM_TUTORIALS/resources/geometry/propeller/* constant/triSurface/
# meshing
runApplication blockMesh
runApplication surfaceFeatureExtract
runApplication snappyHexMesh -overwrite
runApplication renumberMesh -overwrite
# force removal of fields generated by snappy
rm -rf 0
# - generate face/cell sets and zones
# generate face/cell sets and zones
runApplication topoSet -dict system/createInletOutletSets.topoSetDict
# - create the inlet/outlet and AMI patches
# create the inlet/outlet and AMI patches
runApplication createPatch -overwrite
# - test by running moveDynamicMes
# test by running moveDynamicMes
#runApplication moveDynamicMesh -checkAMI
# - set the initial fields
restore0Dir
#------------------------------------------------------------------------------
# Wavefront OBJ file
# Regions:
# 0 ascii
#
# 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 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
# 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