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

little polish of bisect

Browse Source
This commit is contained in:
Joachim Schöberl 2017-08-27 14:52:57 +02:00
parent 6d39c78ffb
commit 74c8fa5cf4
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libsrc/meshing/bisect.cpp
View File

@ -3222,17 +3222,13 @@ namespace netgen
for (int i = 1; i <= nel; i++) for (int i = 1; i <= nel; i++)
if (mtets.Elem(i).marked) if (mtets.Elem(i).marked)
{ {
MarkedTet oldtet; MarkedTet oldtet = mtets.Get(i);
MarkedTet newtet1, newtet2;
PointIndex newp;
oldtet = mtets.Get(i);
//if(yn == "y")
// (*testout) << "bisected tet " << oldtet;
INDEX_2 edge(oldtet.pnums[oldtet.tetedge1], INDEX_2 edge(oldtet.pnums[oldtet.tetedge1],
oldtet.pnums[oldtet.tetedge2]); oldtet.pnums[oldtet.tetedge2]);
edge.Sort(); edge.Sort();
PointIndex newp;
if (cutedges.Used (edge)) if (cutedges.Used (edge))
{ {
newp = cutedges.Get(edge); newp = cutedges.Get(edge);
@ -3240,22 +3236,17 @@ namespace netgen
else else
{ {
Point<3> npt = Center (mesh.Point (edge.I1()), Point<3> npt = Center (mesh.Point (edge.I1()),
mesh.Point (edge.I2())); mesh.Point (edge.I2()));
newp = mesh.AddPoint (npt); newp = mesh.AddPoint (npt);
cutedges.Set (edge, newp); cutedges.Set (edge, newp);
} }
MarkedTet newtet1, newtet2;
BTBisectTet (oldtet, newp, newtet1, newtet2); BTBisectTet (oldtet, newp, newtet1, newtet2);
mtets.Elem(i) = newtet1; mtets.Elem(i) = newtet1;
mtets.Append (newtet2); mtets.Append (newtet2);
#ifdef DEBUG
*testout << "tet1 has elnr = " << i << ", tet2 has elnr = " << mtets.Size() << endl;
#endif
//if(yn == "y")
// (*testout) << "and got " << newtet1 << "and " << newtet2 << endl;
mesh.mlparentelement.Append (i); mesh.mlparentelement.Append (i);
} }
NgProfiler::StopTimer (timer_bisecttet); NgProfiler::StopTimer (timer_bisecttet);
@ -3359,23 +3350,20 @@ namespace netgen
MarkHangingIdentifications (mids, cutedges); MarkHangingIdentifications (mids, cutedges);
int nsel = mtris.Size(); size_t nsel = mtris.Size();
NgProfiler::StartTimer (timer_bisecttrig); NgProfiler::StartTimer (timer_bisecttrig);
for (int i = 1; i <= nsel; i++) for (size_t i = 0; i < nsel; i++)
if (mtris.Elem(i).marked) if (mtris[i].marked)
{ {
MarkedTri oldtri;
MarkedTri newtri1, newtri2; MarkedTri newtri1, newtri2;
PointIndex newp; PointIndex newp;
oldtri = mtris.Get(i); MarkedTri oldtri = mtris[i];
int oldpi1 = oldtri.pnums[(oldtri.markededge+1)%3]; PointIndex oldpi1 = oldtri.pnums[(oldtri.markededge+1)%3];
int oldpi2 = oldtri.pnums[(oldtri.markededge+2)%3]; PointIndex oldpi2 = oldtri.pnums[(oldtri.markededge+2)%3];
INDEX_2 edge(oldpi1, oldpi2); INDEX_2 edge(oldpi1, oldpi2);
edge.Sort(); edge.Sort();
// cerr << "edge = " << edge.I1() << "-" << edge.I2() << endl;
if (cutedges.Used (edge)) if (cutedges.Used (edge))
{ {
newp = cutedges.Get(edge); newp = cutedges.Get(edge);
@ -3383,33 +3371,26 @@ namespace netgen
else else
{ {
Point<3> npt = Center (mesh.Point (edge.I1()), Point<3> npt = Center (mesh.Point (edge.I1()),
mesh.Point (edge.I2())); mesh.Point (edge.I2()));
newp = mesh.AddPoint (npt); newp = mesh.AddPoint (npt);
cutedges.Set (edge, newp); cutedges.Set (edge, newp);
} }
// newp = cutedges.Get(edge);
int si = mesh.GetFaceDescriptor (oldtri.surfid).SurfNr(); int si = mesh.GetFaceDescriptor (oldtri.surfid).SurfNr();
// geom->GetSurface(si)->Project (mesh.Point(newp));
PointGeomInfo npgi; PointGeomInfo npgi;
// cerr << "project point " << newp << " old: " << mesh.Point(newp);
if (mesh[newp].Type() != EDGEPOINT) if (mesh[newp].Type() != EDGEPOINT)
PointBetween (mesh.Point (oldpi1), mesh.Point (oldpi2), PointBetween (mesh.Point (oldpi1), mesh.Point (oldpi2),
0.5, si, 0.5, si,
oldtri.pgeominfo[(oldtri.markededge+1)%3], oldtri.pgeominfo[(oldtri.markededge+1)%3],
oldtri.pgeominfo[(oldtri.markededge+2)%3], oldtri.pgeominfo[(oldtri.markededge+2)%3],
mesh.Point (newp), npgi); mesh.Point (newp), npgi);
// cerr << " new: " << mesh.Point(newp) << endl;
BTBisectTri (oldtri, newp, npgi, newtri1, newtri2); BTBisectTri (oldtri, newp, npgi, newtri1, newtri2);
//if(yn == "y")
// (*testout) << "bisected tri " << oldtri << "and got " << newtri1 << "and " << newtri2 << endl;
mtris[i] = newtri1;
mtris.Elem(i) = newtri1;
mtris.Append (newtri2); mtris.Append (newtri2);
mesh.mlparentsurfaceelement.Append (i); mesh.mlparentsurfaceelement.Append (i+1);
} }
NgProfiler::StopTimer (timer_bisecttrig); NgProfiler::StopTimer (timer_bisecttrig);