tutorials: Clean up geometry resources

A surface geometry file should be stored in
$FOAM_TUTORIALS/resources/geometry if it is used in multiple cases,
otherwise it should be stored locally to the case. This change enforces
that across all tutorials.

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean

@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+# Remove surfaces
+rm -f constant/triSurface/mixerVessel*.stl.gz > /dev/null 2>&1
+
 cleanCase
 
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allmesh

@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# Copy mixerVessel surfaces from resources directory
+cp $FOAM_TUTORIALS/resources/geometry/mixerVessel*.stl.gz constant/triSurface/
+
 # Meshing
 runApplication blockMesh
 runApplication surfaceFeatures

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/README

@@ -0,0 +1,4 @@
+Folder to house tri-surfaces
+
+The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
+folder

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/baffles.stl

@@ -1,114 +0,0 @@
-solid baffles
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex 0.137322 -0.137322 0.025
-   vertex 0.137322 -0.137322 0.4
-   vertex 0.155 -0.155 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex 0.137322 -0.137322 0.4
-   vertex 0.155 -0.155 0.4
-   vertex 0.155 -0.155 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex 0.155 -0.155 0.025
-   vertex 0.155 -0.155 0.4
-   vertex 0.172678 -0.172678 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex 0.155 -0.155 0.4
-   vertex 0.172678 -0.172678 0.4
-   vertex 0.172678 -0.172678 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex 0.137322 -0.137322 0.4
-   vertex 0.137322 -0.137322 0.775
-   vertex 0.155 -0.155 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex 0.137322 -0.137322 0.775
-   vertex 0.155 -0.155 0.775
-   vertex 0.155 -0.155 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex 0.155 -0.155 0.4
-   vertex 0.155 -0.155 0.775
-   vertex 0.172678 -0.172678 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex 0.155 -0.155 0.775
-   vertex 0.172678 -0.172678 0.775
-   vertex 0.172678 -0.172678 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex -0.172678 0.172678 0.025
-   vertex -0.172678 0.172678 0.4
-   vertex -0.155 0.155 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex -0.172678 0.172678 0.4
-   vertex -0.155 0.155 0.4
-   vertex -0.155 0.155 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex -0.155 0.155 0.025
-   vertex -0.155 0.155 0.4
-   vertex -0.137322 0.137322 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex -0.155 0.155 0.4
-   vertex -0.137322 0.137322 0.4
-   vertex -0.137322 0.137322 0.025
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex -0.172678 0.172678 0.4
-   vertex -0.172678 0.172678 0.775
-   vertex -0.155 0.155 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex -0.172678 0.172678 0.775
-   vertex -0.155 0.155 0.775
-   vertex -0.155 0.155 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 -0
-  outer loop
-   vertex -0.155 0.155 0.4
-   vertex -0.155 0.155 0.775
-   vertex -0.137322 0.137322 0.4
-  endloop
- endfacet
- facet normal 0.707107 0.707107 0
-  outer loop
-   vertex -0.155 0.155 0.775
-   vertex -0.137322 0.137322 0.775
-   vertex -0.137322 0.137322 0.4
-  endloop
- endfacet
-endsolid baffles

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/oilInlet.stl

