zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

processorPolyPatch: Use relative match tolerance for coincident-full-match ordering

Browse Source
This commit is contained in:
Will Bainbridge
2017-11-07 09:11:03 +00:00
parent b37e628ac8
commit f97eb743fe
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -788,6 +788,12 @@ bool Foam::processorPolyPatch::order
}
else
{
// Calculate the absolute matching tolerance
scalarField tols
(
matchTolerance()*calcFaceTol(pp, pp.points(), pp.faceCentres())
);
if (transform() == COINCIDENTFULLMATCH)
{
vectorField masterPts;
@ -808,7 +814,7 @@ bool Foam::processorPolyPatch::order
const face& localFace = localFaces[lFacei];
label faceRotation = -1;
const scalar absTolSqr = sqr(SMALL);
const scalar absTolSqr = sqr(tols[lFacei]);
scalar closestMatchDistSqr = sqr(GREAT);
scalar matchDistSqr = sqr(GREAT);
@ -847,7 +853,11 @@ bool Foam::processorPolyPatch::order
}
}
if (closestFaceRotation != -1 && closestMatchDistSqr == 0)
if
(
closestFaceRotation != -1
&& closestMatchDistSqr < absTolSqr
)
{
faceMap[lFacei] = closestFaceMatch;
@ -894,12 +904,6 @@ bool Foam::processorPolyPatch::order
>> masterAnchors >> masterFacePointAverages;
}
// Calculate typical distance from face centre
scalarField tols
(
matchTolerance()*calcFaceTol(pp, pp.points(), pp.faceCentres())
);
if (debug || masterCtrs.size() != pp.size())
{
{