research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUG: searchableCylinder: incorrect normal

Browse source
This commit is contained in:
mattijs 2014-07-23 09:17:31 +01:00
parent b0b62067d9
commit b79c69bfe3
1 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/meshTools/searchableSurface/searchableCylinder.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -662,21 +662,61 @@ void Foam::searchableCylinder::getNormal
vector v(info[i].hitPoint() - point1_);
// Decompose sample-point1 into normal and parallel component
scalar parallel = v & unitDir_;
scalar parallel = (v & unitDir_);
if (parallel < 0)
// Remove the parallel component and normalise
v -= parallel*unitDir_;
scalar magV = mag(v);
if (parallel <= 0)
{
normal[i] = -unitDir_;
if ((magV-radius_) < mag(parallel))
{
// above endcap
normal[i] = -unitDir_;
}
else
{
normal[i] = v/mag(v);
}
}
else if (parallel > magDir_)
else if (parallel <= 0.5*magDir_)
{
normal[i] = -unitDir_;
// See if endcap closer or sidewall
if (parallel <= mag(magV-radius_))
{
// above endcap
normal[i] = -unitDir_;
}
else
{
normal[i] = v/mag(v);
}
}
else
else if (parallel <= magDir_)
{
// Remove the parallel component
v -= parallel*unitDir_;
normal[i] = v/mag(v);
// See if endcap closer or sidewall
if ((magDir_-parallel) <= mag(magV-radius_))
{
// above endcap
normal[i] = unitDir_;
}
else
{
normal[i] = v/mag(v);
}
}
else // beyong cylinder
{
if ((magV-radius_) < (parallel-magDir_))
{
// above endcap
normal[i] = unitDir_;
}
else
{
normal[i] = v/mag(v);
}
}
}
}