@@ -1,254 +0,0 @@
-solid oilInlet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0984808 0.0173648 0
-   vertex 0 0 0
-   vertex 0.1 0 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0939693 0.034202 0
-   vertex 0 0 0
-   vertex 0.0984808 0.0173648 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0866025 0.05 0
-   vertex 0 0 0
-   vertex 0.0939693 0.034202 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0766044 0.0642788 0
-   vertex 0 0 0
-   vertex 0.0866025 0.05 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0642788 0.0766044 0
-   vertex 0 0 0
-   vertex 0.0766044 0.0642788 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.05 0.0866025 0
-   vertex 0 0 0
-   vertex 0.0642788 0.0766044 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.034202 0.0939693 0
-   vertex 0 0 0
-   vertex 0.05 0.0866025 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0173648 0.0984808 0
-   vertex 0 0 0
-   vertex 0.034202 0.0939693 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 6.12323e-18 0.1 0
-   vertex 0 0 0
-   vertex 0.0173648 0.0984808 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.0173648 0.0984808 0
-   vertex 0 0 0
-   vertex 6.12323e-18 0.1 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.034202 0.0939693 0
-   vertex 0 0 0
-   vertex -0.0173648 0.0984808 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.05 0.0866025 0
-   vertex 0 0 0
-   vertex -0.034202 0.0939693 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.0642788 0.0766044 0
-   vertex 0 0 0
-   vertex -0.05 0.0866025 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.0766044 0.0642788 0
-   vertex 0 0 0
-   vertex -0.0642788 0.0766044 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.0866025 0.05 0
-   vertex 0 0 0
-   vertex -0.0766044 0.0642788 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.0939693 0.034202 0
-   vertex 0 0 0
-   vertex -0.0866025 0.05 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.0984808 0.0173648 0
-   vertex 0 0 0
-   vertex -0.0939693 0.034202 0
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.1 1.22465e-17 0
-   vertex 0 0 0
-   vertex -0.0984808 0.0173648 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.0984808 -0.0173648 0
-   vertex 0 0 0
-   vertex -0.1 1.22465e-17 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.0939693 -0.034202 0
-   vertex 0 0 0
-   vertex -0.0984808 -0.0173648 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.0866025 -0.05 0
-   vertex 0 0 0
-   vertex -0.0939693 -0.034202 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.0766044 -0.0642788 0
-   vertex 0 0 0
-   vertex -0.0866025 -0.05 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.0642788 -0.0766044 0
-   vertex 0 0 0
-   vertex -0.0766044 -0.0642788 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.05 -0.0866025 0
-   vertex 0 0 0
-   vertex -0.0642788 -0.0766044 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.034202 -0.0939693 0
-   vertex 0 0 0
-   vertex -0.05 -0.0866025 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -0.0173648 -0.0984808 0
-   vertex 0 0 0
-   vertex -0.034202 -0.0939693 0
-  endloop
- endfacet
- facet normal 0 -0 1
-  outer loop
-   vertex -1.83697e-17 -0.1 0
-   vertex 0 0 0
-   vertex -0.0173648 -0.0984808 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0173648 -0.0984808 0
-   vertex 0 0 0
-   vertex -1.83697e-17 -0.1 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.034202 -0.0939693 0
-   vertex 0 0 0
-   vertex 0.0173648 -0.0984808 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.05 -0.0866025 0
-   vertex 0 0 0
-   vertex 0.034202 -0.0939693 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0642788 -0.0766044 0
-   vertex 0 0 0
-   vertex 0.05 -0.0866025 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0766044 -0.0642788 0
-   vertex 0 0 0
-   vertex 0.0642788 -0.0766044 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0866025 -0.05 0
-   vertex 0 0 0
-   vertex 0.0766044 -0.0642788 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0939693 -0.034202 0
-   vertex 0 0 0
-   vertex 0.0866025 -0.05 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.0984808 -0.0173648 0
-   vertex 0 0 0
-   vertex 0.0939693 -0.034202 0
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex 0.1 -2.44929e-17 0
-   vertex 0 0 0
-   vertex 0.0984808 -0.0173648 0
-  endloop
- endfacet
-endsolid oilInlet

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/triSurface/outlet.stl

@@ -1,240 +0,0 @@
-solid outlet
- facet normal 0 0 1
-  outer loop
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.13 -0.1 1.3
-   vertex -0.129544 -0.105209 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.125981 -0.115 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.128191 -0.110261 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.128191 -0.110261 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.129544 -0.105209 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.122981 -0.119284 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.125981 -0.115 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.119284 -0.122981 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.122981 -0.119284 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.115 -0.125981 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.119284 -0.122981 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.110261 -0.128191 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.115 -0.125981 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.105209 -0.129544 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.110261 -0.128191 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.1 -0.13 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.105209 -0.129544 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0947905 -0.129544 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.1 -0.13 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0897394 -0.128191 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0947905 -0.129544 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.085 -0.125981 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0897394 -0.128191 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0807164 -0.122981 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.085 -0.125981 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0770187 -0.119284 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0807164 -0.122981 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0740192 -0.115 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0770187 -0.119284 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0718092 -0.110261 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0740192 -0.115 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0704558 -0.105209 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0718092 -0.110261 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.07 -0.1 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0704558 -0.105209 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0704558 -0.0947905 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.07 -0.1 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0718092 -0.0897394 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0704558 -0.0947905 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0740192 -0.085 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0718092 -0.0897394 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0770187 -0.0807164 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0740192 -0.085 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0807164 -0.0770187 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0770187 -0.0807164 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.085 -0.0740192 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0807164 -0.0770187 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0897394 -0.0718092 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.085 -0.0740192 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.0947905 -0.0704558 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0897394 -0.0718092 1.3
-  endloop
- endfacet
- facet normal 0 0 1
-  outer loop
-   vertex -0.1 -0.07 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.0947905 -0.0704558 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.105209 -0.0704558 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.1 -0.07 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.110261 -0.0718092 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.105209 -0.0704558 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.115 -0.0740192 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.110261 -0.0718092 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.119284 -0.0770187 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.115 -0.0740192 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.122981 -0.0807164 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.119284 -0.0770187 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.125981 -0.085 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.122981 -0.0807164 1.3
-  endloop
- endfacet
- facet normal -0 0 1
-  outer loop
-   vertex -0.128191 -0.0897394 1.3
-   vertex -0.129544 -0.0947905 1.3
-   vertex -0.125981 -0.085 1.3
-  endloop
- endfacet
-endsolid ascii

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict

