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

Merge branch 'cherry-pick-b99b8eec' into 'master'

Browse Source 
use SortedPointIndex-HT

See merge request ngsolve/netgen!697
This commit is contained in:
Schöberl, Joachim 2025-01-08 18:57:22 +01:00
commit c4985c49e1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/meshing/bisect.cpp
View File

@ -667,6 +667,7 @@ namespace netgen
int ii = sorted.Get(i); int ii = sorted.Get(i);
for (int j = 1; j <= eclasstab.EntrySize(ii); j++) for (int j = 1; j <= eclasstab.EntrySize(ii); j++)
edgenumber.Set (edges[eclasstab.Get(ii, j)], ++cnt); edgenumber.Set (edges[eclasstab.Get(ii, j)], ++cnt);
} }
return cnt; return cnt;
} }
@ -1031,8 +1032,8 @@ namespace netgen
i2.Sort(); i2.Sort();
int hval = edgenumber.Get(i2); int hval = edgenumber.Get(i2);
*/ */
// int hval = edgenumber[ SortedPointIndices<2>(mt.pnums[i], mt.pnums[j]) ]; int hval = edgenumber[ SortedPointIndices<2>(mt.pnums[i], mt.pnums[j]) ];
int hval = edgenumber[ { mt.pnums[i], mt.pnums[j] }]; // int hval = edgenumber[ { mt.pnums[i], mt.pnums[j] }];
if (hval > val) if (hval > val)
{ {
val = hval; val = hval;
@ -2038,7 +2039,8 @@ namespace netgen
// INDEX_2_HASHTABLE<int> edgenumber(np); // INDEX_2_HASHTABLE<int> edgenumber(np);
// INDEX_2_CLOSED_HASHTABLE<int> edgenumber(9*ne+4*nse); // INDEX_2_CLOSED_HASHTABLE<int> edgenumber(9*ne+4*nse);
ClosedHashTable<INDEX_2, int> edgenumber(9*ne+4*nse); // ClosedHashTable<INDEX_2, int> edgenumber(9*ne+4*nse);
ClosedHashTable<SortedPointIndices<2>, int> edgenumber(9*ne+4*nse);
BTSortEdges (mesh, idmaps, edgenumber); BTSortEdges (mesh, idmaps, edgenumber);