mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -715,7 +715,7 @@ int main(int argc, char *argv[])
|
||||
triSurfaceSearch querySurf(surf);
|
||||
|
||||
// Search engine on mesh. No face decomposition since mesh unwarped.
|
||||
meshSearch queryMesh(mesh, false);
|
||||
meshSearch queryMesh(mesh, polyMesh::FACEPLANES);
|
||||
|
||||
// Check all 'outside' points
|
||||
forAll(outsidePts, outsideI)
|
||||
|
||||
@ -381,7 +381,7 @@ int main(int argc, char *argv[])
|
||||
(void)edgeCalc.minLen(Info);
|
||||
|
||||
// Search engine on mesh. Face decomposition since faces might be warped.
|
||||
meshSearch queryMesh(mesh, true);
|
||||
meshSearch queryMesh(mesh, polyMesh::FACEDIAGTETS);
|
||||
|
||||
// Check all 'outside' points
|
||||
forAll(outsidePts, outsideI)
|
||||
|
||||
@ -971,7 +971,7 @@ Foam::backgroundMeshDecomposition::distribute
|
||||
{
|
||||
// Map cellVertices, cellVertexIndices and cellVertexTypes
|
||||
|
||||
meshSearch cellSearch(mesh_);
|
||||
meshSearch cellSearch(mesh_, polyMesh::FACEPLANES);
|
||||
|
||||
const labelList& reverseCellMap = map().reverseCellMap();
|
||||
|
||||
|
||||
@ -1405,7 +1405,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground()
|
||||
zeroGradientFvPatchScalarField::typeName
|
||||
);
|
||||
|
||||
meshSearch cellSearch(bMesh);
|
||||
meshSearch cellSearch(bMesh, polyMesh::FACEPLANES);
|
||||
|
||||
List<DynamicList<Foam::point> > cellVertices(bMesh.nCells());
|
||||
List<DynamicList<label> > cellVertexIndices(bMesh.nCells());
|
||||
|
||||
@ -2194,7 +2194,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
label regionI = -1;
|
||||
|
||||
label cellI = mesh.findCell(insidePoint);
|
||||
label cellI = mesh.findCell(insidePoint, polyMesh::FACEDIAGTETS);
|
||||
|
||||
Info<< nl << "Found point " << insidePoint << " in cell " << cellI
|
||||
<< endl;
|
||||
|
||||
@ -528,7 +528,11 @@ int main(int argc, char *argv[])
|
||||
<< "Cell number should be between 0 and "
|
||||
<< mesh.nCells()-1 << nl
|
||||
<< "On this mesh the particle should be in cell "
|
||||
<< mesh.findCell(iter().position())
|
||||
<< mesh.findCell
|
||||
(
|
||||
iter().position(),
|
||||
polyMesh::FACEDIAGTETS
|
||||
)
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
|
||||
@ -56,7 +56,11 @@ static label findCell(const Cloud<passiveParticle>& cloud, const point& pt)
|
||||
// See if particle on face by finding nearest face and shifting
|
||||
// particle.
|
||||
|
||||
meshSearch meshSearcher(mesh, false);
|
||||
meshSearch meshSearcher
|
||||
(
|
||||
mesh,
|
||||
polyMesh::FACEPLANES // no decomposition needed
|
||||
);
|
||||
|
||||
label faceI = meshSearcher.findNearestBoundaryFace(pt);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user