@@ -25,7 +25,7 @@ geometry
     vessel
     {
         type triSurfaceMesh;
-        file "vessel.stl";
+        file "mixerVessel-vessel.stl";
 
         regions
         {
@@ -39,7 +39,7 @@ geometry
     oilInlet
     {
         type triSurfaceMesh;
-        file "oilInlet.stl";
+        file "mixerVessel-oilInlet.stl";
 
         regions
         {
@@ -53,7 +53,7 @@ geometry
     outlet
     {
         type triSurfaceMesh;
-        file "outlet.stl";
+        file "mixerVessel-outlet.stl";
 
         regions
         {
@@ -67,7 +67,7 @@ geometry
     shaftRotating
     {
         type triSurfaceMesh;
-        file "shaftRotating.stl";
+        file "mixerVessel-shaftRotating.stl";
 
         regions
         {
@@ -81,7 +81,7 @@ geometry
     shaft
     {
         type triSurfaceMesh;
-        file "shaft.stl";
+        file "mixerVessel-shaft.stl";
 
         regions
         {
@@ -95,7 +95,7 @@ geometry
     sparger
     {
         type triSurfaceMesh;
-        file "sparger.stl";
+        file "mixerVessel-sparger.stl";
 
         regions
         {
@@ -109,7 +109,7 @@ geometry
     stirrer
     {
         type triSurfaceMesh;
-        file "stirrer.stl";
+        file "mixerVessel-stirrer.stl";
 
         regions
         {
@@ -123,7 +123,7 @@ geometry
     baffles
     {
         type triSurfaceMesh;
-        file "baffles.stl";
+        file "mixerVessel-baffles.stl";
 
         regions
         {
@@ -193,23 +193,23 @@ castellatedMeshControls
     features
     (
         {
-           file "shaftRotating.eMesh";
+           file "mixerVessel-shaftRotating.eMesh";
            levels ((1 1));
         }
         {
-           file "shaft.eMesh";
+           file "mixerVessel-shaft.eMesh";
            levels ((1 1));
         }
         {
-           file "sparger.eMesh";
+           file "mixerVessel-sparger.eMesh";
            levels ((1 1));
         }
         {
-           file "stirrer.eMesh";
+           file "mixerVessel-stirrer.eMesh";
            levels ((1 1));
         }
         {
-           file "baffles.eMesh";
+           file "mixerVessel-baffles.eMesh";
            levels ((1 1));
         }
         {
@@ -217,15 +217,15 @@ castellatedMeshControls
            levels ((1 1));
         }
         {
-           file "oilInlet.eMesh";
+           file "mixerVessel-oilInlet.eMesh";
            levels ((1 1));
         }
         {
-           file "vessel.eMesh";
+           file "mixerVessel-vessel.eMesh";
            levels ((1 1));
         }
         {
-           file "outlet.eMesh";
+           file "mixerVessel-outlet.eMesh";
            levels ((1 1));
         }
 

tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/surfaceFeaturesDict

@@ -16,15 +16,15 @@ FoamFile
 
 surfaces
 (
-    "vessel.stl"
-    "oilInlet.stl"
-    "stirrer.stl"
-    "outlet.stl"
-    "shaft.stl"
-    "shaftRotating.stl"
+    "mixerVessel-vessel.stl"
+    "mixerVessel-oilInlet.stl"
+    "mixerVessel-stirrer.stl"
+    "mixerVessel-outlet.stl"
+    "mixerVessel-shaft.stl"
+    "mixerVessel-shaftRotating.stl"
+    "mixerVessel-baffles.stl"
+    "mixerVessel-sparger.stl"
     "rotating.stl"
-    "baffles.stl"
-    "sparger.stl"
 );
 
 // Identify a feature when angle between faces < includedAngle