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: simplify sub-octant bound-box search

Browse Source 
- basic support for splitting into two at a given position and face to keep
This commit is contained in:
Mark Olesen
2022-10-12 18:43:27 +02:00
committed by Andrew Heather
parent fc9311ba0d
commit b129446221
12 changed files with 498 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
View File

@ -38,105 +38,6 @@ Foam::scalar Foam::dynamicIndexedOctree<Type>::perturbTol_ = 10*SMALL;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
bool Foam::dynamicIndexedOctree<Type>::overlaps
(
const point& p0,
const point& p1,
const scalar nearestDistSqr,
const point& sample
)
{
// Find out where sample is in relation to bb.
// Find nearest point on bb.
scalar distSqr = 0;
for (direction dir = 0; dir < vector::nComponents; dir++)
{
scalar d0 = p0[dir] - sample[dir];
scalar d1 = p1[dir] - sample[dir];
if ((d0 > 0) != (d1 > 0))
{
// sample inside both extrema. This component does not add any
// distance.
}
else if (mag(d0) < mag(d1))
{
distSqr += d0*d0;
}
else
{
distSqr += d1*d1;
}
if (distSqr > nearestDistSqr)
{
return false;
}
}
return true;
}
template<class Type>
bool Foam::dynamicIndexedOctree<Type>::overlaps
(
const treeBoundBox& parentBb,
const direction octant,
const scalar nearestDistSqr,
const point& sample
)
{
//- Accelerated version of
// treeBoundBox subBb(parentBb.subBbox(mid, octant))
// overlaps
// (
// subBb.min(),
// subBb.max(),
// nearestDistSqr,
// sample
// )
const point& min = parentBb.min();
const point& max = parentBb.max();
point other;
if (octant & treeBoundBox::RIGHTHALF)
{
other.x() = max.x();
}
else
{
other.x() = min.x();
}
if (octant & treeBoundBox::TOPHALF)
{
other.y() = max.y();
}
else
{
other.y() = min.y();
}
if (octant & treeBoundBox::FRONTHALF)
{
other.z() = max.z();
}
else
{
other.z() = min.z();
}
const point mid(0.5*(min+max));
return overlaps(mid, other, nearestDistSqr, sample);
}
template<class Type>
void Foam::dynamicIndexedOctree<Type>::divide
(
@ -483,14 +384,10 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
const node& nod = nodes_[nodeI];
// Determine order to walk through octants
FixedList<direction, 8> octantOrder;
nod.bb_.searchOrder(sample, octantOrder);
// Go into all suboctants (one containing sample first) and update nearest.
for (direction i = 0; i < 8; i++)
{
direction octant = octantOrder[i];
for (const direction octant : nod.bb_.searchOrder(sample))
{
labelBits index = nod.subNodes_[octant];
if (isNode(index))
@ -499,7 +396,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
const treeBoundBox& subBb = nodes_[subNodeI].bb_;
if (overlaps(subBb.min(), subBb.max(), nearestDistSqr, sample))
if (subBb.overlaps(sample, nearestDistSqr))
{
findNearest
(
@ -514,16 +411,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
}
else if (isContent(index))
{
if
(
overlaps
(
nod.bb_,
octant,
nearestDistSqr,
sample
)
)
if (nod.bb_.subOverlaps(octant, sample, nearestDistSqr))
{
shapes_.findNearest
(
@ -556,14 +444,10 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
const treeBoundBox& nodeBb = nod.bb_;
// Determine order to walk through octants
FixedList<direction, 8> octantOrder;
nod.bb_.searchOrder(ln.centre(), octantOrder);
// Go into all suboctants (one containing sample first) and update nearest.
for (direction i = 0; i < 8; i++)
{
direction octant = octantOrder[i];
for (const direction octant : nod.bb_.searchOrder(ln.centre()))
{
labelBits index = nod.subNodes_[octant];
if (isNode(index))
@ -586,9 +470,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
}
else if (isContent(index))
{
const treeBoundBox subBb(nodeBb.subBbox(octant));
if (subBb.overlaps(tightest))
if (nodeBb.subOverlaps(octant, tightest))
{
shapes_.findNearest
(
@ -1791,9 +1673,7 @@ void Foam::dynamicIndexedOctree<Type>::findBox
}
else if (isContent(index))
{
const treeBoundBox subBb(nodeBb.subBbox(octant));
if (subBb.overlaps(searchBox))
if (nodeBb.subOverlaps(octant, searchBox))
{
const labelList& indices = *(contents_[getContent(index)]);
@ -1839,9 +1719,7 @@ void Foam::dynamicIndexedOctree<Type>::findSphere
}
else if (isContent(index))
{
const treeBoundBox subBb(nodeBb.subBbox(octant));
if (subBb.overlaps(centre, radiusSqr))
if (nodeBb.subOverlaps(octant, centre, radiusSqr))
{
const labelList& indices = *(contents_[getContent(index)]);

22
src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
View File

@ -127,18 +127,8 @@ class dynamicIndexedOctree
//- Per node per octant whether is fully inside/outside/mixed.
mutable PackedList<2> nodeTypes_;
// Private Member Functions
//- Helper: does bb intersect a sphere around sample? Or is any
// corner point of bb closer than nearestDistSqr to sample.
// (bb is implicitly provided as parent bb + octant)
static bool overlaps
(
const treeBoundBox& parentBb,
const direction octant,
const scalar nearestDistSqr,
const point& sample
);
// Private Member Functions
// Construction
@ -492,16 +482,6 @@ public:
const vector& vec
);
//- Helper: does bb intersect a sphere around sample? Or is any
// corner point of bb closer than nearestDistSqr to sample.
static bool overlaps
(
const point& bbMin,
const point& bbMax,
const scalar nearestDistSqr,
const point& sample
);
//- Find near pairs and apply CompareOp to them.
// tree2 can be *this or different tree.
template<class CompareOp>