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

store newest vertex from bisection

Browse Source
This commit is contained in:
Joachim Schoeberl 2024-06-24 09:56:44 +02:00 committed by Matthias Hochsteger
parent af5e003790
commit f9d7d3a4fd
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsrc/include/nginterface_v2.hpp
View File

@ -160,6 +160,7 @@ namespace netgen
FlatArray<T_FACE2> faces;
Ng_Facets facets;
bool is_curved;
int8_t newest_vertex;
};

2
libsrc/include/nginterface_v2_impl.hpp
View File

@ -191,6 +191,7 @@ NGX_INLINE DLL_HEADER Ng_Element Ngx_Mesh :: GetElement<2> (size_t nr) const
ret.facets.ptr = ret.edges.Data();
}
ret.is_curved = el.IsCurved();
ret.newest_vertex = el.NewestVertex();
return ret;
}
@ -226,6 +227,7 @@ NGX_INLINE DLL_HEADER Ng_Element Ngx_Mesh :: GetElement<3> (size_t nr) const
ret.facets.ptr = ret.faces.Data();
ret.is_curved = el.IsCurved();
ret.newest_vertex = el.NewestVertex();
return ret;
}

10
libsrc/meshing/bisect.cpp
View File

@ -34,6 +34,7 @@ namespace netgen
// unsigned char faceedges[4];
bool incorder;
unsigned int order:6;
int8_t newest_vertex;
MarkedTet() = default;
/*
@ -195,6 +196,7 @@ namespace netgen
bool incorder;
unsigned int order:6;
int8_t newest_vertex;
};
ostream & operator<< (ostream & ost, const MarkedTri & mt)
@ -1258,6 +1260,8 @@ namespace netgen
newtet1.marked = nm;
newtet2.marked = nm;
newtet1.newest_vertex = oldtet.newest_vertex;
#ifdef DEBUG
*testout << "newtet1,before = " << newtet1 << endl;
*testout << "newtet2,before = " << newtet2 << endl;
@ -1267,6 +1271,7 @@ namespace netgen
{
if (i == oldtet.tetedge1)
{
newtet2.newest_vertex = i;
newtet2.pnums[i] = newp;
newtet2.faceedges[i] = oldtet.faceedges[i]; // inherited face
newtet2.faceedges[vis1] = i; // cut faces
@ -1463,11 +1468,12 @@ namespace netgen
newtri1.pnums[pe2] = newp;
newtri1.pgeominfo[pe2] = newpgi;
newtri1.markededge = pe2;
newtri1.newest_vertex = oldtri.newest_vertex;
newtri2.pnums[pe1] = newp;
newtri2.pgeominfo[pe1] = newpgi;
newtri2.markededge = pe1;
newtri2.newest_vertex = pe1;
newtri1.surfid = oldtri.surfid;
newtri2.surfid = oldtri.surfid;
@ -3715,6 +3721,7 @@ namespace netgen
el.SetOrder (tet.order);
for (int j = 0; j < 4; j++)
el[j] = tet.pnums[j];
el.NewestVertex() = tet.newest_vertex;
mesh.SetVolumeElement (ElementIndex(i), el);
}
});
@ -3811,6 +3818,7 @@ namespace netgen
el[j] = trig.pnums[j];
el.GeomInfoPi(j+1) = trig.pgeominfo[j];
}
el.NewestVertex() = trig.newest_vertex;
mesh.SetSurfaceElement (SurfaceElementIndex(i), el);
}
});

10
libsrc/meshing/meshtype.hpp
View File

@ -425,6 +425,7 @@ namespace netgen
// control whether it is visible or not
bool visible:1; // element visible
bool is_curved; // element is (high order) curved
int8_t newest_vertex = -1; // from refinement via bisection
/// order for hp-FEM
unsigned int orderx:6;
unsigned int ordery:6;
@ -562,6 +563,9 @@ namespace netgen
///
const PointGeomInfo & GeomInfoPiMod (int i) const { return geominfo[(i-1) % np]; }
auto & NewestVertex() { return newest_vertex; }
auto NewestVertex() const { return newest_vertex; }
void DoArchive (Archive & ar)
{
short _np, _typ;
@ -731,7 +735,8 @@ namespace netgen
ELEMENT_TYPE typ;
/// number of points (4..tet, 5..pyramid, 6..prism, 8..hex, 10..quad tet, 12..quad prism)
int8_t np;
int8_t newest_vertex = -1; // from refinement via bisection
/// sub-domain index
int index;
/// order for hp-FEM
@ -856,6 +861,9 @@ namespace netgen
///
const PointIndex & PNumMod (int i) const { return pnum[(i-1) % np]; }
auto & NewestVertex() { return newest_vertex; }
auto NewestVertex() const { return newest_vertex; }
void DoArchive (Archive & ar)
{
short _np, _typ;