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

delaunay tuning

Browse Source
This commit is contained in:
Joachim Schöberl 2019-09-27 17:14:48 +02:00
parent a71bed3a7e
commit da53a12eba
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libsrc/meshing/delaunay.cpp
View File

@ -88,14 +88,13 @@ namespace netgen
template<typename TFunc> template<typename TFunc>
void GetFirstIntersecting (const Point<dim> & pmin, const Point<dim> & pmax, void GetFirstIntersecting (const Point<dim> & pmin, const Point<dim> & pmax,
NgArray<T> & pis, TFunc func=[](auto pi){return false;}) const TFunc func=[](auto pi){return false;}) const
{ {
static Timer timer("BTree::GetIntersecting"); RegionTimer rt(timer); static Timer timer("BTree::GetIntersecting"); RegionTimer rt(timer);
static Timer timer1("BTree::GetIntersecting-LinearSearch"); static Timer timer1("BTree::GetIntersecting-LinearSearch");
static Array<const Node*> stack(1000); static Array<const Node*> stack(1000);
static Array<int> dir_stack(1000); static Array<int> dir_stack(1000);
pis.SetSize(0);
Point<2*dim> tpmin, tpmax; Point<2*dim> tpmin, tpmax;
@ -136,12 +135,9 @@ namespace netgen
if (p[d] < tpmin[d]) if (p[d] < tpmin[d])
intersect = false; intersect = false;
if(intersect) if(intersect)
{
pis.Append (leaf->index[i]);
if(func(leaf->index[i])) return; if(func(leaf->index[i])) return;
} }
} }
}
else else
{ {
int newdir = dir+1; int newdir = dir+1;
@ -163,7 +159,8 @@ namespace netgen
void GetIntersecting (const Point<dim> & pmin, const Point<dim> & pmax, void GetIntersecting (const Point<dim> & pmin, const Point<dim> & pmax,
NgArray<T> & pis) const NgArray<T> & pis) const
{ {
GetFirstIntersecting(pmin, pmax, pis, [](auto pi){return false;}); pis.SetSize(0);
GetFirstIntersecting(pmin, pmax, [&pis](auto pi) { pis.Append(pi); return false;});
} }
void Insert (const Point<dim> & pmin, const Point<dim> & pmax, T pi) void Insert (const Point<dim> & pmin, const Point<dim> & pmax, T pi)
@ -502,7 +499,8 @@ namespace netgen
static Timer t0("addpoint, 0"); static Timer t0("addpoint, 0");
static Timer t1("addpoint, 1"); static Timer t1("addpoint, 1");
static Timer t2("addpoint, 2"); static Timer t2a("addpoint, 2a");
static Timer t2b("addpoint, 2b");
static Timer t3("addpoint, 3"); static Timer t3("addpoint, 3");
/* /*
find any sphere, such that newp is contained in find any sphere, such that newp is contained in
@ -545,7 +543,7 @@ namespace netgen
tsearch.Start(); tsearch.Start();
double minquot{1e20}; double minquot{1e20};
tettree.GetFirstIntersecting tettree.GetFirstIntersecting
(newp, newp, treesearch, [&](const auto pi) (newp, newp, [&](const auto pi)
{ {
double rad2 = radi2.Get(pi); double rad2 = radi2.Get(pi);
double d2 = Dist2 (centers.Get(pi), newp); // / radi2.Get(pi); double d2 = Dist2 (centers.Get(pi), newp); // / radi2.Get(pi);
@ -588,7 +586,7 @@ namespace netgen
insphere.Add (cfelind); insphere.Add (cfelind);
bool changed = 1; bool changed = true;
int nstarti = 1, starti; int nstarti = 1, starti;
t0.Start(); t0.Start();
@ -613,7 +611,7 @@ namespace netgen
list.IterateList (insphere.GetArray().Get(j), list.IterateList (insphere.GetArray().Get(j),
[&](int celind) [&](int celind)
{ {
if (tempels.Get(celind)[0] != -1 && if (tempels.Get(celind)[0] != PointIndex(PointIndex::INVALID) &&
!insphere.IsIn (celind)) !insphere.IsIn (celind))
{ {
changed = true; changed = true;
@ -652,9 +650,8 @@ namespace netgen
n /= n.Length(); n /= n.Length();
double dist = n * (newp-p1); double dist = n * (newp-p1);
double scal = n * (mesh.Point (tempels.Get(helind)[k])-p1);
if (n * (mesh.Point (tempels.Get(helind)[k])-p1) > 0) if (scal > 0) dist *= -1;
dist *= -1;
if (dist > -1e-10) // 1e-10 if (dist > -1e-10) // 1e-10
{ {
@ -719,7 +716,7 @@ namespace netgen
} }
t1.Stop(); t1.Stop();
t2.Start(); t2a.Start();
meshnb.ResetFaceHT (10*insphere.GetArray().Size()+1); meshnb.ResetFaceHT (10*insphere.GetArray().Size()+1);
for (auto celind : insphere.GetArray()) for (auto celind : insphere.GetArray())
@ -734,6 +731,8 @@ namespace netgen
freelist.Append (celind); freelist.Append (celind);
} }
t2a.Stop();
t2b.Start();
bool hasclose = false; bool hasclose = false;
@ -743,7 +742,7 @@ namespace netgen
fabs (Dist2 (centers.Get (ind), newp) - radi2.Get(ind)) < 1e-8 ) fabs (Dist2 (centers.Get (ind), newp) - radi2.Get(ind)) < 1e-8 )
hasclose = true; hasclose = true;
} }
t2.Stop(); t2b.Stop();
t3.Start(); t3.Start();
/* /*
for (int j = 1; j <= newels.Size(); j++) for (int j = 1; j <= newels.Size(); j++)
@ -796,7 +795,7 @@ namespace netgen
int csameind = closesphere.GetArray().Get(k); int csameind = closesphere.GetArray().Get(k);
if (!insphere.IsIn(csameind) && if (!insphere.IsIn(csameind) &&
fabs (r2 - radi2.Get(csameind)) < 1e-10 && fabs (r2 - radi2.Get(csameind)) < 1e-10 &&
Dist (pc, centers.Get(csameind)) < 1e-10) Dist2 (pc, centers.Get(csameind)) < 1e-20)
{ {
pc = centers.Get(csameind); pc = centers.Get(csameind);
r2 = radi2.Get(csameind); r2 = radi2.Get(csameind);