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

edge hierarchy in mesh - Topology class, needs mesh.EnableTable('parentedges')

Browse Source
This commit is contained in:
Joachim Schoeberl 2021-02-08 09:41:14 +01:00
parent 6d30186279
commit fd878079cb
6 changed files with 255 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/include/nginterface_v2.hpp
View File

@ -355,6 +355,10 @@ namespace netgen
int GetParentElement (int ei) const;
int GetParentSElement (int ei) const;
bool HasParentEdges() const;
tuple<int, std::array<int,3>> GetParentEdges (int enr) const;
tuple<int, std::array<int,4>> GetParentFaces (int fnr) const;
int GetNIdentifications() const;
int GetIdentificationType(int idnr) const;
Ng_Buffer<int[2]> GetPeriodicVertices(int idnr) const;

14
libsrc/include/nginterface_v2_impl.hpp
View File

@ -336,6 +336,20 @@ NGX_INLINE void Ngx_Mesh :: GetParentNodes (int ni, int * parents) const
parents[0] = parents[1] = -1;
}
inline bool Ngx_Mesh :: HasParentEdges() const
{
return mesh->GetTopology().HasParentEdges();
}
inline tuple<int, std::array<int,3>> Ngx_Mesh :: GetParentEdges (int enr) const
{
return mesh->GetTopology().GetParentEdges(enr);
}
inline tuple<int, std::array<int,4>> Ngx_Mesh :: GetParentFaces (int fnr) const
{
return mesh->GetTopology().GetParentFaces(fnr);
}
inline auto Ngx_Mesh :: GetTimeStamp() const { return mesh->GetTimeStamp(); }

4
libsrc/meshing/meshclass.hpp
View File

@ -779,8 +779,8 @@ namespace netgen
DLL_HEADER bool PureTetMesh () const;
const MeshTopology & GetTopology () const
{ return topology; }
const MeshTopology & GetTopology () const { return topology; }
MeshTopology & GetTopology () { return topology; }
DLL_HEADER void UpdateTopology (NgTaskManager tm = &DummyTaskManager,
NgTracer tracer = &DummyTracer);

7
libsrc/meshing/python_mesh.cpp
View File

@ -1131,8 +1131,13 @@ project_boundaries : Optional[str] = None
{
if (name == "edges")
const_cast<MeshTopology&>(self.GetTopology()).SetBuildEdges(set);
if (name == "faces")
else if (name == "faces")
const_cast<MeshTopology&>(self.GetTopology()).SetBuildFaces(set);
else if (name == "parentedges")
const_cast<MeshTopology&>(self.GetTopology()).SetBuildHierarchy(set);
else
throw Exception ("noting known about table "+name +"\n"
"knwon are 'edges', 'faces', 'parentedges'");
},
py::arg("name"), py::arg("set")=true)

209
libsrc/meshing/topology.cpp
View File

