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

triangle, tetrahedron: Consolidate circumCircle/Sphere functions

Browse Source
This commit is contained in:
Will Bainbridge
2022-10-26 16:52:53 +01:00
parent df178284fd
commit 704b65f8de
6 changed files with 66 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/utilities/surface/surfaceFeatures/surfaceFeatures.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -616,24 +616,22 @@ namespace Foam
forAll(surf, fi)
{
const triPointRef& tri = surf[fi].tri(surf.points());
const point& triCentre = tri.circumCentre();
const scalar radiusSqr = min
(
sqr(4*tri.circumRadius()),
sqr(searchDistance)
);
const Tuple2<point, scalar> circle = tri.circumCircle();
const point& c = circle.first();
const scalar rSqr =
min(sqr(4*circle.second()), sqr(searchDistance));
pointIndexHitList hitList;
feMesh.allNearestFeatureEdges(triCentre, radiusSqr, hitList);
feMesh.allNearestFeatureEdges(c, rSqr, hitList);
featureProximity[fi] = min
(
feMesh.minDisconnectedDist(hitList),
featureProximity[fi]
);
feMesh.allNearestFeaturePoints(triCentre, radiusSqr, hitList);
feMesh.allNearestFeaturePoints(c, rSqr, hitList);
featureProximity[fi] = min
(
minDist(hitList),