zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

surfaceFeatureExtract: Refactored pointIndexHitList functionality into corresponding core classes

Browse Source
This commit is contained in:
Henry Weller
2018-04-10 23:08:56 +01:00
parent 388b3107c8
commit 3e1ab675f6
10 changed files with 197 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -475,9 +475,9 @@ int main(int argc, char *argv[])
scalarField featureProximity(surf.size(), searchDistance);
forAll(surf, fI)
forAll(surf, fi)
{
const triPointRef& tri = surf[fI].tri(surf.points());
const triPointRef& tri = surf[fi].tri(surf.points());
const point& triCentre = tri.circumCentre();
const scalar radiusSqr = min
@ -486,26 +486,21 @@ int main(int argc, char *argv[])
sqr(searchDistance)
);
List<pointIndexHit> hitList;
pointIndexHitList hitList;
feMesh.allNearestFeatureEdges(triCentre, radiusSqr, hitList);
featureProximity[fI] =
calcProximityOfFeatureEdges
(
feMesh,
hitList,
featureProximity[fI]
);
featureProximity[fi] = min
(
feMesh.minDisconnectedDist(hitList),
featureProximity[fi]
);
feMesh.allNearestFeaturePoints(triCentre, radiusSqr, hitList);
featureProximity[fI] =
calcProximityOfFeaturePoints
(
hitList,
featureProximity[fI]
);
featureProximity[fi] = min
(
minDist(hitList),
featureProximity[fi]
);
}
triSurfaceScalarField featureProximityField

18
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.H
View File

@ -32,6 +32,7 @@ Description
#include "surfaceFeatures.H"
#include "extendedFeatureEdgeMesh.H"
#include "triSurfaceFields.H"
#include "pointIndexHitList.H"
#include "plane.H"
#include "triadField.H"
@ -43,19 +44,6 @@ namespace Foam
extern const scalar externalAngleTolerance;
extern const scalar externalToleranceCosAngle;
scalar calcProximityOfFeaturePoints
(
const List<pointIndexHit>& hitList,
const scalar defaultCellSize
);
scalar calcProximityOfFeatureEdges
(
const extendedFeatureEdgeMesh& efem,
const List<pointIndexHit>& hitList,
const scalar defaultCellSize
);
//- Deletes all edges inside/outside bounding box from set.
void deleteBox
(
@ -84,7 +72,7 @@ namespace Foam
const point& end,
const vector& normal,
const vectorField& normals,
const List<pointIndexHit>& hitInfo
const pointIndexHitList& hitInfo
);
void drawHitProblem
@ -94,7 +82,7 @@ namespace Foam
const point& start,
const point& p,
const point& end,
const List<pointIndexHit>& hitInfo
const pointIndexHitList& hitInfo
);
//- Unmark non-manifold edges if individual triangles are not features

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

@ -51,100 +51,6 @@ const Foam::scalar Foam::externalToleranceCosAngle
);
Foam::scalar Foam::calcProximityOfFeaturePoints
(
const List<pointIndexHit>& hitList,
const scalar defaultCellSize
)
{
scalar minDist = defaultCellSize;
for
(
label hI1 = 0;
hI1 < hitList.size() - 1;
++hI1
)
{
const pointIndexHit& pHit1 = hitList[hI1];
if (pHit1.hit())
{
for
(
label hI2 = hI1 + 1;
hI2 < hitList.size();
++hI2
)
{
const pointIndexHit& pHit2 = hitList[hI2];
if (pHit2.hit())
{
scalar curDist = mag(pHit1.hitPoint() - pHit2.hitPoint());
minDist = min(curDist, minDist);
}
}
}
}
return minDist;
}
Foam::scalar Foam::calcProximityOfFeatureEdges
(
const extendedFeatureEdgeMesh& efem,
const List<pointIndexHit>& hitList,
const scalar defaultCellSize
)
{
scalar minDist = defaultCellSize;
for
(
label hI1 = 0;
hI1 < hitList.size() - 1;
++hI1
)
{
const pointIndexHit& pHit1 = hitList[hI1];
if (pHit1.hit())
{
const edge& e1 = efem.edges()[pHit1.index()];
for
(
label hI2 = hI1 + 1;
hI2 < hitList.size();
++hI2
)
{
const pointIndexHit& pHit2 = hitList[hI2];
if (pHit2.hit())
{
const edge& e2 = efem.edges()[pHit2.index()];
// Don't refine if the edges are connected to each other
if (!e1.connected(e2))
{
scalar curDist =
mag(pHit1.hitPoint() - pHit2.hitPoint());
minDist = min(curDist, minDist);
}
}
}
}
}
return minDist;
}
void Foam::deleteBox
(
const triSurface& surf,
@ -202,7 +108,7 @@ void Foam::drawHitProblem
const point& start,
const point& p,
const point& end,
const List<pointIndexHit>& hitInfo
const pointIndexHitList& hitInfo
)
{
Info<< nl << "# findLineAll did not hit its own face."
@ -225,18 +131,18 @@ void Foam::drawHitProblem
Info<< "f 4 5 6" << endl;
forAll(hitInfo, hI)
forAll(hitInfo, hi)
{
label hFI = hitInfo[hI].index();
label hFI = hitInfo[hi].index();
meshTools::writeOBJ(Info, surf.points()[surf[hFI][0]]);
meshTools::writeOBJ(Info, surf.points()[surf[hFI][1]]);
meshTools::writeOBJ(Info, surf.points()[surf[hFI][2]]);
Info<< "f "
<< 3*hI + 7 << " "
<< 3*hI + 8 << " "
<< 3*hI + 9
<< 3*hi + 7 << " "
<< 3*hi + 8 << " "
<< 3*hi + 9
<< endl;
}
}