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

more ParallelFor in Topology

Browse Source
This commit is contained in:
Joachim Schoeberl 2021-06-10 21:52:22 +02:00
parent d922d3abdd
commit 6c73222f20
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libsrc/meshing/topology.cpp
View File

@ -4,6 +4,7 @@
namespace netgen namespace netgen
{ {
using ngcore::ParallelForRange; using ngcore::ParallelForRange;
using ngcore::ParallelFor;
using ngcore::INT; using ngcore::INT;
using ngcore::TasksPerThread; using ngcore::TasksPerThread;
@ -446,13 +447,27 @@ namespace netgen
surfedges.SetSize(nse); surfedges.SetSize(nse);
segedges.SetSize(nseg); segedges.SetSize(nseg);
/*
for (int i = 0; i < ne; i++) for (int i = 0; i < ne; i++)
for (int j = 0; j < 12; j++) for (int j = 0; j < 12; j++)
edges[i][j].nr = -1; edges[i][j].nr = -1;
for (int i = 0; i < nse; i++) for (int i = 0; i < nse; i++)
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)
surfedges[i][j].nr = -1; surfedges[i][j].nr = -1;
*/
ParallelFor (ne, [this](auto i)
{
for (auto & e : edges[i])
e.nr = -1;
});
ParallelFor (nse, [this](auto i)
{
for (auto & e : surfedges[i])
e.nr = -1;
});
// keep existing edges // keep existing edges
cnt = 0; cnt = 0;
for (int i = 0; i < edge2vert.Size(); i++) for (int i = 0; i < edge2vert.Size(); i++)
@ -1429,19 +1444,21 @@ namespace netgen
surf2volelement.Elem(i)[1] = 0; surf2volelement.Elem(i)[1] = 0;
} }
(*tracer) ("Topology::Update build surf2vol", false); (*tracer) ("Topology::Update build surf2vol", false);
for (int i = 1; i <= ne; i++) // for (int i = 0; i < ne; i++)
for (int j = 0; j < 6; j++) ParallelFor (ne, [this](auto i)
{ {
// int fnum = (faces.Get(i)[j]+7) / 8; for (int j = 0; j < 6; j++)
int fnum = faces.Get(i)[j].fnr+1; {
if (fnum > 0 && face2surfel.Elem(fnum)) // int fnum = (faces.Get(i)[j]+7) / 8;
{ int fnum = faces[i][j].fnr+1;
int sel = face2surfel.Elem(fnum); if (fnum > 0 && face2surfel.Elem(fnum))
surf2volelement.Elem(sel)[1] = {
surf2volelement.Elem(sel)[0]; int sel = face2surfel.Elem(fnum);
surf2volelement.Elem(sel)[0] = i; surf2volelement.Elem(sel)[1] =
} surf2volelement.Elem(sel)[0];
} surf2volelement.Elem(sel)[0] = i+1;
}
}});
(*tracer) ("Topology::Update build surf2vol", true); (*tracer) ("Topology::Update build surf2vol", true);
face2vert.SetAllocSize (face2vert.Size()); face2vert.SetAllocSize (face2vert.Size());