zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: distributedTriSurfaceMesh: bail out if getting stuck due to precision errors

Browse Source
This commit is contained in:
mattijs
2016-09-28 12:26:23 +01:00
parent ba249f8e76
commit 1c2aadb8d8
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -1766,6 +1766,8 @@ void Foam::distributedTriSurfaceMesh::findLineAll
e1.setSize(compactI); e1.setSize(compactI);
pointMap.setSize(compactI); pointMap.setSize(compactI);
label iter = 0;
while (returnReduce(e0.size(), sumOp<label>()) > 0) while (returnReduce(e0.size(), sumOp<label>()) > 0)
{ {
findLine findLine
@ -1791,7 +1793,12 @@ void Foam::distributedTriSurfaceMesh::findLineAll
point pt = hitInfo[i].hitPoint() + smallVec[pointI]; point pt = hitInfo[i].hitPoint() + smallVec[pointI];
if (((pt-start[pointI])&dirVec[pointI]) <= magSqrDirVec[pointI]) // Check current coordinate along ray
scalar d = ((pt-start[pointI])&dirVec[pointI]);
// Note check for d>0. Very occasionally the octree will find
// an intersection to the left of the ray due to tolerances.
if (d > 0 && d <= magSqrDirVec[pointI])
{ {
e0[compactI] = pt; e0[compactI] = pt;
e1[compactI] = end[pointI]; e1[compactI] = end[pointI];
@ -1805,6 +1812,21 @@ void Foam::distributedTriSurfaceMesh::findLineAll
e0.setSize(compactI); e0.setSize(compactI);
e1.setSize(compactI); e1.setSize(compactI);
pointMap.setSize(compactI); pointMap.setSize(compactI);
iter++;
if (iter == 1000)
{
Pout<< "distributedTriSurfaceMesh::findLineAll :"
<< " Exiting loop due to excessive number of"
<< " intersections along ray"
<< " start:" << UIndirectList<point>(start, pointMap)
<< " end:" << UIndirectList<point>(end, pointMap)
<< " e0:" << UIndirectList<point>(e0, pointMap)
<< " e1:" << UIndirectList<point>(e1, pointMap)
<< endl;
break;
}
} }
} }