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

BUG: searchableCylinder : handling of points on axis

Browse Source
This commit is contained in:
mattijs
2010-06-04 15:30:53 +01:00
parent 2db6aa4cfb
commit c9f9d384e5
1 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/meshTools/searchableSurface/searchableCylinder.C
View File

@ -60,45 +60,66 @@ Foam::pointIndexHit Foam::searchableCylinder::findNearest
// Decompose sample-point1 into normal and parallel component // Decompose sample-point1 into normal and parallel component
scalar parallel = (v & unitDir_); scalar parallel = (v & unitDir_);
// Remove the parallel component // Remove the parallel component and normalise
v -= parallel*unitDir_; v -= parallel*unitDir_;
scalar magV = mag(v); scalar magV = mag(v);
if (magV < ROOTVSMALL)
{
v = vector::zero;
}
else
{
v /= magV;
}
if (parallel <= 0) if (parallel <= 0)
{ {
// nearest is at point1 end cap. Clip to radius. // nearest is at point1 end cap. Clip to radius.
if (magV < ROOTVSMALL) info.setPoint(point1_ + min(magV, radius_)*v);
{
info.setPoint(point1_);
}
else
{
//info.setPoint(point1_ + min(magV, radius_)*v/magV);
info.setPoint(point1_ + radius_*(v/magV));
}
} }
else if (parallel >= magDir_) else if (parallel >= magDir_)
{ {
// nearest is at point2 // nearest is at point2 end cap. Clip to radius.
if (magV < ROOTVSMALL) info.setPoint(point2_ + min(magV, radius_)*v);
{
info.setPoint(point2_);
} }
else else
{ {
info.setPoint(point2_ + min(magV, radius_)*v/magV); // inbetween endcaps. Might either be nearer endcaps or cylinder wall
// distance to endpoint: parallel or parallel-magDir
// distance to cylinder wall: magV-radius_
// Nearest cylinder point
point cylPt = sample + (radius_-magV)*v;
if (parallel < 0.5*magDir_)
{
// Project onto p1 endcap
point end1Pt = point1_ + min(magV, radius_)*v;
if (magSqr(sample-cylPt) < magSqr(sample-end1Pt))
{
info.setPoint(cylPt);
}
else
{
info.setPoint(end1Pt);
} }
} }
else else
{ {
if (magV < ROOTVSMALL) // Project onto p2 endcap
point end2Pt = point2_ + min(magV, radius_)*v;
if (magSqr(sample-cylPt) < magSqr(sample-end2Pt))
{ {
info.setPoint(point1_ + parallel*unitDir_); info.setPoint(cylPt);
} }
else else
{ {
// Project onto radius info.setPoint(end2Pt);
info.setPoint(point1_ + parallel*unitDir_ + radius_*v/magV); }
} }
} }