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.
This commit is contained in:
Henry Weller
2021-09-28 16:40:44 +01:00
parent 2b57e77d91
commit 167ad7442c
47 changed files with 75 additions and 75 deletions

View File

@ -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_);

View File

@ -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;

View File

@ -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_;
}

View File

@ -152,7 +152,7 @@ Foam::CV2D::CV2D
(
point
(
cvMeshDict.subDict("surfaceConformation").lookup("locationInMesh")
cvMeshDict.subDict("surfaceConformation").lookup("insidePoint")
).z()
),
startOfInternalPoints_(0),

View File

@ -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

View File

@ -26,7 +26,7 @@ geometry
surfaceConformation
{
locationInMesh (-2.8 0.7 0.5);
insidePoint (-2.8 0.7 0.5);
pointPairDistanceCoeff 0.005;

View File

@ -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

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -138,7 +138,7 @@ castellatedMeshControls
}
}
locationInMesh (0 0 0);
insidePoint (0 0 0);
}
snapControls

View File

@ -203,7 +203,7 @@ castellatedMeshControls
resolveFeatureAngle 30;
locationInMesh (0.035 0.043 0.017);
insidePoint (0.035 0.043 0.017);
allowFreeStandingZoneFaces true;
}

View File

@ -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)

View File

@ -94,7 +94,7 @@ castellatedMeshControls
nCellsBetweenLevels 1;
locationInMesh (0.025 0.025 0.075);
insidePoint (0.025 0.025 0.075);
}
addLayersControls

View File

@ -116,7 +116,7 @@ castellatedMeshControls
}
}
locationInMesh (0 0.008 0.015);
insidePoint (0 0.008 0.015);
nCellsBetweenLevels 2;

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -22,7 +22,7 @@ geometry
surfaceConformation
{
locationInMesh (-0.078 0.02 0.0);
insidePoint (-0.078 0.02 0.0);
featurePointControls
{

View File

@ -108,7 +108,7 @@ castellatedMeshControls
}
}
locationInMesh (0 0 3);
insidePoint (0 0 3);
nCellsBetweenLevels 5;
}

View File

@ -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)

View File

@ -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
}

View File

@ -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)

View File

@ -60,7 +60,7 @@ castellatedMeshControls
}
}
locationInMesh (1 1 1);
insidePoint (1 1 1);
}
snapControls

View File

@ -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)

View File

@ -61,7 +61,7 @@ initialPoints
surfaceConformation
{
locationInMesh (0.1 0.1 0.2);
insidePoint (0.1 0.1 0.2);
featurePointControls
{

View File

@ -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)

View File

@ -39,7 +39,7 @@ initialPoints
surfaceConformation
{
locationInMesh (0 0 0);
insidePoint (0 0 0);
geometryToConformTo
{

View File

@ -136,10 +136,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 ${:foamyHexMesh.surfaceConformation.locationInMesh};
insidePoint ${:foamyHexMesh.surfaceConformation.insidePoint};
// Whether any faceZones (as specified in the refinementSurfaces)

View File

@ -42,7 +42,7 @@ geometry
surfaceConformation
{
locationInMesh (0 -0.5 0);
insidePoint (0 -0.5 0);
featurePointControls
{

View File

@ -26,7 +26,7 @@ geometry
surfaceConformation
{
// The z-coordinate of the plane is taken from here.
locationInMesh (-0.6 0.3 0.0);
insidePoint (-0.6 0.3 0.0);
pointPairDistanceCoeff 0.001;

View File

@ -34,7 +34,7 @@ geometry
surfaceConformation
{
// The z-coordinate of the plane is taken from here.
locationInMesh (0 0 0);
insidePoint (0 0 0);
pointPairDistanceCoeff 0.005;

View File

@ -141,11 +141,11 @@ 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.
// This is an outside point locationInMesh (-0.033 -0.033 0.0033);
locationInMesh (-9.23149e-05 -0.0025 -0.0025); // Inside point
// This is an outside point insidePoint (-0.033 -0.033 0.0033);
insidePoint (-9.23149e-05 -0.0025 -0.0025); // Inside point
// Whether any faceZones (as specified in the refinementSurfaces)
// are only on the boundary of corresponding cellZones or also allow

View File

@ -66,7 +66,7 @@ castellatedMeshControls
}
}
locationInMesh (1e-5 1e-5 1e-5);
insidePoint (1e-5 1e-5 1e-5);
}
snapControls

View File

@ -115,10 +115,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.7 0 0);
insidePoint (-0.7 0 0);
// Whether any faceZones (as specified in the refinementSurfaces)

View File

@ -115,10 +115,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.7 0 0);
insidePoint (-0.7 0 0);
// Whether any faceZones (as specified in the refinementSurfaces)

View File

@ -115,10 +115,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.7 0 0);
insidePoint (-0.7 0 0);
// Whether any faceZones (as specified in the refinementSurfaces)

View File

@ -334,10 +334,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 0.1 1.0);
insidePoint (0 0.1 1.0);
// Whether any faceZones (as specified in the refinementSurfaces)
// are only on the boundary of corresponding cellZones or also allow

View File

@ -115,10 +115,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.7 0 0);
insidePoint (-0.7 0 0);
// Whether any faceZones (as specified in the refinementSurfaces)

View File

@ -150,10 +150,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.7 0 0);
insidePoint (-0.7 0 0);
// Whether any faceZones (as specified in the refinementSurfaces)

View File

@ -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)

View File

@ -162,10 +162,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 0 -10e-3);
insidePoint (0 0 -10e-3);
allowFreeStandingZoneFaces false;
}

View File

@ -48,7 +48,7 @@ castellatedMeshControls
}
}
locationInMesh (1e-5 1e-5 1e-5);
insidePoint (1e-5 1e-5 1e-5);
}
snapControls