ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-14 10:08:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

BTree::GetFirstIntersecting(), some Timers

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-09-26 16:50:35 +02:00
parent a6d07ed7e4
commit 46116ce723
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libsrc/meshing/delaunay.cpp
View File

@ -91,9 +91,12 @@ namespace netgen
return n_nodes; return n_nodes;
} }
void GetIntersecting (const Point<dim> & pmin, const Point<dim> & pmax, template<typename TFunc>
NgArray<T> & pis) const void GetFirstIntersecting (const Point<dim> & pmin, const Point<dim> & pmax,
NgArray<T> & pis, TFunc func=[](auto pi){return false;}) const
{ {
static Timer timer("BTree::GetIntersecting"); RegionTimer rt(timer);
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);
@ -125,6 +128,7 @@ namespace netgen
if(Leaf *leaf = node->GetLeaf()) if(Leaf *leaf = node->GetLeaf())
{ {
// RegionTimer rt1(timer1);
for (auto i : IntRange(leaf->n_elements)) for (auto i : IntRange(leaf->n_elements))
{ {
bool intersect = true; bool intersect = true;
@ -137,7 +141,10 @@ 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]); pis.Append (leaf->index[i]);
if(func(leaf->index[i])) return;
}
} }
} }
else else
@ -158,8 +165,15 @@ namespace netgen
} }
} }
void GetIntersecting (const Point<dim> & pmin, const Point<dim> & pmax,
NgArray<T> & pis) const
{
GetFirstIntersecting(pmin, pmax, pis, [](auto 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)
{ {
static Timer timer("BTree::Insert"); RegionTimer rt(timer);
int dir = 0; int dir = 0;
Point<2*dim> p; Point<2*dim> p;
for (auto i : IntRange(dim)) for (auto i : IntRange(dim))
@ -233,6 +247,7 @@ namespace netgen
void DeleteElement (T pi) void DeleteElement (T pi)
{ {
static Timer timer("BTree::DeleteElement"); RegionTimer rt(timer);
Leaf *leaf = leaf_index[pi]; Leaf *leaf = leaf_index[pi];
auto & n_elements = leaf->n_elements; auto & n_elements = leaf->n_elements;
auto & index = leaf->index; auto & index = leaf->index;
@ -483,7 +498,15 @@ namespace netgen
Point<3> pc; Point<3> pc;
Point3d tpmin, tpmax; Point3d tpmin, tpmax;
tettree.GetIntersecting (newp, newp, treesearch);
// stop search if intersecting point is close enough to center
tettree.GetFirstIntersecting (newp, newp, treesearch, [&](const auto pi)
{
double quot = Dist2 (centers.Get(pi), newp);
return (quot < 0.917632 * radi2.Get(pi));
} );
// tettree.GetIntersecting (newp, newp, treesearch);
double quot,minquot(1e20); double quot,minquot(1e20);