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 'remove_error_intersecting_layers' into 'master'

Browse Source 
remove warning output if intersect. triangles in different layers

See merge request jschoeberl/netgen!342
This commit is contained in:
Joachim Schöberl 2020-10-23 17:53:33 +00:00
commit 50dddbedae
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc/meshing/meshclass.cpp
View File

@ -3903,7 +3903,7 @@ namespace netgen
(*this)[tri[0]].GetLayer() != (*this)[tri[2]].GetLayer()) (*this)[tri[0]].GetLayer() != (*this)[tri[2]].GetLayer())
{ {
incons_layers = 1; incons_layers = 1;
cout << "inconsistent layers in triangle" << endl; // cout << "inconsistent layers in triangle" << endl;
} }
const netgen::Point<3> *trip1[3], *trip2[3]; const netgen::Point<3> *trip1[3], *trip2[3];
@ -3917,16 +3917,19 @@ namespace netgen
{ {
overlap = 1; overlap = 1;
lock_guard<std::mutex> guard(m); lock_guard<std::mutex> guard(m);
PrintWarning ("Intersecting elements " if(!incons_layers)
,int(sei), " and ", int(sej)); {
PrintWarning ("Intersecting elements "
,int(sei), " and ", int(sej));
(*testout) << "Intersecting: " << endl; (*testout) << "Intersecting: " << endl;
(*testout) << "openelement " << sei << " with open element " << sej << endl; (*testout) << "openelement " << sei << " with open element " << sej << endl;
cout << "el1 = " << tri << endl; cout << "el1 = " << tri << endl;
cout << "el2 = " << tri2 << endl; cout << "el2 = " << tri2 << endl;
cout << "layer1 = " << (*this)[tri[0]].GetLayer() << endl; cout << "layer1 = " << (*this)[tri[0]].GetLayer() << endl;
cout << "layer2 = " << (*this)[tri2[0]].GetLayer() << endl; cout << "layer2 = " << (*this)[tri2[0]].GetLayer() << endl;
}
for (int k = 1; k <= 3; k++) for (int k = 1; k <= 3; k++)
(*testout) << tri.PNum(k) << " "; (*testout) << tri.PNum(k) << " ";