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

BUG: distributedTriSurfaceMesh: non-parallel running clip against local proc

Browse Source
This commit is contained in:
mattijs
2013-05-02 17:17:21 +01:00
parent 900d572a6e
commit 3318a2972f
1 changed files with 127 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,9 +365,6 @@ void Foam::distributedTriSurfaceMesh::findLine
{ {
const indexedOctree<treeDataTriSurface>& octree = tree(); const indexedOctree<treeDataTriSurface>& octree = tree();
// Important:force synchronised construction of indexing
const globalIndex& triIndexer = globalTris();
// Initialise // Initialise
info.setSize(start.size()); info.setSize(start.size());
forAll(info, i) forAll(info, i)
@ -375,6 +372,25 @@ void Foam::distributedTriSurfaceMesh::findLine
info[i].setMiss(); info[i].setMiss();
} }
if (!Pstream::parRun())
{
forAll(start, i)
{
if (nearestIntersection)
{
info[i] = octree.findLine(start[i], end[i]);
}
else
{
info[i] = octree.findLineAny(start[i], end[i]);
}
}
}
else
{
// Important:force synchronised construction of indexing
const globalIndex& triIndexer = globalTris();
// Do any local queries // Do any local queries
// ~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~
@ -405,15 +421,12 @@ void Foam::distributedTriSurfaceMesh::findLine
if if
( (
Pstream::parRun()
&& (
returnReduce(nLocal, sumOp<label>()) returnReduce(nLocal, sumOp<label>())
< returnReduce(start.size(), sumOp<label>()) < returnReduce(start.size(), sumOp<label>())
) )
)
{ {
// Not all can be resolved locally. Build segments and map, send over // Not all can be resolved locally. Build segments and map,
// segments, do intersections, send back and merge. // send over segments, do intersections, send back and merge.
// Construct queries (segments) // Construct queries (segments)
@ -518,6 +531,7 @@ void Foam::distributedTriSurfaceMesh::findLine
} }
} }
} }
}
} }