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

more PointIndex::BASE 0/1 fixes

Browse Source
This commit is contained in:
Joachim Schöberl 2019-08-07 23:32:14 +02:00
parent 79c958cf83
commit 4bfe42b305
4 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/meshing/improve2.cpp
View File

@ -562,10 +562,13 @@ namespace netgen
PointIndex pi1 = elem[j]; PointIndex pi1 = elem[j];
PointIndex pi2 = elem[(j+1) % 3]; PointIndex pi2 = elem[(j+1) % 3];
/*
if (pi1 < PointIndex::BASE || if (pi1 < PointIndex::BASE ||
pi2 < PointIndex::BASE) pi2 < PointIndex::BASE)
continue; continue;
*/
if (!pi1.IsValid() || !pi2.IsValid())
continue;
/* /*
INDEX_2 i2(pi1, pi2); INDEX_2 i2(pi1, pi2);
i2.Sort(); i2.Sort();
@ -597,8 +600,8 @@ namespace netgen
double loch = mesh.GetH (mesh[pi1]); double loch = mesh.GetH (mesh[pi1]);
INDEX_2 si2 (pi1, pi2); // INDEX_2 si2 (pi1, pi2);
si2.Sort(); // si2.Sort();
/* /*
if (edgetested.Used (si2)) if (edgetested.Used (si2))
@ -737,8 +740,8 @@ namespace netgen
Element2d *el1p(NULL); Element2d *el1p(NULL);
int l = 0; int l = 0;
while(mesh[elementsonnode[pi1][l]].IsDeleted() && l<elementsonnode.EntrySize(pi1)) l++; while(mesh[elementsonnode[pi1][l]].IsDeleted() && l<elementsonnode[pi1].Size()) l++;
if(l<elementsonnode.EntrySize(pi1)) if(l<elementsonnode[pi1].Size())
el1p = &mesh[elementsonnode[pi1][l]]; el1p = &mesh[elementsonnode[pi1][l]];
else else
cerr << "OOPS!" << endl; cerr << "OOPS!" << endl;

4
libsrc/meshing/improve3.cpp
View File

@ -748,7 +748,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal,
el31[3] = pi4; el31[3] = pi4;
} }
pi5 = 0; pi5.Invalidate();
for (int k = 0; k < 3; k++) // JS, 201212 for (int k = 0; k < 3; k++) // JS, 201212
{ {
const Element & elemk = mesh[hasbothpoints[k]]; const Element & elemk = mesh[hasbothpoints[k]];
@ -2315,7 +2315,7 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
{ {
static Timer t("MeshOptimize3d::SwapImprove2"); RegionTimer reg(t); static Timer t("MeshOptimize3d::SwapImprove2"); RegionTimer reg(t);
PointIndex pi1(0), pi2(0), pi3(0), pi4(0), pi5(0); PointIndex pi1, pi2, pi3, pi4, pi5;
Element el21(TET), el22(TET), el31(TET), el32(TET), el33(TET); Element el21(TET), el22(TET), el31(TET), el32(TET), el33(TET);
int cnt = 0; int cnt = 0;

20
libsrc/meshing/meshtype.cpp
View File

@ -185,7 +185,7 @@ namespace netgen
{ {
for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++) for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
{ {
pnum[i] = 0; pnum[i].Invalidate();
geominfo[i].trignum = 0; geominfo[i].trignum = 0;
} }
np = anp; np = anp;
@ -210,7 +210,7 @@ namespace netgen
{ {
for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++) for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
{ {
pnum[i] = 0; pnum[i].Invalidate();
geominfo[i].trignum = 0; geominfo[i].trignum = 0;
} }
@ -235,9 +235,9 @@ namespace netgen
pnum[2] = pi3; pnum[2] = pi3;
np = 3; np = 3;
typ = TRIG; typ = TRIG;
pnum[3] = 0;
pnum[4] = 0; for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
pnum[5] = 0; pnum[i].Invalidate();
for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++) for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
geominfo[i].trignum = 0; geominfo[i].trignum = 0;
@ -1000,9 +1000,8 @@ namespace netgen
Element :: Element (int anp) Element :: Element (int anp)
{ {
np = anp; np = anp;
int i; for (int i = 0; i < ELEMENT_MAXPOINTS; i++)
for (i = 0; i < ELEMENT_MAXPOINTS; i++) pnum[i].Invalidate();
pnum[i] = 0;
index = 0; index = 0;
flags.marked = 1; flags.marked = 1;
flags.badel = 0; flags.badel = 0;
@ -1051,9 +1050,8 @@ namespace netgen
{ {
SetType (type); SetType (type);
int i; for (int i = 0; i < ELEMENT_MAXPOINTS; i++)
for (i = 0; i < ELEMENT_MAXPOINTS; i++) pnum[i].Invalidate();
pnum[i] = 0;
index = 0; index = 0;
flags.marked = 1; flags.marked = 1;
flags.badel = 0; flags.badel = 0;

50
libsrc/occ/occgenmesh.cpp
View File

@ -331,7 +331,8 @@ namespace netgen
bool exists = 0; bool exists = 0;
if (merge_solids) if (merge_solids)
for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++) // for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++)
for (PointIndex pi : Range(mesh.Points()))
if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps) if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps)
{ {
exists = 1; exists = 1;
@ -346,7 +347,9 @@ namespace netgen
(*testout) << "different vertices = " << mesh.GetNP() << endl; (*testout) << "different vertices = " << mesh.GetNP() << endl;
int first_ep = mesh.GetNP()+1; // int first_ep = mesh.GetNP()+1;
PointIndex first_ep = mesh.Points().End();
auto vertexrange = mesh.Points().Range();
NgArray<int> face2solid[2]; NgArray<int> face2solid[2];
for (int i = 0; i<2; i++) for (int i = 0; i<2; i++)
@ -437,7 +440,6 @@ namespace netgen
{ {
curr++; curr++;
(*testout) << "edge nr " << curr << endl; (*testout) << "edge nr " << curr << endl;
multithread.percent = 100 * curr / double (total); multithread.percent = 100 * curr / double (total);
if (multithread.terminate) return; if (multithread.terminate) return;
@ -474,53 +476,61 @@ namespace netgen
DivideEdge (edge, mp, params, mesh, mparam); DivideEdge (edge, mp, params, mesh, mparam);
NgArray <int> pnums; NgArray <PointIndex> pnums;
pnums.SetSize (mp.Size()+2); pnums.SetSize (mp.Size()+2);
if (!merge_solids) if (!merge_solids)
{ {
pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge)); pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge)) + PointIndex::BASE-1;
pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge)); pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge)) + PointIndex::BASE-1;
} }
else else
{ {
Point<3> fp = occ2ng (BRep_Tool::Pnt (TopExp::FirstVertex (edge))); Point<3> fp = occ2ng (BRep_Tool::Pnt (TopExp::FirstVertex (edge)));
Point<3> lp = occ2ng (BRep_Tool::Pnt (TopExp::LastVertex (edge))); Point<3> lp = occ2ng (BRep_Tool::Pnt (TopExp::LastVertex (edge)));
pnums[0] = -1; pnums[0] = PointIndex::INVALID;
pnums.Last() = -1; pnums.Last() = PointIndex::INVALID;
for (PointIndex pi = 1; pi < first_ep; pi++) // for (PointIndex pi = 1; pi < first_ep; pi++)
for (PointIndex pi : vertexrange)
{ {
if (Dist2 (mesh[pi], fp) < eps*eps) pnums[0] = pi; if (Dist2 (mesh[pi], fp) < eps*eps) pnums[0] = pi;
if (Dist2 (mesh[pi], lp) < eps*eps) pnums.Last() = pi; if (Dist2 (mesh[pi], lp) < eps*eps) pnums.Last() = pi;
} }
} }
for (int i = 1; i <= mp.Size(); i++) for (int i = 1; i <= mp.Size(); i++)
{ {
bool exists = 0; bool exists = 0;
tsearch.Start(); tsearch.Start();
int j; PointIndex j;
/*
for (j = first_ep; j <= mesh.GetNP(); j++) for (j = first_ep; j <= mesh.GetNP(); j++)
if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps) if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)
{ {
exists = 1; exists = 1;
break; break;
} }
*/
for (j = first_ep; j < mesh.Points().End(); j++)
if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)
{
exists = 1;
break;
}
tsearch.Stop(); tsearch.Stop();
if (exists) if (exists)
pnums[i] = j; pnums[i] = j;
else else
{ {
mesh.AddPoint (mp[i-1]); pnums[i] = mesh.AddPoint (mp[i-1]);
(*testout) << "add meshpoint " << mp[i-1] << endl; (*testout) << "add meshpoint " << mp[i-1] << endl;
pnums[i] = mesh.GetNP(); // pnums[i] = mesh.GetNP();
} }
} }
(*testout) << "NP = " << mesh.GetNP() << endl; (*testout) << "NP = " << mesh.GetNP() << endl;
//(*testout) << pnums[pnums.Size()-1] << endl; //(*testout) << pnums[pnums.Size()-1] << endl;
for (int i = 1; i <= mp.Size()+1; i++) for (int i = 1; i <= mp.Size()+1; i++)
@ -623,7 +633,7 @@ namespace netgen
double starttime = GetTime(); double starttime = GetTime();
NgArray<int> glob2loc(noldp); NgArray<int, PointIndex::BASE> glob2loc(noldp);
//int projecttype = PARAMETERSPACE; //int projecttype = PARAMETERSPACE;
@ -696,12 +706,12 @@ namespace netgen
{ {
for (int j = 1; j <= 2; j++) for (int j = 1; j <= 2; j++)
{ {
int pi = (j == 1) ? seg[0] : seg[1]; PointIndex pi = (j == 1) ? seg[0] : seg[1];
if (!glob2loc.Get(pi)) if (glob2loc[pi] == 0)
{ {
meshing.AddPoint (mesh.Point(pi), pi); meshing.AddPoint (mesh.Point(pi), pi);
cntp++; cntp++;
glob2loc.Elem(pi) = cntp; glob2loc[pi] = cntp;
} }
} }
} }
@ -719,7 +729,7 @@ namespace netgen
gi1.u = seg.epgeominfo[1].u; gi1.u = seg.epgeominfo[1].u;
gi1.v = seg.epgeominfo[1].v; gi1.v = seg.epgeominfo[1].v;
meshing.AddBoundaryElement (glob2loc.Get(seg[0]), glob2loc.Get(seg[1]), gi0, gi1); meshing.AddBoundaryElement (glob2loc[seg[0]], glob2loc[seg[1]], gi0, gi1);
//(*testout) << gi0.u << " " << gi0.v << endl; //(*testout) << gi0.u << " " << gi0.v << endl;
//(*testout) << gi1.u << " " << gi1.v << endl; //(*testout) << gi1.u << " " << gi1.v << endl;
} }
@ -770,7 +780,7 @@ namespace netgen
if (locpnum[j] == 0) if (locpnum[j] == 0)
{ {
int pi = (j == 0) ? seg[0] : seg[1]; PointIndex pi = (j == 0) ? seg[0] : seg[1];
meshing.AddPoint (mesh.Point(pi), pi); meshing.AddPoint (mesh.Point(pi), pi);
gis.SetSize (gis.Size()+1); gis.SetSize (gis.Size()+1);