ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-02-14 14:23:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix debug build

Browse Source
This commit is contained in:
Joachim Schoeberl 2024-12-28 23:46:27 +01:00
parent fa6f8c53ec
commit 55474772cd
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/meshing/meshclass.cpp
View File

@ -2530,10 +2530,10 @@ namespace netgen
{ {
if (el.GetNP() == 4) if (el.GetNP() == 4)
{ {
INDEX_4 i4(el[0], el[1], el[2], el[3]); PointIndices<4> i4(el[0], el[1], el[2], el[3]);
i4.Sort(); i4.Sort();
table.Add (PointIndex(i4.I1()), ei); table.Add (i4.I1(), ei);
table.Add (PointIndex(i4.I2()), ei); table.Add (i4.I2(), ei);
} }
else else
{ {
@ -3127,7 +3127,7 @@ namespace netgen
for (int i = 1; i <= faceht.GetNBags(); i++) for (int i = 1; i <= faceht.GetNBags(); i++)
for (int j = 1; j <= faceht.GetBagSize(i); j++) for (int j = 1; j <= faceht.GetBagSize(i); j++)
{ {
INDEX_3 i2; PointIndices<3> i2;
int data; int data;
faceht.GetData (i, j, i2, data); faceht.GetData (i, j, i2, data);
if (data) // surfnr if (data) // surfnr
@ -4178,7 +4178,7 @@ namespace netgen
{ {
Array<MeshPoint> hpoints; Array<MeshPoint> hpoints;
int npi = PointIndex::BASE; PointIndex npi = IndexBASE<PointIndex>();
for (PointIndex pi : points.Range()) for (PointIndex pi : points.Range())
if (pused[pi]) if (pused[pi])
{ {
@ -4932,8 +4932,7 @@ namespace netgen
// make minimal node to node 1 // make minimal node to node 1
int minpi=0; int minpi=0;
PointIndex minpnum; PointIndex minpnum = IndexBASE<PointIndex>()+GetNP();
minpnum = GetNP() + 1;
for (int j = 1; j <= 6; j++) for (int j = 1; j <= 6; j++)
{ {
@ -4953,10 +4952,9 @@ namespace netgen
while (minpi > 1) while (minpi > 1)
{ {
int hi = 0;
for (int j = 0; j <= 3; j+= 3) for (int j = 0; j <= 3; j+= 3)
{ {
hi = el.PNum(1+j); PointIndex hi = el.PNum(1+j);
el.PNum(1+j) = el.PNum(2+j); el.PNum(1+j) = el.PNum(2+j);
el.PNum(2+j) = el.PNum(3+j); el.PNum(2+j) = el.PNum(3+j);
el.PNum(3+j) = hi; el.PNum(3+j) = hi;
@ -5028,8 +5026,7 @@ namespace netgen
// make minimal node to node 1 // make minimal node to node 1
int minpi=0; int minpi=0;
PointIndex minpnum; PointIndex minpnum = GetNP() + IndexBASE<PointIndex>();
minpnum = GetNP() + 1;
for (int j = 1; j <= 8; j++) for (int j = 1; j <= 8; j++)
{ {
@ -5049,10 +5046,9 @@ namespace netgen
while (minpi > 1) while (minpi > 1)
{ {
int hi = 0;
for (int j = 0; j <= 4; j+= 4) for (int j = 0; j <= 4; j+= 4)
{ {
hi = el.PNum(1+j); PointIndex hi = el.PNum(1+j);
el.PNum(1+j) = el.PNum(2+j); el.PNum(1+j) = el.PNum(2+j);
el.PNum(2+j) = el.PNum(3+j); el.PNum(2+j) = el.PNum(3+j);
el.PNum(3+j) = el.PNum(4+j); el.PNum(3+j) = el.PNum(4+j);
@ -7007,8 +7003,8 @@ namespace netgen
int mlold = mlbetweennodes.Size(); int mlold = mlbetweennodes.Size();
mlbetweennodes.SetSize(np); mlbetweennodes.SetSize(np);
if (np > mlold) if (np > mlold)
for (int i = mlold+PointIndex::BASE; for (PointIndex i = mlold+IndexBASE<PointIndex>();
i < np+PointIndex::BASE; i++) i < np+IndexBASE<PointIndex>(); i++)
{ {
mlbetweennodes[i][0].Invalidate(); mlbetweennodes[i][0].Invalidate();
mlbetweennodes[i][1].Invalidate(); mlbetweennodes[i][1].Invalidate();

4
libsrc/meshing/meshfunc.cpp
View File

@ -562,7 +562,7 @@ namespace netgen
auto first_new_pi = m_.pmap.Range().Next(); auto first_new_pi = m_.pmap.Range().Next();
auto & m = *m_.mesh; auto & m = *m_.mesh;
Array<PointIndex, PointIndex> pmap(m.Points().Size()); Array<PointIndex, PointIndex> pmap(m.Points().Size());
for(auto pi : Range(PointIndex(PointIndex::BASE), first_new_pi)) for(auto pi : Range(IndexBASE<PointIndex>(), first_new_pi))
pmap[pi] = m_.pmap[pi]; pmap[pi] = m_.pmap[pi];
for (auto pi : Range(first_new_pi, m.Points().Range().Next())) for (auto pi : Range(first_new_pi, m.Points().Range().Next()))
@ -594,7 +594,7 @@ namespace netgen
for(auto & m : meshes) for(auto & m : meshes)
{ {
Array<PointIndex, PointIndex> pmap(m.Points().Size()); Array<PointIndex, PointIndex> pmap(m.Points().Size());
for(auto pi : Range(PointIndex(PointIndex::BASE), first_new_pi)) for(auto pi : Range(IndexBASE<PointIndex>(), first_new_pi))
pmap[pi] = pi; pmap[pi] = pi;
for (auto pi : Range(first_new_pi, m.Points().Range().Next())) for (auto pi : Range(first_new_pi, m.Points().Range().Next()))

3
libsrc/meshing/meshing3.cpp
View File

@ -389,10 +389,9 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
delfaces.SetSize (0); delfaces.SetSize (0);
INDEX npi;
Element newel(TET); Element newel(TET);
npi = mesh.AddPoint (inp); PointIndex npi = mesh.AddPoint (inp);
newel.SetNP(4); newel.SetNP(4);
newel.PNum(4) = npi; newel.PNum(4) = npi;

4
libsrc/meshing/meshtype.hpp
View File

@ -858,7 +858,7 @@ namespace netgen
bool IsDeleted () const bool IsDeleted () const
{ {
#ifdef DEBUG #ifdef DEBUG
if (pnum[0] < PointIndex::BASE && !deleted) if ((pnum[0]-IndexBASE<PointIndex>() < 0) && !deleted)
cerr << "Surfelement has illegal pnum, but not marked as deleted" << endl; cerr << "Surfelement has illegal pnum, but not marked as deleted" << endl;
#endif #endif
return deleted; return deleted;
@ -1238,7 +1238,7 @@ namespace netgen
bool IsDeleted () const bool IsDeleted () const
{ {
#ifdef DEBUG #ifdef DEBUG
if (pnum[0] < PointIndex::BASE && !flags.deleted) if (pnum[0]-IndexBASE<PointIndex>() < 0 && !flags.deleted)
cerr << "Volelement has illegal pnum, but not marked as deleted" << endl; cerr << "Volelement has illegal pnum, but not marked as deleted" << endl;
#endif #endif