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: replace triangleFuncs::intersectBb usage with boundBox::intersect

Browse Source
This commit is contained in:
Mark Olesen
2022-10-24 16:21:18 +02:00
committed by Andrew Heather
parent 38b663b6a8
commit ffbad65538
4 changed files with 45 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ License
#include "mapDistribute.H"
#include "Random.H"
#include "addToRunTimeSelectionTable.H"
#include "triangleFuncs.H"
#include "triangle.H"
#include "matchPoints.H"
#include "globalIndex.H"
#include "Time.H"
@ -2185,41 +2185,23 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
bool Foam::distributedTriSurfaceMesh::overlaps
(
const List<treeBoundBox>& bbs,
const point& p0,
const point& p1,
const point& p2
const triPointRef& tri
)
{
treeBoundBox triBb(p0);
triBb.add(p1);
triBb.add(p2);
treeBoundBox triBb(tri.a());
triBb.add(tri.b());
triBb.add(tri.c());
forAll(bbs, bbi)
for (const treeBoundBox& bb : bbs)
{
const treeBoundBox& bb = bbs[bbi];
// Exact test of triangle intersecting bb
// Quick rejection. If whole bounding box of tri is outside cubeBb then
// there will be no intersection.
if (bb.overlaps(triBb))
if (bb.overlaps(triBb) && bb.intersects(tri))
{
// Check if one or more triangle point inside
if (bb.contains(p0) || bb.contains(p1) || bb.contains(p2))
{
// One or more points inside
return true;
}
// Now we have the difficult case: all points are outside but
// connecting edges might go through cube. Use fast intersection
// of bounding box.
bool intersect = triangleFuncs::intersectBb(p0, p1, p2, bb);
if (intersect)
{
return true;
}
return true;
}
}
return false;
@ -4501,11 +4483,10 @@ void Foam::distributedTriSurfaceMesh::overlappingSurface
forAll(s, trii)
{
const labelledTri& f = s[trii];
const point& p0 = s.points()[f[0]];
const point& p1 = s.points()[f[1]];
const point& p2 = s.points()[f[2]];
if (overlaps(bbsX, p0, p1, p2))
triPointRef tri(s.points(), f);
if (overlaps(bbsX, tri))
{
includedFace[trii] = true;
}

11
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2015-2020 OpenCFD Ltd.
Copyright (C) 2015-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -57,8 +57,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef distributedTriSurfaceMesh_H
#define distributedTriSurfaceMesh_H
#ifndef Foam_distributedTriSurfaceMesh_H
#define Foam_distributedTriSurfaceMesh_H
#include "triSurfaceMesh.H"
#include "localIOdictionary.H"
@ -66,6 +66,7 @@ SourceFiles
#include "Pair.H"
#include "globalIndex.H"
#include "DynamicField.H"
#include "triangleFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -330,9 +331,7 @@ private:
static bool overlaps
(
const List<treeBoundBox>& bb,
const point& p0,
const point& p1,
const point& p2
const triPointRef& tri
);
//- Find points used in subset