@ -677,6 +677,215 @@ namespace netgen
});
}
} );
if (build_hierarchy)
{
static Timer t("build_hierarchy"); RegionTimer reg(t);
cnt = 0;
for (size_t i = 0; i < edge2vert.Size(); i++)
cnt[edge2vert[i][0]]++;
TABLE<int,PointIndex::BASE> vert2edge (cnt);
for (size_t i = 0; i < edge2vert.Size(); i++)
vert2edge.AddSave (edge2vert[i][0], i);
// build edge hierarchy:
parent_edges.SetSize (ned);
parent_edges = { -1, { -1, -1, -1 } };
/*
cout << "mlbetween = " << mesh->mlbetweennodes.Size() << endl;
cout << "mlbetween = " << endl << mesh->mlbetweennodes << endl;
cout << "v2e = " << endl << vert2edge << endl;
cout << "e2v = " << endl << edge2vert << endl;
cout << "ned = " << ned << endl;
*/
for (size_t i = 0; i < ned; i++)
{
// cout << " ref edge " << i << "/" << ned << endl;
/*
int pa1[2], pa2[2];
ma->GetParentNodes (i2[0], pa1);
ma->GetParentNodes (i2[1], pa2);
*/
auto i2 = edge2vert[i];
if (i2[0] > mesh->mlbetweennodes.Size()+PointIndex::BASE ||
i2[1] > mesh->mlbetweennodes.Size()+PointIndex::BASE)
continue;
// cout << "i2 = " << i2 << endl;
auto pa1 = mesh->mlbetweennodes[i2[0]];
auto pa2 = mesh->mlbetweennodes[i2[1]];
// cout << "pa1 = " << pa1 << endl;
// cout << "pa2 = " << pa2 << endl;
//if (pa1[0] == -1 && pa2[0] == -1)
// continue;
// both vertices are on coarsest mesh
if (!pa1[0].IsValid() && !pa2[0].IsValid())
continue;
int issplitedge = 0;
if (pa1[0] == i2[1] || pa1[1] == i2[1])
issplitedge = 1;
if (pa2[0] == i2[0] || pa2[1] == i2[0])
issplitedge = 2;
if (issplitedge)
{
// cout << "split edge " << endl;
// edge is obtained by splitting one edge into two parts:
INT<2> paedge;
if (issplitedge == 1)
paedge = INT<2> (pa1[0], pa1[1]);
else
paedge = INT<2> (pa2[0], pa2[1]);
if (paedge[0] > paedge[1])
Swap (paedge[0], paedge[1]);
for (int ednr : vert2edge[paedge[0]])
if (auto ic2 = edge2vert[ednr]; ic2[1] == paedge[1])
{
// cout << "matching: " << ednr << endl;
int orient = (paedge[0] == i2[0] || paedge[1] == i2[1]) ? 1 : 0;
parent_edges[i] = { orient, { ednr, -1, -1 } };
}
}
else
{
// edge is splitting edge in middle of triangle:
for (int j = 1; j <= 2; j++)
{
INT<2> paedge1, paedge2;
if (j == 1)
{
paedge1 = INT<2> (pa1[0], i2[1]);
paedge2 = INT<2> (pa1[1], i2[1]);
}
else
{
paedge1 = INT<2> (pa2[0], i2[0]);
paedge2 = INT<2> (pa2[1], i2[0]);
}
if (paedge1[0] > paedge1[1])
Swap (paedge1[0], paedge1[1]);
if (paedge2[0] > paedge2[1])
Swap (paedge2[0], paedge2[1]);
// cout << "paedge1 = " << paedge1 << ", paedge2 = " << paedge2 << endl;
// if first vertex number is -1, then don't try to find entry in node2edge hash table
if ( paedge1[0] == PointIndex::BASE-1 || paedge2[0] == PointIndex::BASE-1 )
continue;
int paedgenr1=-1, paedgenr2=-1, orient1 = 0, orient2 = 0;
for (int ednr : vert2edge[paedge1[0]])
if (auto ic2 = edge2vert[ednr]; ic2[1] == paedge1[1])
{
paedgenr1 = ednr;
// cout << "ednr = " << ednr << ", i2 = " << i2 << endl;
orient1 = (paedge1[0] == i2[0] || paedge1[1] == i2[1]) ? 1 : 0;
// cout << "orient1 = " << orient1 << endl;
}
for (int ednr : vert2edge[paedge2[0]])
if (auto ic2 = edge2vert[ednr]; ic2[1] == paedge2[1])
{
paedgenr2 = ednr;
// cout << "ednr = " << ednr << ", i2 = " << i2 << endl;
orient2 = (paedge2[0] == i2[0] || paedge2[1] == i2[1]) ? 1 : 0;
// cout << "orient2 = " << orient2 << endl;
}
if (paedgenr1 != -1 && paedgenr2 != -1)
parent_edges[i] = { orient1+2*orient2, { paedgenr1, paedgenr2, -1 } };
}
// TODO: quad edges
/*
if (parentedges[i][0] == -1)
{
// quad split
if (pa1[0] != pa2[0] &&
pa1[0] != pa2[1] &&
pa1[1] != pa2[0] &&
pa1[1] != pa2[1])
for (int j = 1; j <= 2; j++)
{
INT<2> paedge1, paedge2;
if (j == 1)
{
paedge1 = INT<2> (pa1[0], pa2[0]);
paedge2 = INT<2> (pa1[1], pa2[1]);
}
else
{
paedge1 = INT<2> (pa1[0], pa2[1]);
paedge2 = INT<2> (pa1[1], pa2[0]);
}
int paedgenr1 = 0, paedgenr2 = 0;
int orient1 = 1, orient2 = 1;
if (paedge1[0] > paedge1[1])
{
Swap (paedge1[0], paedge1[1]);
orient1 = 0;
}
if (paedge2[0] > paedge2[1])
{
Swap (paedge2[0], paedge2[1]);
orient2 = 0;
}
if ( paedge1[0] == -1 || paedge2[0] == -1 )
continue;
if (node2edge.Used (paedge1) && node2edge.Used (paedge2))
{
paedgenr1 = node2edge.Get (paedge1);
paedgenr2 = node2edge.Get (paedge2);
parentedges[i][0] = 2 * paedgenr1 + orient1;
parentedges[i][1] = 2 * paedgenr2 + orient2;
}
}
}
if (parentedges[i][0] == -1)
{
// triangle split into quad+trig (from anisotropic pyramids)
for (int j = 0; j < 2; j++)
for (int k = 0; k < 2; k++)
{
INT<2> paedge (pa1[1-j], pa2[1-k]);
int orientpa = 1;
if (paedge[0] > paedge[1])
{
Swap (paedge[0], paedge[1]);
orientpa = 0;
}
if (pa1[j] == pa2[k] && node2edge.Used(paedge))
{
int paedgenr = node2edge.Get (paedge);
parentedges[i][0] = 2 * paedgenr + orientpa;
}
}
}
*/
}
}
for (int i : Range(parent_edges))
{
auto [info, nrs] = parent_edges[i];
// cout << "edge " << i << " has " << info << ", nrs = " << nrs[0] << " " << nrs[1] << endl;
}
}
}

