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

modernization SpecialPointCalculation

Browse Source
This commit is contained in:
Joachim Schöberl 2020-10-17 15:23:53 +02:00
parent decb6c6e90
commit ad69a9d5a5
3 changed files with 193 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
libsrc/csg/solid.cpp
View File

@ -193,6 +193,125 @@ namespace netgen
INSOLID_TYPE Solid ::
PointInSolid (const Point<3> & p, double eps) const
{
switch (op)
{
case TERM: case TERM_REF:
return prim->PointInSolid (p, eps);
case SECTION:
{
auto res1 = s1->PointInSolid (p, eps);
auto res2 = s2->PointInSolid (p, eps);
if (res1 == IS_INSIDE && res2 == IS_INSIDE) return IS_INSIDE;
if (res1 == IS_OUTSIDE || res2 == IS_OUTSIDE) return IS_OUTSIDE;
return DOES_INTERSECT;
}
case UNION:
{
auto res1 = s1->PointInSolid (p, eps);
auto res2 = s2->PointInSolid (p, eps);
if (res1 == IS_INSIDE || res2 == IS_INSIDE) return IS_INSIDE;
if (res1 == IS_OUTSIDE && res2 == IS_OUTSIDE) return IS_OUTSIDE;
return DOES_INTERSECT;
}
case SUB:
{
auto res1 = s1->PointInSolid (p, eps);
switch (res1)
{
case IS_INSIDE: return IS_OUTSIDE;
case IS_OUTSIDE: return IS_INSIDE;
default: return DOES_INTERSECT;
}
}
case ROOT:
return s1->PointInSolid (p, eps);
}
}
INSOLID_TYPE Solid ::
VecInSolid (const Point<3> & p, const Vec<3> & v, double eps) const
{
switch (op)
{
case TERM: case TERM_REF:
return prim->VecInSolid (p, v, eps);
case SECTION:
{
auto res1 = s1->VecInSolid (p, v, eps);
auto res2 = s2->VecInSolid (p, v, eps);
if (res1 == IS_INSIDE && res2 == IS_INSIDE) return IS_INSIDE;
if (res1 == IS_OUTSIDE || res2 == IS_OUTSIDE) return IS_OUTSIDE;
return DOES_INTERSECT;
}
case UNION:
{
auto res1 = s1->VecInSolid (p, v, eps);
auto res2 = s2->VecInSolid (p, v, eps);
if (res1 == IS_INSIDE || res2 == IS_INSIDE) return IS_INSIDE;
if (res1 == IS_OUTSIDE && res2 == IS_OUTSIDE) return IS_OUTSIDE;
return DOES_INTERSECT;
}
case SUB:
{
auto res1 = s1->VecInSolid (p, v, eps);
switch (res1)
{
case IS_INSIDE: return IS_OUTSIDE;
case IS_OUTSIDE: return IS_INSIDE;
default: return DOES_INTERSECT;
}
}
case ROOT:
return s1->VecInSolid (p, v, eps);
}
}
// checks if lim s->0 lim t->0 p + t(v1 + s v2) in solid
INSOLID_TYPE Solid ::
VecInSolid2 (const Point<3> & p, const Vec<3> & v1,
const Vec<3> & v2, double eps) const
{
switch (op)
{
case TERM: case TERM_REF:
return prim->VecInSolid2 (p, v1, v2, eps);
case SECTION:
{
auto res1 = s1->VecInSolid2 (p, v1, v2, eps);
auto res2 = s2->VecInSolid2 (p, v1, v2, eps);
if (res1 == IS_INSIDE && res2 == IS_INSIDE) return IS_INSIDE;
if (res1 == IS_OUTSIDE || res2 == IS_OUTSIDE) return IS_OUTSIDE;
return DOES_INTERSECT;
}
case UNION:
{
auto res1 = s1->VecInSolid2 (p, v1, v2, eps);
auto res2 = s2->VecInSolid2 (p, v1, v2, eps);
if (res1 == IS_INSIDE || res2 == IS_INSIDE) return IS_INSIDE;
if (res1 == IS_OUTSIDE && res2 == IS_OUTSIDE) return IS_OUTSIDE;
return DOES_INTERSECT;
}
case SUB:
{
auto res1 = s1->VecInSolid2 (p, v1, v2, eps);
switch (res1)
{
case IS_INSIDE: return IS_OUTSIDE;
case IS_OUTSIDE: return IS_INSIDE;
default: return DOES_INTERSECT;
}
}
case ROOT:
return s1->VecInSolid2 (p, v1, v2, eps);
}
}
bool Solid :: IsIn (const Point<3> & p, double eps) const bool Solid :: IsIn (const Point<3> & p, double eps) const
{ {

8
libsrc/csg/solid.hpp
View File

@ -102,6 +102,14 @@ namespace netgen
// geometric tests // geometric tests
INSOLID_TYPE PointInSolid (const Point<3> & p, double eps) const;
INSOLID_TYPE VecInSolid (const Point<3> & p, const Vec<3> & v, double eps) const;
// checks if lim s->0 lim t->0 p + t(v1 + s v2) in solid
INSOLID_TYPE VecInSolid2 (const Point<3> & p, const Vec<3> & v1,
const Vec<3> & v2, double eps) const;
bool IsIn (const Point<3> & p, double eps = 1e-6) const; bool IsIn (const Point<3> & p, double eps = 1e-6) const;
bool IsStrictIn (const Point<3> & p, double eps = 1e-6) const; bool IsStrictIn (const Point<3> & p, double eps = 1e-6) const;
bool VectorIn (const Point<3> & p, const Vec<3> & v, double eps = 1e-6) const; bool VectorIn (const Point<3> & p, const Vec<3> & v, double eps = 1e-6) const;

157
libsrc/csg/specpoin.cpp
View File

@ -286,35 +286,29 @@ namespace netgen
dynamic_cast<const Plane*> (geometry->GetSurface(locsurf[k3])), dynamic_cast<const Plane*> (geometry->GetSurface(locsurf[k3])),
pts); pts);
for (int j = 0; j < pts.Size(); j++) for (auto pnt : pts)
if (Dist (pts[j], box.Center()) < box.Diam()/2) if (Dist (pnt, box.Center()) < box.Diam()/2)
{
auto tansol = sol -> TangentialSolid (pnt, surfids, 1e-9*size);
if (tansol)
{ {
// Solid * tansol;
auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size);
if(!tansol)
continue;
bool ok1 = false, ok2 = false, ok3 = false; bool ok1 = false, ok2 = false, ok3 = false;
int rep1 = geometry->GetSurfaceClassRepresentant(locsurf[k1]); int rep1 = geometry->GetSurfaceClassRepresentant(locsurf[k1]);
int rep2 = geometry->GetSurfaceClassRepresentant(locsurf[k2]); int rep2 = geometry->GetSurfaceClassRepresentant(locsurf[k2]);
int rep3 = geometry->GetSurfaceClassRepresentant(locsurf[k3]); int rep3 = geometry->GetSurfaceClassRepresentant(locsurf[k3]);
for(int jj=0; jj<surfids.Size(); jj++)
for (auto surfid : surfids)
{ {
int actrep = geometry->GetSurfaceClassRepresentant(surfids[jj]); int actrep = geometry->GetSurfaceClassRepresentant(surfid);
if (actrep == rep1) ok1 = true; if (actrep == rep1) ok1 = true;
if (actrep == rep2) ok2 = true; if (actrep == rep2) ok2 = true;
if (actrep == rep3) ok3 = true; if (actrep == rep3) ok3 = true;
} }
if (ok1 && ok2 && ok3)
if (tansol && ok1 && ok2 && ok3) if (AddPoint (pnt, layer))
// if (sol -> IsIn (pts[j], 1e-6*size) && !sol->IsStrictIn (pts[j], 1e-6*size)) (*testout) << "cross point found, 1: " << pnt << endl;
{
if (AddPoint (pts[j], layer))
(*testout) << "cross point found, 1: " << pts[j] << endl;
} }
// delete tansol;
} }
} }
@ -330,38 +324,29 @@ namespace netgen
qsurf, pts); qsurf, pts);
//(*testout) << "checking pot. crosspoints: " << pts << endl; //(*testout) << "checking pot. crosspoints: " << pts << endl;
for (int j = 0; j < pts.Size(); j++) for (auto pnt : pts)
if (Dist (pts[j], box.Center()) < box.Diam()/2) if (Dist (pnt, box.Center()) < box.Diam()/2)
{
auto tansol = sol -> TangentialSolid (pnt, surfids, 1e-9*size);
if (tansol)
{ {
// Solid * tansol;
auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size);
if(!tansol)
continue;
bool ok1 = false, ok2 = false, ok3 = true;//false; bool ok1 = false, ok2 = false, ok3 = true;//false;
int rep1 = geometry->GetSurfaceClassRepresentant(locsurf[k1]); int rep1 = geometry->GetSurfaceClassRepresentant(locsurf[k1]);
int rep2 = geometry->GetSurfaceClassRepresentant(locsurf[k2]); int rep2 = geometry->GetSurfaceClassRepresentant(locsurf[k2]);
//int rep3 = geometry->GetSurfaceClassRepresentant(quadi);
for(int jj=0; jj<surfids.Size(); jj++) for (auto surfid : surfids)
{ {
int actrep = geometry->GetSurfaceClassRepresentant(surfids[jj]); int actrep = geometry->GetSurfaceClassRepresentant(surfid);
if (actrep == rep1) ok1 = true; if (actrep == rep1) ok1 = true;
if (actrep == rep2) ok2 = true; if (actrep == rep2) ok2 = true;
//if(actrep == rep3) ok3 = true;
} }
if (ok1 && ok2 && ok3)
if (tansol && ok1 && ok2 && ok3) if (AddPoint (pnt, layer))
//if (sol -> IsIn (pts[j], 1e-6*size) && !sol->IsStrictIn (pts[j], 1e-6*size) ) (*testout) << "cross point found, 2: " << pnt << endl;
{ }
if (AddPoint (pts[j], layer))
(*testout) << "cross point found, 2: " << pts[j] << endl;
}
// delete tansol;
} }
} }
for (int k1 = 0; k1 < numprim; k1++) for (int k1 = 0; k1 < numprim; k1++)
if (k1 != quadi) if (k1 != quadi)
@ -372,16 +357,11 @@ namespace netgen
for (int j = 0; j < pts.Size(); j++) for (int j = 0; j < pts.Size(); j++)
if (Dist (pts[j], box.Center()) < box.Diam()/2) if (Dist (pts[j], box.Center()) < box.Diam()/2)
{ {
// Solid * tansol;
auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size); auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size);
if (tansol) if (tansol)
// sol -> IsIn (pts[j], 1e-6*size) && !sol->IsStrictIn (pts[j], 1e-6*size) )
{
if (AddPoint (pts[j], layer)) if (AddPoint (pts[j], layer))
(*testout) << "extremal point found, 1: " << pts[j] << endl; (*testout) << "extremal point found, 1: " << pts[j] << endl;
} }
// delete tansol;
}
} }
} }
@ -395,8 +375,6 @@ namespace netgen
NgArray<Point<3> > pts; NgArray<Point<3> > pts;
NgArray<int> surfids; NgArray<int> surfids;
for (int k1 = 0; k1 < numprim; k1++) for (int k1 = 0; k1 < numprim; k1++)
for (int k2 = 0; k2 < k1; k2++) for (int k2 = 0; k2 < k1; k2++)
for (int k3 = 0; k3 < k2; k3++) for (int k3 = 0; k3 < k2; k3++)
@ -409,16 +387,14 @@ namespace netgen
for (int j = 0; j < pts.Size(); j++) for (int j = 0; j < pts.Size(); j++)
if (Dist (pts[j], box.Center()) < box.Diam()/2) if (Dist (pts[j], box.Center()) < box.Diam()/2)
{ {
// Solid * tansol;
auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size); auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size);
if (!tansol) continue;
if(!tansol)
continue;
bool ok1 = false, ok2 = false, ok3 = false; bool ok1 = false, ok2 = false, ok3 = false;
int rep1 = geometry->GetSurfaceClassRepresentant(locsurf[k1]); int rep1 = geometry->GetSurfaceClassRepresentant(locsurf[k1]);
int rep2 = geometry->GetSurfaceClassRepresentant(locsurf[k2]); int rep2 = geometry->GetSurfaceClassRepresentant(locsurf[k2]);
int rep3 = geometry->GetSurfaceClassRepresentant(locsurf[k3]); int rep3 = geometry->GetSurfaceClassRepresentant(locsurf[k3]);
for(int jj=0; jj<surfids.Size(); jj++) for(int jj=0; jj<surfids.Size(); jj++)
{ {
int actrep = geometry->GetSurfaceClassRepresentant(surfids[jj]); int actrep = geometry->GetSurfaceClassRepresentant(surfids[jj]);
@ -427,15 +403,10 @@ namespace netgen
if(actrep == rep3) ok3 = true; if(actrep == rep3) ok3 = true;
} }
if (ok1 && ok2 && ok3)
if (tansol && ok1 && ok2 && ok3)
// if (sol -> IsIn (pts[j], 1e-6*size) && !sol->IsStrictIn (pts[j], 1e-6*size))
{
if (AddPoint (pts[j], layer)) if (AddPoint (pts[j], layer))
(*testout) << "cross point found, 1: " << pts[j] << endl; (*testout) << "cross point found, 1: " << pts[j] << endl;
} }
// delete tansol;
}
} }
@ -449,30 +420,23 @@ namespace netgen
for (int j = 0; j < pts.Size(); j++) for (int j = 0; j < pts.Size(); j++)
if (Dist (pts[j], box.Center()) < box.Diam()/2) if (Dist (pts[j], box.Center()) < box.Diam()/2)
{ {
// Solid * tansol;
auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size); auto tansol = sol -> TangentialSolid (pts[j], surfids, 1e-9*size);
if (tansol) if (tansol)
// sol -> IsIn (pts[j], 1e-6*size) && !sol->IsStrictIn (pts[j], 1e-6*size) )
{
if (AddPoint (pts[j], layer)) if (AddPoint (pts[j], layer))
(*testout) << "extremal point found, spheres: " << pts[j] << endl; (*testout) << "extremal point found, spheres: " << pts[j] << endl;
} }
// delete tansol;
}
} }
return; return;
} }
if (numprim == 2 &&
(typeid(*geometry->GetSurface(locsurf[0])) == typeid(RevolutionFace&)) && auto rev0 = dynamic_cast<const RevolutionFace*> (geometry->GetSurface(locsurf[0]));
(typeid(*geometry->GetSurface(locsurf[1])) == typeid(RevolutionFace&))) auto rev1 = dynamic_cast<const RevolutionFace*> (geometry->GetSurface(locsurf[1]));
if (numprim == 2 && rev0 && rev1)
{ {
NgArray<Point<3>> pts; NgArray<Point<3>> pts;
bool check = bool check = ComputeExtremalPoints (rev0, rev1, pts);
ComputeExtremalPoints (static_cast<const RevolutionFace*> (geometry->GetSurface(locsurf[0])),
static_cast<const RevolutionFace*> (geometry->GetSurface(locsurf[1])),
pts);
if (check) if (check)
{ {
// int cnt_inbox = 0; // int cnt_inbox = 0;
@ -489,7 +453,6 @@ namespace netgen
*/ */
} }
} }
} // end if (numprim <= check_crosspoint) } // end if (numprim <= check_crosspoint)
@ -521,7 +484,6 @@ namespace netgen
(*testout) << "k1,2,3 = " << k1 << "," << k2 << "," << k3 << ", nc = " << nc << ", deg = " << deg << endl; (*testout) << "k1,2,3 = " << k1 << "," << k2 << "," << k3 << ", nc = " << nc << ", deg = " << deg << endl;
#endif #endif
if (!nc && !deg) decision = 0; if (!nc && !deg) decision = 0;
if (nc) surecrossp = 1; if (nc) surecrossp = 1;
} }
@ -1829,10 +1791,8 @@ namespace netgen
continue; continue;
// Solid * locsol;
auto locsol = sol -> TangentialSolid (p, surfind, ideps*geomsize); auto locsol = sol -> TangentialSolid (p, surfind, ideps*geomsize);
rep_surfind.SetSize (surfind.Size()); rep_surfind.SetSize (surfind.Size());
int num_indep_surfs = 0; int num_indep_surfs = 0;
@ -1859,10 +1819,10 @@ namespace netgen
if (surf) if (surf)
{ {
// locsol -> GetSurfaceIndices (surfind); // locsol -> GetSurfaceIndices (surfind);
bool hassurf = 0; bool hassurf = false;
for (int m = 0; m < surfind.Size(); m++) for (int m = 0; m < surfind.Size(); m++)
if (ageometry.GetSurface(surfind[m]) == surf) if (ageometry.GetSurface(surfind[m]) == surf)
hassurf = 1; hassurf = true;
if (!hassurf) if (!hassurf)
continue; continue;
@ -1955,19 +1915,14 @@ namespace netgen
CalcInverse (mat, inv); CalcInverse (mat, inv);
t2 = inv * rhs; t2 = inv * rhs;
// t2 = StableSolve (mat, rhs);
#ifdef DEVELOP #ifdef DEVELOP
*testout << "t = " << t << ", t2 = " << t2 << endl; *testout << "t = " << t << ", t2 = " << t2 << endl;
#endif #endif
/* /*
ageometry.GetIndependentSurfaceIndices ageometry.GetIndependentSurfaceIndices
(locsol, p, t, surfind2); (locsol, p, t, surfind2);
*/ */
// Solid * locsol2;
auto locsol2 = locsol -> TangentialSolid3 (p, t, t2, surfind2, ideps*geomsize); auto locsol2 = locsol -> TangentialSolid3 (p, t, t2, surfind2, ideps*geomsize);
if (!locsol2) continue; if (!locsol2) continue;
@ -2009,13 +1964,10 @@ namespace netgen
Vec<3> nv = Vec<3> nv =
ageometry.GetSurface(surfind2[l]) -> GetNormalVector(p); ageometry.GetSurface(surfind2[l]) -> GetNormalVector(p);
Vec<3> m1 = Cross (t, nv); Vec<3> m1 = Cross (t, nv);
Vec<3> m2 = -m1; Vec<3> m2 = -m1;
bool isface1 = 0, isface2 = 0; bool isface1 = 0, isface2 = 0;
// Solid * locsol3;
// locsol2 -> TangentialSolid2 (p, m1, locsol3, surfind3, 1e-9*geomsize); // locsol2 -> TangentialSolid2 (p, m1, locsol3, surfind3, 1e-9*geomsize);
auto locsol3 = locsol -> TangentialEdgeSolid (p, t, t2, m1, surfind3, ideps*geomsize); auto locsol3 = locsol -> TangentialEdgeSolid (p, t, t2, m1, surfind3, ideps*geomsize);
#ifdef DEVELOP #ifdef DEVELOP
@ -2025,7 +1977,6 @@ namespace netgen
if (surfind3.Contains(surfind2[l])) if (surfind3.Contains(surfind2[l]))
isface1 = 1; isface1 = 1;
// delete locsol3;
// locsol2 -> TangentialSolid2 (p, m2, locsol3, surfind3, 1e-9*geomsize); // locsol2 -> TangentialSolid2 (p, m2, locsol3, surfind3, 1e-9*geomsize);
locsol3 = locsol -> TangentialEdgeSolid (p, t, t2, m2, surfind3, ideps*geomsize); locsol3 = locsol -> TangentialEdgeSolid (p, t, t2, m2, surfind3, ideps*geomsize);
@ -2038,7 +1989,6 @@ namespace netgen
if (surfind3.Contains(surfind2[l])) if (surfind3.Contains(surfind2[l]))
isface2 = 1; isface2 = 1;
// delete locsol3;
if (isface1 != isface2) if (isface1 != isface2)
cnt_tang_faces++; cnt_tang_faces++;
@ -2051,7 +2001,6 @@ namespace netgen
if (cnt_tang_faces < 1) if (cnt_tang_faces < 1)
ok = false; ok = false;
// delete locsol2;
if (!ok) continue; if (!ok) continue;
} }
@ -2088,8 +2037,12 @@ namespace netgen
!locsol->VectorStrictIn (p, t2b, 1e-6*geomsize)); !locsol->VectorStrictIn (p, t2b, 1e-6*geomsize));
bool isfacenew = bool isfacenew =
locsol -> VecInSolid2(p, t, s, 1e-6*geomsize) == DOES_INTERSECT ||
locsol -> VecInSolid2(p, t, -s, 1e-6*geomsize) == DOES_INTERSECT;
/*
(locsol->VectorIn2 (p, t, s, 1e-6*geomsize) && !locsol->VectorStrictIn2 (p, t, s, 1e-6*geomsize)) || (locsol->VectorIn2 (p, t, s, 1e-6*geomsize) && !locsol->VectorStrictIn2 (p, t, s, 1e-6*geomsize)) ||
(locsol->VectorIn2 (p, t, -s, 1e-6*geomsize) && !locsol->VectorStrictIn2 (p, t, -s, 1e-6*geomsize)); (locsol->VectorIn2 (p, t, -s, 1e-6*geomsize) && !locsol->VectorStrictIn2 (p, t, -s, 1e-6*geomsize));
*/
bool isface = isfacenew; bool isface = isfacenew;
@ -2182,46 +2135,15 @@ namespace netgen
} }
} }
// delete locsol;
} }
} }
/*
NgBitArray testuncond (specpoints.Size());
testuncond.Clear();
for(int i = 0; i<specpoints.Size(); i++)
{
if(testuncond.Test(i))
continue;
NgArray<int> same;
same.Append(i);
for(int j = i+1; j<specpoints.Size(); j++)
{
if(Dist(specpoints[i].p,specpoints[j].p) < 1e-20)
{
same.Append(j);
testuncond.Set(j);
}
}
if(same.Size() < 3)
for(int j=0; j<same.Size(); j++)
{
(*testout) << "setting " << specpoints[same[j]].p << "; " << specpoints[same[j]].v << "; "
<<specpoints[same[j]].unconditional << " to conditional" << endl;
specpoints[same[j]].unconditional=0;
}
}
*/
// if special point is unconditional on some solid, // if special point is unconditional on some solid,
// it must be unconditional everywhere: // it must be unconditional everywhere:
NgBitArray uncond (apoints.Size()); BitArray uncond (apoints.Size());
uncond.Clear(); uncond.Clear();
for (int i = 0; i < specpoints.Size(); i++) for (int i = 0; i < specpoints.Size(); i++)
@ -2229,7 +2151,6 @@ namespace netgen
uncond.Set (specpoint2point[i]); uncond.Set (specpoint2point[i]);
for (int i = 0; i < specpoints.Size(); i++) for (int i = 0; i < specpoints.Size(); i++)
specpoints[i].unconditional = specpoints[i].unconditional = uncond.Test (specpoint2point[i]);
uncond.Test (specpoint2point[i]) ? 1 : 0;
} }
} }