snappyHexMesh: Renamed locationInMesh -> insidePoint

for consistency with the regionToCell topo set source and splitMeshRegions and provides more logical extension to the multiple and outside point variants insidePoints, outsidePoint and outsidePoints.
OpenFOAM · Sep 28, 2021 · 167ad74 · 167ad74
1 parent 2b57e77
commit 167ad74
Show file tree

Hide file tree

Showing 47 changed files with 75 additions and 75 deletions.
diff --git a/...esh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/...esh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ void Foam::conformationSurfaces::hasBoundedVolume
             )
         )
         {
-            pointField pts(1, locationInMesh_);
+            pointField pts(1, insidePoint_);
 
             List<volumeType> vTypes
             (
@@ -271,7 +271,7 @@ Foam::conformationSurfaces::conformationSurfaces
     runTime_(runTime),
     allGeometry_(allGeometry),
     features_(),
-    locationInMesh_(surfaceConformationDict.lookup("locationInMesh")),
+    insidePoint_(surfaceConformationDict.lookup("insidePoint")),
     surfaces_(),
     allGeometryToSurfaces_(),
     normalVolumeTypes_(),
@@ -561,7 +561,7 @@ Foam::conformationSurfaces::conformationSurfaces
     globalBounds_.min() -= newSpan;
     globalBounds_.max() += newSpan;
 
-    // Look at all surfaces at determine whether the locationInMesh point is
+    // Look at all surfaces at determine whether the insidePoint point is
     // inside or outside each, to establish a signature for the domain to be
     // meshed.
 
@@ -572,7 +572,7 @@ Foam::conformationSurfaces::conformationSurfaces
     );
 
     Info<< endl
-        << "Testing for locationInMesh " << locationInMesh_ << endl;
+        << "Testing for insidePoint " << insidePoint_ << endl;
 
     hasBoundedVolume(referenceVolumeTypes_);
 

diff --git a/...esh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/...esh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ class conformationSurfaces
 
         //- The location in the mesh that specifies which portion of surfaces is
         //  to be meshed.
-        point locationInMesh_;
+        point insidePoint_;
 
         //- Indices of surfaces in allGeometry that are to be conformed to
         labelList surfaces_;
@@ -162,7 +162,7 @@ public:
             inline const PtrList<extendedFeatureEdgeMesh>& features() const;
 
             //- Return the location to mesh
-            inline const point& locationInMesh() const;
+            inline const point& insidePoint() const;
 
             //- Return the surface indices
             inline const labelList& surfaces() const;

diff --git a/...sh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H b/...sh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,9 +38,9 @@ Foam::conformationSurfaces::features() const
 }
 
 
-const Foam::point& Foam::conformationSurfaces::locationInMesh() const
+const Foam::point& Foam::conformationSurfaces::insidePoint() const
 {
-    return locationInMesh_;
+    return insidePoint_;
 }
 
 

diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -152,7 +152,7 @@ Foam::CV2D::CV2D
     (
         point
         (
-            cvMeshDict.subDict("surfaceConformation").lookup("locationInMesh")
+            cvMeshDict.subDict("surfaceConformation").lookup("insidePoint")
         ).z()
     ),
     startOfInternalPoints_(0),

diff --git a/etc/caseDicts/annotated/foamyHexMeshDict b/etc/caseDicts/annotated/foamyHexMeshDict
@@ -85,7 +85,7 @@ geometry
 surfaceConformation
 {
     // A point inside surfaces that is inside mesh.
-    locationInMesh (0 0 0);
+    insidePoint (0 0 0);
 
     // How far apart are point-duplets generated. Balance this between
     // - very low distance: little chance of interference from other

diff --git a/etc/caseDicts/annotated/foamyQuadMeshDict b/etc/caseDicts/annotated/foamyQuadMeshDict
@@ -26,7 +26,7 @@ geometry
 
 surfaceConformation
 {
-    locationInMesh              (-2.8 0.7 0.5);
+    insidePoint                 (-2.8 0.7 0.5);
 
     pointPairDistanceCoeff      0.005;
 

diff --git a/etc/caseDicts/annotated/snappyHexMeshDict b/etc/caseDicts/annotated/snappyHexMeshDict
@@ -254,10 +254,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (5 0.28 0.43);
+    insidePoint (5 0.28 0.43);
 
     // Whether any faceZones (as specified in the refinementSurfaces)
     // are only on the boundary of corresponding cellZones or also allow

diff --git a/etc/caseDicts/mesh/generation/snappyHexMeshDict b/etc/caseDicts/mesh/generation/snappyHexMeshDict
@@ -81,7 +81,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/etc/templates/closedVolume/system/snappyHexMeshDict b/etc/templates/closedVolume/system/snappyHexMeshDict
@@ -53,7 +53,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
@@ -80,7 +80,7 @@ castellatedMeshControls
         */
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
@@ -81,7 +81,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/etc/templates/inflowOutflow/system/snappyHexMeshDict b/etc/templates/inflowOutflow/system/snappyHexMeshDict
@@ -81,7 +81,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
@@ -109,7 +109,7 @@ castellatedMeshControls
         */
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/etc/templates/singleFluidCHT/system/snappyHexMeshDict b/etc/templates/singleFluidCHT/system/snappyHexMeshDict
@@ -100,7 +100,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
     nCellsBetweenLevels 3;
 }

diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict
@@ -138,7 +138,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (0 0 0);
+    insidePoint (0 0 0);
 }
 
 snapControls

diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
@@ -203,7 +203,7 @@ castellatedMeshControls
 
     resolveFeatureAngle 30;
 
-    locationInMesh (0.035 0.043 0.017);
+    insidePoint (0.035 0.043 0.017);
 
     allowFreeStandingZoneFaces true;
 }

diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -193,10 +193,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (3 0.28 0.43);
+    insidePoint (3 0.28 0.43);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/snappyHexMeshDict
@@ -94,7 +94,7 @@ castellatedMeshControls
 
     nCellsBetweenLevels 1;
 
-    locationInMesh (0.025 0.025 0.075);
+    insidePoint (0.025 0.025 0.075);
 }
 
 addLayersControls

diff --git a/...s/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/snappyHexMeshDict.orig b/...s/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/snappyHexMeshDict.orig
@@ -116,7 +116,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (0 0.008 0.015);
+    insidePoint (0 0.008 0.015);
 
     nCellsBetweenLevels 2;
 

diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
@@ -244,10 +244,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (0.01 -0.5 0.01);
+    insidePoint (0.01 -0.5 0.01);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/...ncompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/...ncompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
@@ -134,10 +134,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (-0.5 0 0);
+    insidePoint (-0.5 0 0);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
@@ -148,10 +148,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (3 3 0.43);
+    insidePoint (3 3 0.43);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
@@ -22,7 +22,7 @@ geometry
 
 surfaceConformation
 {
-    locationInMesh (-0.078 0.02 0.0);
+    insidePoint (-0.078 0.02 0.0);
 
     featurePointControls
     {

diff --git a/tutorials/incompressible/simpleFoam/drivaerFastback/system/snappyHexMeshDict.orig b/tutorials/incompressible/simpleFoam/drivaerFastback/system/snappyHexMeshDict.orig
@@ -108,7 +108,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (0 0 3);
+    insidePoint (0 0 3);
     nCellsBetweenLevels 5;
 }
 

diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -155,10 +155,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (3.0001 3.0001 0.43);
+    insidePoint (3.0001 3.0001 0.43);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
@@ -100,7 +100,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
+    insidePoint (1e-5 1e-5 1e-5); // Offset from (0 0 0) to avoid
                                      // coinciding with face or edge
 }
 

diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
@@ -191,10 +191,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (581770 4.78580e+06 1050);
+    insidePoint (581770 4.78580e+06 1050);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
@@ -60,7 +60,7 @@ castellatedMeshControls
         }
     }
 
-    locationInMesh (1 1 1);
+    insidePoint (1 1 1);
 }
 
 snapControls

diff --git a/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict
@@ -112,10 +112,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (0.001 0.001 0.001);
+    insidePoint (0.001 0.001 0.001);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
@@ -61,7 +61,7 @@ initialPoints
 
 surfaceConformation
 {
-    locationInMesh              (0.1 0.1 0.2);
+    insidePoint                 (0.1 0.1 0.2);
 
     featurePointControls
     {

diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
@@ -132,10 +132,10 @@ castellatedMeshControls
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the insidePoint is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (-1 0 0);
+    insidePoint (-1 0 0);
 
 
     // Whether any faceZones (as specified in the refinementSurfaces)

diff --git a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
@@ -39,7 +39,7 @@ initialPoints
 
 surfaceConformation
 {
-    locationInMesh      (0 0 0);
+    insidePoint            (0 0 0);
 
     geometryToConformTo
     {