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

surfaceFeatureExtract: Refactored core line and edge functions corresponding classes

Browse Source
This commit is contained in:
Henry Weller
2018-04-10 21:52:44 +01:00
parent 21d5267b6f
commit a908847b9c
6 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractUtilities.C
View File

@ -51,23 +51,6 @@ const Foam::scalar Foam::externalToleranceCosAngle
);
bool Foam::edgesConnected(const edge& e1, const edge& e2)
{
if
(
e1.start() == e2.start()
|| e1.start() == e2.end()
|| e1.end() == e2.start()
|| e1.end() == e2.end()
)
{
return true;
}
return false;
}
Foam::scalar Foam::calcProximityOfFeaturePoints
(
const List<pointIndexHit>& hitList,
@ -146,7 +129,7 @@ Foam::scalar Foam::calcProximityOfFeatureEdges
const edge& e2 = efem.edges()[pHit2.index()];
// Don't refine if the edges are connected to each other
if (!edgesConnected(e1, e2))
if (!e1.connected(e2))
{
scalar curDist =
mag(pHit1.hitPoint() - pHit2.hitPoint());
@ -165,7 +148,7 @@ Foam::scalar Foam::calcProximityOfFeatureEdges
void Foam::deleteBox
(
const triSurface& surf,
const treeBoundBox& bb,
const boundBox& bb,
const bool removeInside,
List<surfaceFeatures::edgeStatus>& edgeStat
)
@ -182,25 +165,6 @@ void Foam::deleteBox
}
bool Foam::onLine(const point& p, const linePointRef& line)
{
const point& a = line.start();
const point& b = line.end();
if
(
( p.x() < min(a.x(), b.x()) || p.x() > max(a.x(), b.x()) )
|| ( p.y() < min(a.y(), b.y()) || p.y() > max(a.y(), b.y()) )
|| ( p.z() < min(a.z(), b.z()) || p.z() > max(a.z(), b.z()) )
)
{
return false;
}
return true;
}
void Foam::deleteEdges
(
const triSurface& surf,
@ -223,7 +187,7 @@ void Foam::deleteEdges
point featPoint = intersect * (p1 - p0) + p0;
if (!onLine(featPoint, line))
if (!line.insideBoundBox(featPoint))
{
edgeStat[edgeI] = surfaceFeatures::NONE;
}