diff --git a/libsrc/meshing/improve3.cpp b/libsrc/meshing/improve3.cpp index 32f08103..80e60545 100644 --- a/libsrc/meshing/improve3.cpp +++ b/libsrc/meshing/improve3.cpp @@ -2725,7 +2725,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, for (ElementIndex eli : myrange) { const auto & el = mesh[eli]; - if(el.flags.fixed || el.IsDeleted()) + if(el.flags.fixed) continue; for (auto pi : el.PNums()) @@ -2828,8 +2828,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal, mesh.DeleteBoundaryEdges(); } - else - mesh.Compress (); + mesh.Compress (); multithread.task = savetask; } diff --git a/libsrc/meshing/meshclass.cpp b/libsrc/meshing/meshclass.cpp index 1df22c89..c3a32e64 100644 --- a/libsrc/meshing/meshclass.cpp +++ b/libsrc/meshing/meshclass.cpp @@ -2140,8 +2140,6 @@ namespace netgen [&](auto & table, ElementIndex ei) { const Element & el = (*this)[ei]; - if(el.IsDeleted()) - return; if (dom == 0 || dom == el.GetIndex()) { if (el.GetNP() == 4) diff --git a/tests/pytest/results.json b/tests/pytest/results.json index 2f6648ec..8c8b0139 100644 --- a/tests/pytest/results.json +++ b/tests/pytest/results.json @@ -1453,9 +1453,9 @@ ], "ne1d": 10108, "ne2d": 29958, - "ne3d": 152530, - "quality_histogram": "[0, 3, 1, 3, 6, 14, 58, 146, 470, 1207, 2727, 5671, 10179, 16179, 21787, 25946, 26803, 22852, 14596, 3882]", - "total_badness": 201507.49618 + "ne3d": 152534, + "quality_histogram": "[0, 3, 1, 3, 6, 14, 58, 147, 466, 1206, 2715, 5679, 10184, 16198, 21769, 25949, 26794, 22865, 14592, 3885]", + "total_badness": 201509.42542 }, { "angles_tet": [ @@ -1483,9 +1483,9 @@ ], "ne1d": 9622, "ne2d": 23596, - "ne3d": 80226, - "quality_histogram": "[2, 15, 4, 15, 17, 34, 88, 193, 428, 989, 2149, 4200, 7164, 10324, 12459, 13488, 12327, 9360, 5530, 1440]", - "total_badness": 110249.40023 + "ne3d": 80222, + "quality_histogram": "[2, 15, 4, 17, 17, 35, 89, 194, 426, 984, 2152, 4199, 7155, 10324, 12467, 13496, 12313, 9367, 5529, 1437]", + "total_badness": 110253.4299 } ], "hinge.stl": [ @@ -1517,7 +1517,7 @@ "ne2d": 610, "ne3d": 778, "quality_histogram": "[0, 0, 2, 10, 9, 8, 23, 16, 37, 43, 67, 80, 99, 93, 80, 82, 48, 50, 27, 4]", - "total_badness": 1361.2707697 + "total_badness": 1361.2707696 }, { "angles_tet": [ @@ -1556,7 +1556,7 @@ ], "angles_trig": [ 23.111, - 129.16 + 130.19 ], "ne1d": 722, "ne2d": 2856, @@ -2086,7 +2086,7 @@ "ne2d": 6832, "ne3d": 82638, "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 4, 17, 95, 389, 1384, 3560, 7554, 12625, 17561, 19497, 15113, 4838]", - "total_badness": 99948.684701 + "total_badness": 99948.684705 } ], "period.geo": [ @@ -2193,9 +2193,9 @@ ], "ne1d": 886, "ne2d": 2528, - "ne3d": 8233, - "quality_histogram": "[5, 8, 28, 42, 46, 55, 42, 60, 85, 121, 254, 406, 631, 878, 1224, 1258, 1262, 1075, 591, 162]", - "total_badness": 12214.411217 + "ne3d": 8238, + "quality_histogram": "[5, 8, 28, 42, 46, 54, 44, 60, 87, 123, 252, 414, 633, 875, 1235, 1255, 1253, 1065, 604, 155]", + "total_badness": 12230.270782 }, { "angles_tet": [ @@ -2204,18 +2204,18 @@ ], "angles_trig": [ 4.4862, - 146.57 + 148.52 ], "ne1d": 570, "ne2d": 1126, - "ne3d": 1560, - "quality_histogram": "[4, 30, 43, 50, 54, 65, 89, 111, 114, 142, 156, 125, 134, 135, 110, 67, 67, 44, 18, 2]", - "total_badness": 4083.0633835 + "ne3d": 1592, + "quality_histogram": "[4, 27, 41, 49, 62, 73, 91, 112, 117, 142, 162, 129, 138, 140, 114, 71, 61, 42, 16, 1]", + "total_badness": 4125.4080636 }, { "angles_tet": [ 1.1, - 172.08 + 172.16 ], "angles_trig": [ 3.728, @@ -2223,9 +2223,9 @@ ], "ne1d": 724, "ne2d": 1662, - "ne3d": 3108, - "quality_histogram": "[2, 13, 30, 52, 52, 36, 53, 70, 99, 123, 219, 240, 324, 383, 398, 378, 312, 192, 113, 19]", - "total_badness": 5664.2245457 + "ne3d": 3117, + "quality_histogram": "[2, 12, 30, 54, 56, 40, 51, 70, 98, 128, 217, 263, 320, 383, 400, 362, 301, 205, 108, 17]", + "total_badness": 5701.3001361 }, { "angles_tet": [ @@ -2238,9 +2238,9 @@ ], "ne1d": 956, "ne2d": 2742, - "ne3d": 8643, - "quality_histogram": "[3, 10, 40, 47, 44, 55, 53, 56, 90, 128, 183, 319, 518, 776, 1137, 1419, 1513, 1295, 751, 206]", - "total_badness": 12613.728842 + "ne3d": 8642, + "quality_histogram": "[3, 11, 40, 45, 45, 55, 54, 56, 84, 135, 185, 320, 518, 792, 1121, 1438, 1493, 1311, 732, 204]", + "total_badness": 12619.116865 }, { "angles_tet": [ @@ -2253,9 +2253,9 @@ ], "ne1d": 1554, "ne2d": 6276, - "ne3d": 30120, - "quality_histogram": "[2, 8, 13, 7, 28, 48, 56, 68, 92, 152, 307, 624, 1232, 2258, 3664, 5150, 5912, 5613, 3776, 1110]", - "total_badness": 38996.524352 + "ne3d": 30127, + "quality_histogram": "[2, 8, 13, 7, 28, 46, 56, 65, 99, 149, 301, 625, 1226, 2243, 3685, 5125, 5942, 5591, 3816, 1100]", + "total_badness": 38992.330542 }, { "angles_tet": [ @@ -2268,9 +2268,9 @@ ], "ne1d": 2992, "ne2d": 23260, - "ne3d": 281956, - "quality_histogram": "[4, 10, 11, 10, 10, 23, 27, 58, 101, 248, 736, 2043, 5573, 13773, 27905, 44806, 59154, 64199, 48322, 14943]", - "total_badness": 344631.48043 + "ne3d": 282006, + "quality_histogram": "[4, 10, 11, 10, 10, 24, 27, 58, 103, 256, 737, 2052, 5583, 13827, 27949, 44817, 59126, 64139, 48326, 14937]", + "total_badness": 344740.46205 } ], "revolution.geo": [ @@ -2599,93 +2599,93 @@ "sphere.geo": [ { "angles_tet": [ - 9.7311, - 168.24 + 42.043, + 88.484 ], "angles_trig": [ - 10.368, - 153.96 + 20.502, + 79.749 ], "ne1d": 0, "ne2d": 124, - "ne3d": 118, - "quality_histogram": "[0, 0, 2, 28, 72, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", - "total_badness": 549.67143776 + "ne3d": 124, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 4, 26, 49, 28, 11, 4, 0, 2, 0, 0, 0, 0]", + "total_badness": 231.6979717 }, { "angles_tet": [ - 16.357, - 160.14 + 46.583, + 91.583 ], "angles_trig": [ - 17.738, - 141.22 + 31.308, + 74.346 ], "ne1d": 0, "ne2d": 56, - "ne3d": 50, - "quality_histogram": "[0, 0, 0, 0, 1, 2, 19, 17, 10, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", - "total_badness": 141.03421685 + "ne3d": 56, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 18, 19, 15, 0, 0]", + "total_badness": 68.826138928 }, { "angles_tet": [ - 13.631, - 163.82 + 42.168, + 87.886 ], "angles_trig": [ - 14.237, - 145.42 + 28.464, + 75.768 ], "ne1d": 0, "ne2d": 70, - "ne3d": 64, - "quality_histogram": "[0, 0, 0, 1, 2, 14, 36, 9, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", - "total_badness": 206.35254305 + "ne3d": 70, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 11, 29, 16, 9, 2, 0, 0]", + "total_badness": 94.413874623 }, { "angles_tet": [ - 9.7311, - 168.24 + 42.043, + 88.484 ], "angles_trig": [ - 10.368, - 153.96 + 20.502, + 79.749 ], "ne1d": 0, "ne2d": 124, - "ne3d": 118, - "quality_histogram": "[0, 0, 2, 28, 72, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]", - "total_badness": 549.67143776 + "ne3d": 124, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 4, 26, 49, 28, 11, 4, 0, 2, 0, 0, 0, 0]", + "total_badness": 231.6979717 }, { "angles_tet": [ - 21.015, - 128.39 + 23.979, + 130.28 ], "angles_trig": [ - 20.501, - 112.39 + 21.654, + 112.69 ], "ne1d": 0, "ne2d": 258, - "ne3d": 356, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 2, 9, 27, 42, 47, 53, 46, 41, 33, 28, 13, 13, 2]", - "total_badness": 562.03525638 + "ne3d": 365, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 2, 22, 37, 56, 50, 43, 51, 29, 34, 23, 12, 6]", + "total_badness": 556.26115599 }, { "angles_tet": [ - 27.729, - 134.58 + 27.682, + 137.56 ], "angles_trig": [ - 26.415, - 114.11 + 26.982, + 116.02 ], "ne1d": 0, "ne2d": 658, - "ne3d": 2305, - "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 51, 114, 246, 411, 474, 523, 350, 108]", - "total_badness": 2829.8918826 + "ne3d": 2312, + "quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 7, 22, 55, 136, 287, 383, 459, 515, 342, 104]", + "total_badness": 2855.6969029 } ], "sphereincube.geo": [