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

more parallel in UpdateTopology, optimize Clusters

Browse Source
This commit is contained in:
Joachim Schöberl 2018-01-06 18:41:45 +01:00
parent 19ec4fc9ca
commit 5f2edca91c
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libsrc/meshing/clusters.cpp
View File

@ -220,24 +220,7 @@ namespace netgen
{ {
const Element & el = mesh.VolumeElement(i); const Element & el = mesh.VolumeElement(i);
ELEMENT_TYPE typ = el.GetType(); ELEMENT_TYPE typ = el.GetType();
top.GetElementEdges (i, ednums);
top.GetElementFaces (i, fanums);
int elnv = top.GetNVertices (typ);
int elned = ednums.Size();
int elnfa = fanums.Size();
nnums.SetSize(elnv+elned+elnfa+1);
for (int j = 1; j <= elnv; j++)
nnums.Elem(j) = el.PNum(j)+1-PointIndex::BASE;
for (int j = 1; j <= elned; j++)
nnums.Elem(elnv+j) = nv+ednums.Elem(j);
for (int j = 1; j <= elnfa; j++)
nnums.Elem(elnv+elned+j) = nv+ned+fanums.Elem(j);
nnums.Elem(elnv+elned+elnfa+1) = nv+ned+nfa+i;
const int * clustertab = NULL; const int * clustertab = NULL;
switch (typ) switch (typ)
{ {
@ -280,6 +263,25 @@ namespace netgen
} }
if (clustertab) if (clustertab)
{
top.GetElementEdges (i, ednums);
top.GetElementFaces (i, fanums);
int elnv = top.GetNVertices (typ);
int elned = ednums.Size();
int elnfa = fanums.Size();
nnums.SetSize(elnv+elned+elnfa+1);
for (int j = 1; j <= elnv; j++)
nnums.Elem(j) = el.PNum(j)+1-PointIndex::BASE;
for (int j = 1; j <= elned; j++)
nnums.Elem(elnv+j) = nv+ednums.Elem(j);
for (int j = 1; j <= elnfa; j++)
nnums.Elem(elnv+elned+j) = nv+ned+fanums.Elem(j);
nnums.Elem(elnv+elned+elnfa+1) = nv+ned+nfa+i;
for (int j = 0; j < nnums.Size(); j++) for (int j = 0; j < nnums.Size(); j++)
for (int k = 0; k < j; k++) for (int k = 0; k < j; k++)
if (clustertab[j] == clustertab[k]) if (clustertab[j] == clustertab[k])
@ -312,6 +314,7 @@ namespace netgen
changed = 1; changed = 1;
} }
} }
}
/* /*
if (clustertab) if (clustertab)

18
libsrc/meshing/topology.cpp
View File

@ -1096,6 +1096,7 @@ namespace netgen
surf2volelement.Elem(i)[0] = 0; surf2volelement.Elem(i)[0] = 0;
surf2volelement.Elem(i)[1] = 0; surf2volelement.Elem(i)[1] = 0;
} }
(*tracer) ("Topology::Update build surf2vol", false);
for (int i = 1; i <= ne; i++) for (int i = 1; i <= ne; i++)
for (int j = 0; j < 6; j++) for (int j = 0; j < 6; j++)
{ {
@ -1109,6 +1110,7 @@ namespace netgen
surf2volelement.Elem(sel)[0] = i; surf2volelement.Elem(sel)[0] = i;
} }
} }
(*tracer) ("Topology::Update build surf2vol", true);
face2vert.SetAllocSize (face2vert.Size()); face2vert.SetAllocSize (face2vert.Size());
@ -1120,9 +1122,11 @@ namespace netgen
// paralleltop.Reset (); // paralleltop.Reset ();
#endif #endif
(*tracer) ("Topology::Update count face_els", false);
Array<short int> face_els(nfa), face_surfels(nfa); Array<short int> face_els(nfa), face_surfels(nfa);
face_els = 0; face_els = 0;
face_surfels = 0; face_surfels = 0;
/*
Array<int> hfaces; Array<int> hfaces;
for (int i = 1; i <= ne; i++) for (int i = 1; i <= ne; i++)
{ {
@ -1130,8 +1134,22 @@ namespace netgen
for (int j = 0; j < hfaces.Size(); j++) for (int j = 0; j < hfaces.Size(); j++)
face_els[hfaces[j]-1]++; face_els[hfaces[j]-1]++;
} }
*/
ParallelForRange
(tm, ne,
[&] (size_t begin, size_t end)
{
Array<int> hfaces;
for (ElementIndex ei = begin; ei < end; ei++)
{
GetElementFaces (ei+1, hfaces);
for (auto f : hfaces)
AsAtomic(face_els[f-1])++;
}
});
for (int i = 1; i <= nse; i++) for (int i = 1; i <= nse; i++)
face_surfels[GetSurfaceElementFace (i)-1]++; face_surfels[GetSurfaceElementFace (i)-1]++;
(*tracer) ("Topology::Update count face_els", true);
if (ne) if (ne)