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

fix for FindInnerPoint - crash

Browse Source
This commit is contained in:
Joachim Schoeberl 2015-01-12 10:42:02 +00:00
parent 1ebe4a3f6b
commit dafb55f4a5
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libsrc/meshing/adfront3.cpp
View File

@ -661,18 +661,19 @@ void AdFront3 :: GetGroup (int fi,
Array<INDEX> & findex) Array<INDEX> & findex)
{ {
// static Array<char> pingroup; // static Array<char> pingroup;
int i, j, changed; int changed;
pingroup.SetSize(points.Size()); pingroup.SetSize(points.Size());
pingroup = 0; pingroup = 0;
for (j = 1; j <= 3; j++) for (int j = 1; j <= 3; j++)
pingroup.Elem (faces.Get(fi).Face().PNum(j)) = 1; pingroup.Elem (faces.Get(fi).Face().PNum(j)) = 1;
do do
{ {
changed = 0; changed = 0;
/*
for (i = 1; i <= faces.Size(); i++) for (i = 1; i <= faces.Size(); i++)
if (faces.Get(i).Valid()) if (faces.Get(i).Valid())
{ {
@ -691,28 +692,45 @@ void AdFront3 :: GetGroup (int fi,
changed = 1; changed = 1;
} }
} }
*/
for (auto & f : faces)
if (f.Valid())
{
const MiniElement2d & face = f.Face();
int fused = 0;
for (int j = 1; j <= 3; j++)
if (pingroup.Elem(face.PNum(j)))
fused++;
if (fused >= 2)
for (int j = 1; j <= 3; j++)
if (!pingroup.Elem(face.PNum(j)))
{
pingroup.Elem(face.PNum(j)) = 1;
changed = 1;
}
}
} }
while (changed); while (changed);
// static Array<int> invpindex;
invpindex.SetSize (points.Size()); invpindex.SetSize (points.Size());
for (PointIndex pi = points.Begin(); pi < points.End(); pi++) // for (PointIndex pi = points.Begin(); pi < points.End(); pi++)
if (points.Get(i).Valid()) for (PointIndex pi : points.Range())
if (points[pi].Valid())
{ {
grouppoints.Append (points[pi].P()); grouppoints.Append (points[pi].P());
pindex.Append (pi); pindex.Append (pi);
invpindex[pi] = pindex.Size(); invpindex[pi] = pindex.Size();
} }
for (i = 1; i <= faces.Size(); i++) for (int i = 1; i <= faces.Size(); i++)
if (faces.Get(i).Valid()) if (faces.Get(i).Valid())
{ {
int fused = 0; int fused = 0;
for (j = 1; j <= 3; j++) for (int j = 1; j <= 3; j++)
if (pingroup.Get(faces.Get(i).Face().PNum(j))) if (pingroup.Get(faces.Get(i).Face().PNum(j)))
fused++; fused++;
@ -722,37 +740,28 @@ void AdFront3 :: GetGroup (int fi,
findex.Append (i); findex.Append (i);
} }
} }
for (i = 1; i <= groupelements.Size(); i++) /*
for (j = 1; j <= 3; j++) for (int i = 1; i <= groupelements.Size(); i++)
for (int j = 1; j <= 3; j++)
{ {
groupelements.Elem(i).PNum(j) = groupelements.Elem(i).PNum(j) =
invpindex.Get(groupelements.Elem(i).PNum(j)); invpindex.Get(groupelements.Elem(i).PNum(j));
} }
*/
/* for (auto & e : groupelements)
for (i = 1; i <= groupelements.Size(); i++) for (int j = 1; j <= 3; j++)
for (j = 1; j <= 3; j++) e.PNum(j) = invpindex.Get(e.PNum(j));
for (k = 1; k <= grouppoints.Size(); k++)
if (pindex.Get(k) == groupelements.Get(i).PNum(j))
{
groupelements.Elem(i).PNum(j) = k;
break;
}
*/
} }
void AdFront3 :: SetStartFront (int /* baseelnp */) void AdFront3 :: SetStartFront (int /* baseelnp */)
{ {
INDEX i; for (INDEX i = 1; i <= faces.Size(); i++)
int j;
for (i = 1; i <= faces.Size(); i++)
if (faces.Get(i).Valid()) if (faces.Get(i).Valid())
{ {
const MiniElement2d & face = faces.Get(i).Face(); const MiniElement2d & face = faces.Get(i).Face();
for (j = 1; j <= 3; j++) for (int j = 1; j <= 3; j++)
points[face.PNum(j)].DecFrontNr(0); points[face.PNum(j)].DecFrontNr(0);
} }