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

get rid of 10000 segments limit in hp-refinement

Browse Source
This commit is contained in:
Joachim Schöberl 2019-12-04 17:33:16 +01:00
parent 2fc30ce10e
commit e5ead2065b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/meshing/hprefinement.cpp
View File

@ -600,11 +600,15 @@ namespace netgen
HPRefElement hpel(mesh[i]); HPRefElement hpel(mesh[i]);
hpel.coarse_elnr = i; hpel.coarse_elnr = i;
hpel.type = HP_SEGM; hpel.type = HP_SEGM;
hpel.index = seg.edgenr + 10000*seg.si; // hpel.index = seg.edgenr + 10000*seg.si;
hpel.index = seg.edgenr;
hpel.si = seg.si;
/*
if(seg.edgenr >= 10000) if(seg.edgenr >= 10000)
{ {
throw NgException("assumption that seg.edgenr < 10000 is wrong"); throw NgException("assumption that seg.edgenr < 10000 is wrong");
} }
*/
elements.Append(hpel); elements.Append(hpel);
} }
} }
@ -925,6 +929,7 @@ namespace netgen
for (int k = 0; k < 8; k++) for (int k = 0; k < 8; k++)
newel.pnums[k] = newpnums[hprs->newels[j][k]-1]; newel.pnums[k] = newpnums[hprs->newels[j][k]-1];
newel.index = el.index; newel.index = el.index;
newel.si = el.si;
newel.coarse_elnr = el.coarse_elnr; newel.coarse_elnr = el.coarse_elnr;
newel.levelx = newel.levely = newel.levelz = newlevel; newel.levelx = newel.levely = newel.levelz = newlevel;
@ -1361,8 +1366,10 @@ namespace netgen
seg[0] = hpel.pnums[0]; seg[0] = hpel.pnums[0];
seg[1] = hpel.pnums[1]; seg[1] = hpel.pnums[1];
// NOTE: only for less than 10000 elements (HACK) !!! // NOTE: only for less than 10000 elements (HACK) !!!
seg.edgenr = hpel.index % 10000; // seg.edgenr = hpel.index % 10000;
seg.si = hpel.index / 10000; // seg.si = hpel.index / 10000;
seg.edgenr = hpel.index;
seg.si = hpel.si;
/* /*
seg.epgeominfo[0].dist = hpel.param[0][0]; // he: war hpel.param[0][0] seg.epgeominfo[0].dist = hpel.param[0][0]; // he: war hpel.param[0][0]

1
libsrc/meshing/hprefinement.hpp
View File

@ -291,6 +291,7 @@ public:
PointIndex pnums[8]; PointIndex pnums[8];
double param[8][3]; double param[8][3];
int index; int index;
int si;
int levelx; int levelx;
int levely; int levely;
int levelz; int levelz;