ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

fixed function for surface of revolution

Browse Source
This commit is contained in:
Joachim Schöberl 2016-09-07 09:06:40 +02:00
parent 1d70dcf08b
commit 1b55504456
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/csg/revolution.cpp
View File

@ -551,21 +551,26 @@ namespace netgen
} }
*/ */
INSOLID_TYPE RevolutionFace :: PointInFace (const Point<3> & p, const double eps) const /* INSOLID_TYPE */ bool RevolutionFace :: PointInFace (const Point<3> & p, const double eps) const
{ {
Point<2> p2d; Point<2> p2d;
CalcProj(p,p2d); CalcProj(p,p2d);
if (!spline -> InConvexHull(p2d, eps)) return false;
double val = spline_coefficient(0)*p2d(0)*p2d(0) + spline_coefficient(1)*p2d(1)*p2d(1) + spline_coefficient(2)*p2d(0)*p2d(1) + double val = spline_coefficient(0)*p2d(0)*p2d(0) + spline_coefficient(1)*p2d(1)*p2d(1) + spline_coefficient(2)*p2d(0)*p2d(1) +
spline_coefficient(3)*p2d(0) + spline_coefficient(4)*p2d(1) + spline_coefficient(5); spline_coefficient(3)*p2d(0) + spline_coefficient(4)*p2d(1) + spline_coefficient(5);
return (fabs(val) < eps);
/*
if(val > eps) if(val > eps)
return IS_OUTSIDE; return IS_OUTSIDE;
if(val < -eps) if(val < -eps)
return IS_INSIDE; return IS_INSIDE;
return DOES_INTERSECT; return DOES_INTERSECT;
*/
} }
@ -748,6 +753,15 @@ namespace netgen
return IS_INSIDE; return IS_INSIDE;
} }
void Revolution :: GetTangentialSurfaceIndices (const Point<3> & p,
Array<int> & surfind, double eps) const
{
for (int j = 0; j < faces.Size(); j++)
if (faces[j] -> PointInFace(p, eps))
if (!surfind.Contains (GetSurfaceId(j)))
surfind.Append (GetSurfaceId(j));
}
INSOLID_TYPE Revolution :: VecInSolid (const Point<3> & p, INSOLID_TYPE Revolution :: VecInSolid (const Point<3> & p,
const Vec<3> & v, const Vec<3> & v,
double eps) const double eps) const
@ -763,7 +777,7 @@ namespace netgen
Array<int> intersecting_faces; Array<int> intersecting_faces;
for(int i=0; i<faces.Size(); i++) for(int i=0; i<faces.Size(); i++)
if(faces[i]->PointInFace(p,eps) == DOES_INTERSECT) if(faces[i]->PointInFace(p,eps)) // == DOES_INTERSECT)
intersecting_faces.Append(i); intersecting_faces.Append(i);
Vec<3> hv; Vec<3> hv;

6
libsrc/csg/revolution.hpp
View File

@ -74,7 +74,7 @@ namespace netgen
const SplineSeg<2> & GetSpline(void) const {return *spline;} const SplineSeg<2> & GetSpline(void) const {return *spline;}
INSOLID_TYPE PointInFace (const Point<3> & p, const double eps) const; /* INSOLID_TYPE */ bool PointInFace (const Point<3> & p, const double eps) const;
void GetRawData(Array<double> & data) const; void GetRawData(Array<double> & data) const;
@ -125,6 +125,10 @@ namespace netgen
virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const; virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const;
virtual INSOLID_TYPE PointInSolid (const Point<3> & p, virtual INSOLID_TYPE PointInSolid (const Point<3> & p,
double eps) const; double eps) const;
virtual void GetTangentialSurfaceIndices (const Point<3> & p,
Array<int> & surfind, double eps) const;
virtual INSOLID_TYPE VecInSolid (const Point<3> & p, virtual INSOLID_TYPE VecInSolid (const Point<3> & p,
const Vec<3> & v, const Vec<3> & v,
double eps) const; double eps) const;