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

Utility function MeshOptimize3d::BuildEdgeList()

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-09-10 16:18:12 +02:00
parent d6ebe15c17
commit d95e9afb92
2 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
libsrc/meshing/improve3.cpp
View File

@ -411,13 +411,64 @@ void MeshOptimize3d :: CombineImproveSequential (Mesh & mesh,
multithread.task = savetask; multithread.task = savetask;
} }
void MeshOptimize3d :: BuildEdgeList( const Mesh & mesh, const TABLE<ElementIndex, PointIndex::BASE> & elementsonnode, Array<std::tuple<PointIndex, PointIndex>> & edges )
{
static Timer tbuild_edges("Build edges"); RegionTimer reg(tbuild_edges);
static constexpr int tetedges[6][2] =
{ { 0, 1 }, { 0, 2 }, { 0, 3 },
{ 1, 2 }, { 1, 3 }, { 2, 3 } };
Array<Array<std::tuple<PointIndex,PointIndex>>> thread_edges(ngcore::TaskManager::GetMaxThreads());
ParallelForRange(mesh.Points().Range(), [&] (auto myrange)
{
ArrayMem<std::tuple<int,int>, 100> local_edges;
for (auto pi : myrange)
{
local_edges.SetSize(0);
for(auto ei : elementsonnode[pi])
{
const Element & elem = mesh[ei];
if (elem.IsDeleted()) continue;
for (int j = 0; j < 6; j++)
{
PointIndex pi0 = elem[tetedges[j][0]];
PointIndex pi1 = elem[tetedges[j][1]];
if (pi1 < pi0) Swap(pi0, pi1);
if(pi0==pi)
local_edges.Append(std::make_tuple(pi0, pi1));
}
}
QuickSort(local_edges);
auto edge_prev = std::make_tuple(-1,-1);
for(auto edge : local_edges)
if(edge != edge_prev)
{
thread_edges[ngcore::TaskManager::GetThreadId()].Append(edge);
edge_prev = edge;
}
}
}, 4*ngcore::TaskManager::GetNumThreads());
int num_edges = 0;
for (auto & edg : thread_edges)
num_edges += edg.Size();
edges.SetAllocSize(num_edges);
for (auto & edg : thread_edges)
edges.Append(edg);
}
void MeshOptimize3d :: CombineImprove (Mesh & mesh, void MeshOptimize3d :: CombineImprove (Mesh & mesh,
OPTIMIZEGOAL goal) OPTIMIZEGOAL goal)
{ {
static Timer t("MeshOptimize3d::CombineImprove"); RegionTimer reg(t); static Timer t("MeshOptimize3d::CombineImprove"); RegionTimer reg(t);
static Timer topt("Optimize"); static Timer topt("Optimize");
static Timer tsearch("Search"); static Timer tsearch("Search");
static Timer tbuild_edges("Build edges");
static Timer tbuild_elements_table("Build elements table"); static Timer tbuild_elements_table("Build elements table");
static Timer tbad("CalcBad"); static Timer tbad("CalcBad");
@ -474,58 +525,8 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
tbuild_elements_table.Stop(); tbuild_elements_table.Stop();
// Build list of all edges Array<std::tuple<PointIndex,PointIndex>> edges;
Array<std::tuple<int,int>> edges; BuildEdgeList(mesh, elementsonnode, edges);
Array<Array<std::tuple<int,int>>> thread_edges(ngcore::TaskManager::GetMaxThreads());
static constexpr int tetedges[6][2] =
{ { 0, 1 }, { 0, 2 }, { 0, 3 },
{ 1, 2 }, { 1, 3 }, { 2, 3 } };
tbuild_edges.Start();
ParallelForRange(mesh.Points().Range(), [&] (auto myrange)
{
ArrayMem<std::tuple<int,int>, 100> local_edges;
for (auto pi : myrange)
{
local_edges.SetSize(0);
for(auto ei : elementsonnode[pi])
{
Element & elem = mesh[ei];
if (elem.IsDeleted()) continue;
for (int j = 0; j < 6; j++)
{
PointIndex pi0 = elem[tetedges[j][0]];
PointIndex pi1 = elem[tetedges[j][1]];
if (pi1 < pi0) Swap(pi0, pi1);
if(pi0==pi)
local_edges.Append(std::make_tuple(pi0, pi1));
}
}
QuickSort(local_edges);
auto edge_prev = std::make_tuple(-1,-1);
for(auto edge : local_edges)
if(edge != edge_prev)
{
// TODO: Check for CombineEdge improvement already here and only append edges with improvement
thread_edges[ngcore::TaskManager::GetThreadId()].Append(edge);
edge_prev = edge;
}
}
}, ntasks);
int num_edges = 0;
for (auto & edg : thread_edges)
num_edges += edg.Size();
edges.SetAllocSize(num_edges);
for (auto & edg : thread_edges)
edges.Append(edg);
tbuild_edges.Stop();
// Find edges with improvement // Find edges with improvement
Array<std::tuple<double, int>> combine_candidate_edges(edges.Size()); Array<std::tuple<double, int>> combine_candidate_edges(edges.Size());

3
libsrc/meshing/improve3.hpp
View File

@ -11,6 +11,9 @@ extern double CalcTotalBad (const Mesh::T_POINTS & points,
class MeshOptimize3d class MeshOptimize3d
{ {
const MeshingParameters & mp; const MeshingParameters & mp;
void BuildEdgeList( const Mesh & mesh, const TABLE<ElementIndex, PointIndex::BASE> & elementsonnode, Array<std::tuple<PointIndex, PointIndex>> & edges );
public: public:
MeshOptimize3d (const MeshingParameters & amp) : mp(amp) { ; } MeshOptimize3d (const MeshingParameters & amp) : mp(amp) { ; }