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

Merge branch 'fix_analyzeedge' into 'master'

Browse Source 
Fix AnalyzeEdge()

See merge request jschoeberl/netgen!322
This commit is contained in:
Joachim Schöberl 2020-10-14 21:36:39 +00:00
commit 54dba89dd8
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libsrc/csg/edgeflw.cpp
View File

@ -1085,23 +1085,33 @@ namespace netgen
//int k; //int k;
double eps = 1e-8*size; double eps = 1e-8*size;
NgArray<bool> pre_ok(2); ArrayMem<bool,2> pre_ok(2);
bool flip = false;
do do
{ {
eps *= 0.5; eps *= 0.5;
pre_ok[0] = (locsol -> VectorIn2 (hp, m, n, eps) == IS_OUTSIDE && auto in00 = locsol -> VectorIn2 (hp, m, n, eps);
locsol -> VectorIn2 (hp, m, -1. * n, eps) == IS_INSIDE); auto in01 = locsol -> VectorIn2 (hp, m, -1. * n, eps);
pre_ok[1] = (locsol -> VectorIn2 (hp, -1.*m, n, eps) == IS_OUTSIDE && pre_ok[0] = in00 == IS_OUTSIDE && in01 == IS_INSIDE;
locsol -> VectorIn2 (hp, -1.*m, -1. * n, eps) == IS_INSIDE);
if(in00 == IS_INSIDE && in01 == IS_OUTSIDE)
pre_ok[0] = flip = true;
auto in10 = locsol -> VectorIn2 (hp, -1.*m, n, eps);
auto in11 = locsol -> VectorIn2 (hp, -1.*m, -1. * n, eps);
pre_ok[1] = (in10 == IS_OUTSIDE && in11 == IS_INSIDE);
if(in10 == IS_INSIDE && in11 == IS_OUTSIDE)
pre_ok[1] = flip = true;
if (debug) if (debug)
{ {
*testout << "eps = " << eps << endl; *testout << "eps = " << eps << endl;
*testout << "in,1 = " << locsol -> VectorIn2 (hp, m, n, eps) << endl; *testout << "in,1 = " << in00 << endl;
*testout << "in,1 = " << locsol -> VectorIn2 (hp, m, -1. * n, eps) << endl; *testout << "in,1 = " << in01 << endl;
*testout << "in,1 = " << locsol -> VectorIn2 (hp, -1.*m, n, eps) << endl; *testout << "in,1 = " << in10 << endl;
*testout << "in,1 = " << locsol -> VectorIn2 (hp, -1.*m, -1. * n, eps) << endl; *testout << "in,1 = " << in11 << endl;
} }
} }
while(pre_ok[0] && pre_ok[1] && eps > 1e-16*size); while(pre_ok[0] && pre_ok[1] && eps > 1e-16*size);
@ -1197,7 +1207,10 @@ namespace netgen
if (!surf) if (!surf)
{ {
if (sameasref) bool inside = sameasref;
if(flip)
inside = !inside;
if (inside)
refedges.Elem(hi).domin = i; refedges.Elem(hi).domin = i;
else else
refedges.Elem(hi).domout = i; refedges.Elem(hi).domout = i;