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

Fix BuildEdgeList() - create sorted list

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-09-10 16:59:31 +02:00
parent c22f44617b
commit a70803eecb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/meshing/improve3.cpp
View File

@ -419,10 +419,12 @@ void MeshOptimize3d :: BuildEdgeList( const Mesh & mesh, const TABLE<ElementInde
{ { 0, 1 }, { 0, 2 }, { 0, 3 }, { { 0, 1 }, { 0, 2 }, { 0, 3 },
{ 1, 2 }, { 1, 3 }, { 2, 3 } }; { 1, 2 }, { 1, 3 }, { 2, 3 } };
Array<Array<std::tuple<PointIndex,PointIndex>>> thread_edges(ngcore::TaskManager::GetMaxThreads()); int ntasks = 2*ngcore::TaskManager::GetMaxThreads();
Array<Array<std::tuple<PointIndex,PointIndex>>> task_edges(ntasks);
ParallelForRange(mesh.Points().Range(), [&] (auto myrange) ParallelFor(IntRange(ntasks), [&] (int ti)
{ {
auto myrange = mesh.Points().Range().Split(ti, ntasks);
ArrayMem<std::tuple<int,int>, 100> local_edges; ArrayMem<std::tuple<int,int>, 100> local_edges;
for (auto pi : myrange) for (auto pi : myrange)
{ {
@ -449,17 +451,17 @@ void MeshOptimize3d :: BuildEdgeList( const Mesh & mesh, const TABLE<ElementInde
for(auto edge : local_edges) for(auto edge : local_edges)
if(edge != edge_prev) if(edge != edge_prev)
{ {
thread_edges[ngcore::TaskManager::GetThreadId()].Append(edge); task_edges[ti].Append(edge);
edge_prev = edge; edge_prev = edge;
} }
} }
}, 4*ngcore::TaskManager::GetNumThreads()); }, ntasks);
int num_edges = 0; int num_edges = 0;
for (auto & edg : thread_edges) for (auto & edg : task_edges)
num_edges += edg.Size(); num_edges += edg.Size();
edges.SetAllocSize(num_edges); edges.SetAllocSize(num_edges);
for (auto & edg : thread_edges) for (auto & edg : task_edges)
edges.Append(edg); edges.Append(edg);
} }