19
libsrc/meshing/topology.hpp
View File

@ -27,6 +27,7 @@ struct T_FACE
int fnr; // 0-based
};
/*
template <typename T, int S>
struct FixArray
{
@ -34,13 +35,17 @@ struct T_FACE
T & operator[] (size_t i) { return vals[i]; }
T operator[] (size_t i) const { return vals[i]; }
};
*/
template <typename T, int S>
using FixArray = std::array<T,S>;
class MeshTopology
{
const Mesh * mesh;
bool buildedges;
bool buildfaces;
bool build_hierarchy = false; // may be changed to default = false
NgArray<INDEX_2> edge2vert;
NgArray<INDEX_4> face2vert;
@ -75,11 +80,14 @@ public:
{ buildedges = be; }
void SetBuildFaces (bool bf)
{ buildfaces = bf; }
void SetBuildHierarchy (bool bh) { build_hierarchy = bh; }
bool HasEdges () const
{ return buildedges; }
bool HasFaces () const
{ return buildfaces; }
bool HasParentEdges () const
{ return build_hierarchy; }
void Update(NgTaskManager tm = &DummyTaskManager, NgTracer tracer = &DummyTracer);
bool NeedsUpdate() const;
@ -178,6 +186,17 @@ public:
int GetVerticesEdge ( int v1, int v2) const;
void GetSegmentVolumeElements ( int segnr, NgArray<ElementIndex> & els ) const;
void GetSegmentSurfaceElements ( int segnr, NgArray<SurfaceElementIndex> & els ) const;
private:
Array<tuple<int, std::array<int,3>>> parent_edges;
void BuildParentEdges ();
Array<tuple<int, std::array<int,4>>> parent_faces;
void BuildParentFaces ();
public:
auto GetParentEdges (int enr) const { return parent_edges[enr]; }
auto GetParentFaces (int fnr) const { return parent_faces[fnr]; }
};