diff --git a/libsrc/meshing/delaunay2d.cpp b/libsrc/meshing/delaunay2d.cpp index 66b22708..656dacf6 100644 --- a/libsrc/meshing/delaunay2d.cpp +++ b/libsrc/meshing/delaunay2d.cpp @@ -217,7 +217,7 @@ namespace netgen if(definitive_overlapping_trig==-1) { - cout << "Error in tree - didnt find overlap, check all trigs again" << endl; + PrintMessage (5, "Warning in delaunay tree - didn't find overlapping circle, check all trigs again"); for(auto i_trig : trigs.Range()) { const auto trig = trigs[i_trig]; diff --git a/tests/pytest/results.json b/tests/pytest/results.json index 3ede7173..04cb980d 100644 --- a/tests/pytest/results.json +++ b/tests/pytest/results.json @@ -1513,8 +1513,8 @@ 0.0, 0.0 ], - "ne1d": 70, - "ne2d": 403, + "ne1d": 81, + "ne2d": 442, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -1528,8 +1528,8 @@ 0.0, 0.0 ], - "ne1d": 71, - "ne2d": 394, + "ne1d": 86, + "ne2d": 464, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -1543,8 +1543,8 @@ 0.0, 0.0 ], - "ne1d": 72, - "ne2d": 395, + "ne1d": 86, + "ne2d": 466, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -1558,23 +1558,8 @@ 0.0, 0.0 ], - "ne1d": 70, - "ne2d": 403, - "ne3d": 0, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", - "total_badness": 0.0 - }, - { - "angles_tet": [ - 0.0, - 0.0 - ], - "angles_trig": [ - 0.0, - 0.0 - ], - "ne1d": 74, - "ne2d": 410, + "ne1d": 81, + "ne2d": 442, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -1589,7 +1574,22 @@ 0.0 ], "ne1d": 82, - "ne2d": 442, + "ne2d": 441, + "ne3d": 0, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", + "total_badness": 0.0 + }, + { + "angles_tet": [ + 0.0, + 0.0 + ], + "angles_trig": [ + 0.0, + 0.0 + ], + "ne1d": 86, + "ne2d": 472, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2713,8 +2713,8 @@ 0.0, 0.0 ], - "ne1d": 24, - "ne2d": 82, + "ne1d": 31, + "ne2d": 99, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2728,8 +2728,8 @@ 0.0, 0.0 ], - "ne1d": 16, - "ne2d": 44, + "ne1d": 27, + "ne2d": 75, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2743,8 +2743,8 @@ 0.0, 0.0 ], - "ne1d": 11, - "ne2d": 29, + "ne1d": 25, + "ne2d": 85, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2758,8 +2758,8 @@ 0.0, 0.0 ], - "ne1d": 24, - "ne2d": 82, + "ne1d": 31, + "ne2d": 99, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2773,8 +2773,8 @@ 0.0, 0.0 ], - "ne1d": 36, - "ne2d": 146, + "ne1d": 41, + "ne2d": 177, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2788,8 +2788,8 @@ 0.0, 0.0 ], - "ne1d": 22, - "ne2d": 82, + "ne1d": 30, + "ne2d": 108, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2805,8 +2805,8 @@ 0.0, 0.0 ], - "ne1d": 28, - "ne2d": 146, + "ne1d": 32, + "ne2d": 148, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2820,8 +2820,8 @@ 0.0, 0.0 ], - "ne1d": 22, - "ne2d": 134, + "ne1d": 32, + "ne2d": 140, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2835,8 +2835,8 @@ 0.0, 0.0 ], - "ne1d": 28, - "ne2d": 142, + "ne1d": 32, + "ne2d": 148, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2850,8 +2850,8 @@ 0.0, 0.0 ], - "ne1d": 28, - "ne2d": 146, + "ne1d": 32, + "ne2d": 148, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2865,8 +2865,8 @@ 0.0, 0.0 ], - "ne1d": 39, - "ne2d": 290, + "ne1d": 43, + "ne2d": 300, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2881,7 +2881,7 @@ 0.0 ], "ne1d": 79, - "ne2d": 837, + "ne2d": 821, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2897,8 +2897,8 @@ 0.0, 0.0 ], - "ne1d": 28, - "ne2d": 122, + "ne1d": 32, + "ne2d": 124, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2912,8 +2912,8 @@ 0.0, 0.0 ], - "ne1d": 22, - "ne2d": 110, + "ne1d": 32, + "ne2d": 116, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2927,8 +2927,8 @@ 0.0, 0.0 ], - "ne1d": 28, - "ne2d": 118, + "ne1d": 32, + "ne2d": 124, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2942,8 +2942,8 @@ 0.0, 0.0 ], - "ne1d": 28, - "ne2d": 122, + "ne1d": 32, + "ne2d": 124, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2957,8 +2957,8 @@ 0.0, 0.0 ], - "ne1d": 39, - "ne2d": 239, + "ne1d": 43, + "ne2d": 249, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0 @@ -2973,7 +2973,7 @@ 0.0 ], "ne1d": 79, - "ne2d": 705, + "ne2d": 687, "ne3d": 0, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", "total_badness": 0.0