ENH: foamyHexMesh: Update blob and simpleShapes tutorials

tutorials/mesh/foamyHexMesh/blob/Allrun

@@ -4,8 +4,12 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy flange surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
+
 runApplication foamyHexMesh
 runApplication collapseEdges -latestTime -collapseFaces
 runApplication checkMesh -latestTime -allGeometry -allTopology
 
+
 # ----------------------------------------------------------------- end-of-file

tutorials/mesh/foamyHexMesh/blob/Allrun-parallel

@@ -7,6 +7,9 @@ cd ${0%/*} || exit 1    # run from this directory
 # Get the number of processors to run on from system/decomposeParDict
 nProc=$(getNumberOfProcessors)
 
+# copy flange surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
+
 runApplication blockMesh
 runApplication decomposePar
 
@@ -16,4 +19,5 @@ runParallel checkMesh $nProc -latestTime -allTopology -allGeometry
 
 runApplication reconstructParMesh -latestTime
 
+
 # ----------------------------------------------------------------- end-of-file

tutorials/mesh/foamyHexMesh/blob/Alltest

@@ -1,18 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication foamyHexMesh
-
-# Change collapseEdges to only do one iteration
-cp system/collapseDict system/collapseDict.org
-
-sed -e s/"\(maximumIterations[ \t]*\)\([0-9]*\);"/"\1 1;"/g \
-system/collapseDict.org > system/collapseDict
-
-runApplication collapseEdges -latestTime -collapseFaces
-
-
-# ----------------------------------------------------------------- end-of-file

tutorials/mesh/foamyHexMesh/blob/constant/polyMesh/boundary

@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            wall;
-        nFaces          638;
-        startFace       2948;
-    }
-)
-
-// ************************************************************************* //

tutorials/mesh/foamyHexMesh/blob/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/mesh/foamyHexMesh/simpleShapes/Allrun

@@ -4,24 +4,22 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Remove any small triangles (edges < 1e-4, sliver with Q < 1e-6) from surface
-# (cvMesh will try to conform to every feature).
-runApplication surfaceClean \
-    constant/triSurface/coneAndSphere.obj \
-    1e-4 1e-6 \
-    constant/triSurface/coneAndSphere_clean.obj
-mv log.surfaceClean log.surfaceClean.coneAndSphere
-# Orient so point to be meshed is inside surface
 runApplication surfaceOrient \
-    constant/triSurface/coneAndSphere_clean.obj \
+    constant/triSurface/cone.stl \
     -inside '(0 -0.5 0)' \
-    constant/triSurface/coneAndSphere_clean_orient.obj
-mv log.surfaceOrient log.surfaceOrient.coneAndSphere
+    constant/triSurface/cone_orient.stl
+mv log.surfaceOrient log.surfaceOrient.cone
 
-unset FOAM_SIGFPE
+runApplication surfaceOrient \
+    constant/triSurface/sphere.stl \
+    -inside '(0 -0.5 0)' \
+    constant/triSurface/sphere_orient.stl
+mv log.surfaceOrient log.surfaceOrient.sphere
+
+runApplication surfaceBooleanFeatures intersection \
+                       constant/triSurface/cone_orient.stl \
+                       constant/triSurface/sphere_orient.stl
 
-# Generate aligned points (in constant/internalDelaunayVertices) and a
-# mesh from that.
 runApplication foamyHexMesh
 
 

tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict

@@ -19,10 +19,15 @@ FoamFile
 
 geometry
 {
-    // Internal shape
-    coneAndSphere_clean_orient.obj
+    sphere_orient.stl
     {
-        name coneAndSphere;
+        name sphere;
+        type triSurfaceMesh;
+    }
+
+    cone_orient.stl
+    {
+        name cone;
         type triSurfaceMesh;
     }
 
@@ -43,27 +48,53 @@ surfaceConformation
 
     featurePointControls
     {
-        specialiseFeaturePoints on;
-        edgeAiming              on;
+        specialiseFeaturePoints off;
+        edgeAiming              off;
         guardFeaturePoints      off;
-        snapFeaturePoints       on;
+        snapFeaturePoints       off;
         circulateEdges          off;
     }
 
     // Geometry to mesh to
     geometryToConformTo
     {
-        coneAndSphere
+        cone
         {
-            featureMethod           extractFeatures;
-            includedAngle           140;
+            featureMethod   extractFeatures;
+            includedAngle   140;
+
+            patchInfo
+            {
+                type        wall;
+                inGroups    (groupConeAndSphere);
+            }
+        }
+
+        sphere
+        {
+            featureMethod   none;
+
+            patchInfo
+            {
+                type        wall;
+                inGroups    (groupConeAndSphere);
+            }
         }
 
         domain
         {
-            featureMethod           extractFeatures;
-            includedAngle           100;
-            mode                    outside;
+            featureMethod   extractFeatures;
+            includedAngle   100;
+            mode            outside;
+        }
+    }
+
+    additionalFeatures
+    {
+        coneSphereIntersection
+        {
+            featureMethod           extendedFeatureEdgeMesh;
+            extendedFeatureEdgeMesh "cone_orient_sphere_orient_intersection.extendedFeatureEdgeMesh";
         }
     }
 }
@@ -71,7 +102,7 @@ surfaceConformation
 
 initialPoints
 {
-    initialPointsMethod             autoDensity;
+    initialPointsMethod         autoDensity;
 
     autoDensityCoeffs
     {
@@ -97,7 +128,24 @@ motionControl
 
     shapeControlFunctions
     {
-        coneAndSphere
+        sphere
+        {
+            type                searchableSurfaceControl;
+            priority            1;
+            mode                bothSides;
+
+            surfaceCellSizeFunction uniformValue;
+            uniformValueCoeffs
+            {
+                surfaceCellSizeCoeff 0.5;
+            }
+
+            cellSizeFunction        uniform;
+            uniformCoeffs
+            {}
+        }
+
+        cone
         {
             type                searchableSurfaceControl;
             priority            1;