From ac5f901cef1bee1fc72c1934f9ad73aedc5904b9 Mon Sep 17 00:00:00 2001 From: Christopher Lackner Date: Mon, 21 Oct 2019 17:03:01 +0200 Subject: [PATCH 1/2] do not get intersecting points, they are added from intersecting lines anyway --- libsrc/meshing/adfront2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libsrc/meshing/adfront2.cpp b/libsrc/meshing/adfront2.cpp index 3295f706..61df5125 100644 --- a/libsrc/meshing/adfront2.cpp +++ b/libsrc/meshing/adfront2.cpp @@ -300,9 +300,9 @@ namespace netgen p0 + Vec3d(xh, xh, xh), nearlines); - pointsearchtree.GetIntersecting (p0 - Vec3d(xh, xh, xh), - p0 + Vec3d(xh, xh, xh), - nearpoints); + // pointsearchtree.GetIntersecting (p0 - Vec3d(xh, xh, xh), + // p0 + Vec3d(xh, xh, xh), + // nearpoints); for (int ii = 0; ii < nearlines.Size(); ii++) { From 2fd255baa75b1d8aaa3317dcd75cdb5fbc4a8cb3 Mon Sep 17 00:00:00 2001 From: Christopher Lackner Date: Mon, 21 Oct 2019 17:20:48 +0200 Subject: [PATCH 2/2] only use cone (or userdefined points) --- libsrc/meshing/adfront2.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libsrc/meshing/adfront2.cpp b/libsrc/meshing/adfront2.cpp index 61df5125..62cd1580 100644 --- a/libsrc/meshing/adfront2.cpp +++ b/libsrc/meshing/adfront2.cpp @@ -281,7 +281,7 @@ namespace netgen NgArray & lindex, double xh) { - // static Timer timer("adfront2::GetLocals"); RegionTimer reg (timer); + static Timer timer("adfront2::GetLocals"); RegionTimer reg (timer); int pstind; Point<3> midp, p0; @@ -300,10 +300,11 @@ namespace netgen p0 + Vec3d(xh, xh, xh), nearlines); - // pointsearchtree.GetIntersecting (p0 - Vec3d(xh, xh, xh), - // p0 + Vec3d(xh, xh, xh), - // nearpoints); - + // only cone points, other points are from linesearchtree + cpointsearchtree.GetIntersecting (p0 - Vec3d(xh, xh, xh), + p0 + Vec3d(xh, xh, xh), + nearpoints); + for (int ii = 0; ii < nearlines.Size(); ii++) { int i = nearlines[ii];