TableCreator -> CreateSortedTable()

This commit is contained in:
Matthias Hochsteger 2021-05-30 18:50:24 +02:00
parent 073cbec108
commit 1045f68b97

View File

@ -2100,12 +2100,8 @@ namespace netgen
t_table.Start(); t_table.Start();
TableCreator<ElementIndex, PointIndex> creator(np); auto elsonpoint = ngcore::CreateSortedTable<ElementIndex, PointIndex>( volelements.Range(),
[&](auto & table, ElementIndex ei)
for ( ; !creator.Done(); creator++)
// for (ElementIndex ei : Range(VolumeElements()))
ParallelFor
(Range(VolumeElements()), [&] (ElementIndex ei)
{ {
const Element & el = (*this)[ei]; const Element & el = (*this)[ei];
if (dom == 0 || dom == el.GetIndex()) if (dom == 0 || dom == el.GetIndex())
@ -2114,23 +2110,17 @@ namespace netgen
{ {
INDEX_4 i4(el[0], el[1], el[2], el[3]); INDEX_4 i4(el[0], el[1], el[2], el[3]);
i4.Sort(); i4.Sort();
creator.Add (PointIndex(i4.I1()), ei); table.Add (PointIndex(i4.I1()), ei);
creator.Add (PointIndex(i4.I2()), ei); table.Add (PointIndex(i4.I2()), ei);
} }
else else
{ {
for (PointIndex pi : el.PNums()) for (PointIndex pi : el.PNums())
creator.Add(pi, ei); table.Add(pi, ei);
} }
} }
}); }, GetNP());
auto elsonpoint = creator.MoveTable();
ParallelFor (Range(elsonpoint), [&] (auto i)
{
QuickSort(elsonpoint[i]);
});
NgArray<int,PointIndex::BASE> numonpoint(np); NgArray<int,PointIndex::BASE> numonpoint(np);
/* /*