ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-13 22:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

cone bug fix

Browse Source
This commit is contained in:
Joachim Schoeberl 2010-03-16 22:16:47 +00:00
parent 0bf7d1228e
commit fc095693d9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/csg/algprim.cpp
View File

@ -1338,6 +1338,7 @@ namespace netgen
// R(z(P)) = t1vec * P + t1 = rb * z + ra * (1-z) // R(z(P)) = t1vec * P + t1 = rb * z + ra * (1-z)
// r(P)^2 =||P-a||^2 - ||a-b||^2 z^2k // r(P)^2 =||P-a||^2 - ||a-b||^2 z^2k
cosphi = vabl / sqrt (vabl*vabl+sqr(ra-rb));
t0vec = vab; t0vec = vab;
t0vec /= (vabl * vabl); t0vec /= (vabl * vabl);
@ -1380,21 +1381,24 @@ namespace netgen
INSOLID_TYPE Cone :: BoxInSolid (const BoxSphere<3> & box) const INSOLID_TYPE Cone :: BoxInSolid (const BoxSphere<3> & box) const
{ {
double rp, dist;
Vec<3> cv(box.Center()); Vec<3> cv(box.Center());
rp = cv * t1vec + t1; double rzp = cv * t1vec + t1;
dist = sqrt (CalcFunctionValue(box.Center()) *max2(ra,rb) + rp * rp) - rp; double dist = sqrt (CalcFunctionValue(box.Center()) *max2(ra,rb) + rzp * rzp) - rzp;
if (dist - box.Diam() > 0) return IS_OUTSIDE; dist *= cosphi;
if (dist + box.Diam() < 0) return IS_INSIDE; INSOLID_TYPE res = DOES_INTERSECT;
return DOES_INTERSECT;
if (dist - box.Diam() > 0) res = IS_OUTSIDE;
if (dist + box.Diam() < 0) res = IS_INSIDE;
return res;
} }
double Cone :: HesseNorm () const double Cone :: HesseNorm () const
{ {
// cout << "2/minr = " << 2/minr << ", cxx .. = " << cxx << ", " << cyy << ", " << czz << endl;
return 2 / minr; return 2 / minr;
} }

1
libsrc/csg/algprim.hpp
View File

@ -326,6 +326,7 @@ namespace netgen
Vec<3> vab, t0vec, t1vec; Vec<3> vab, t0vec, t1vec;
/// ///
double vabl, t0, t1; double vabl, t0, t1;
double cosphi;
public: public:
/// ///
Cone (const Point<3> & aa, const Point<3> & ab, double ara, double arb); Cone (const Point<3> & aa, const Point<3> & ab, double ara, double arb);