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

Merge branch 'master' into cleanup_geometry

Browse Source
This commit is contained in:
Christopher Lackner 2019-11-02 19:39:00 +01:00
commit c1ede2a89f
3 changed files with 189 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/core/exception.cpp
View File

@ -14,6 +14,7 @@
#include <memory>
#include <cxxabi.h>
#include <signal.h>
#include <vector>
namespace ngcore
{
@ -104,11 +105,11 @@ namespace ngcore
if(!funcname.empty())
{
std::array<char, 256> buffer;
std::vector<char> buffer(10240);
int status;
size_t size = buffer.size();
abi::__cxa_demangle(funcname.c_str(), buffer.data(), &size, &status);
out << "in " << yellow << buffer.data() << reset_shell << '\n';
abi::__cxa_demangle(funcname.c_str(), &buffer[0], &size, &status);
out << "in " << yellow << &buffer[0] << reset_shell << '\n';
std::string nm_command = "nm " + libname + " | grep " + funcname + " | cut -f 1 -d ' '";
std::string output;
@ -145,12 +146,12 @@ namespace ngcore
{
std::cerr << "Collecting backtrace..." << std::endl;
std::stringstream result;
void *bt[1024];
void *bt[100];
int bt_size;
char **bt_syms;
int i;
bt_size = backtrace(bt, 1024);
bt_size = backtrace(bt, 100);
bt_syms = backtrace_symbols(bt, bt_size);
Dl_info info;
for (i = 1; i < bt_size-1; i++)

362
tests/pytest/results.json
View File

@ -293,33 +293,33 @@
},
{
"angles_tet": [
12.942,
162.28
15.271,
159.02
],
"angles_trig": [
10.449,
154.86
14.076,
146.64
],
"ne1d": 32,
"ne2d": 220,
"ne3d": 651,
"quality_histogram": "[0, 0, 0, 7, 5, 23, 31, 53, 53, 64, 49, 37, 45, 59, 49, 52, 48, 45, 23, 8]",
"total_badness": 1234.956476
"ne3d": 642,
"quality_histogram": "[0, 0, 0, 0, 4, 22, 41, 45, 52, 48, 42, 42, 63, 64, 57, 33, 39, 45, 37, 8]",
"total_badness": 1182.99704
},
{
"angles_tet": [
2.7343,
173.79
2.7569,
173.39
],
"angles_trig": [
8.7414,
158.73
7.6422,
156.83
],
"ne1d": 48,
"ne2d": 428,
"ne3d": 868,
"quality_histogram": "[0, 7, 36, 34, 44, 67, 67, 67, 87, 94, 61, 81, 55, 45, 46, 23, 20, 18, 15, 1]",
"total_badness": 2363.7016426
"ne3d": 811,
"quality_histogram": "[0, 8, 32, 34, 32, 51, 46, 63, 86, 81, 63, 72, 59, 44, 46, 24, 27, 24, 15, 4]",
"total_badness": 2131.9115363
},
{
"angles_tet": [
@ -471,9 +471,9 @@
],
"ne1d": 262,
"ne2d": 726,
"ne3d": 2187,
"quality_histogram": "[0, 4, 11, 35, 76, 102, 132, 102, 83, 52, 60, 80, 114, 196, 255, 258, 257, 227, 114, 29]",
"total_badness": 4157.6373393
"ne3d": 2186,
"quality_histogram": "[0, 4, 11, 34, 76, 101, 133, 102, 83, 52, 61, 79, 114, 196, 255, 258, 257, 227, 114, 29]",
"total_badness": 4154.7434704
},
{
"angles_tet": [
@ -507,8 +507,8 @@
},
{
"angles_tet": [
5.1036,
168.02
5.1018,
167.98
],
"angles_trig": [
12.696,
@ -516,9 +516,9 @@
],
"ne1d": 262,
"ne2d": 726,
"ne3d": 2083,
"quality_histogram": "[0, 2, 6, 20, 50, 80, 113, 89, 78, 45, 36, 73, 98, 176, 267, 270, 286, 225, 135, 34]",
"total_badness": 3674.0021566
"ne3d": 2080,
"quality_histogram": "[0, 2, 6, 20, 50, 80, 113, 90, 72, 47, 38, 75, 95, 179, 262, 272, 286, 224, 135, 34]",
"total_badness": 3667.9320382
},
{
"angles_tet": [
@ -854,24 +854,24 @@
],
"ne1d": 24,
"ne2d": 66,
"ne3d": 76,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 1, 6, 10, 0, 4, 5, 8, 5, 4, 10, 19, 2, 0]",
"total_badness": 119.18652785
"ne3d": 71,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 2, 4, 9, 1, 5, 3, 3, 3, 2, 9, 24, 3, 1]",
"total_badness": 108.79228828
},
{
"angles_tet": [
17.07,
156.8
14.383,
158.73
],
"angles_trig": [
18.547,
129.78
12.296,
144.06
],
"ne1d": 36,
"ne2d": 152,
"ne3d": 425,
"quality_histogram": "[0, 0, 0, 0, 0, 2, 16, 28, 35, 41, 45, 44, 30, 38, 28, 28, 45, 18, 20, 7]",
"total_badness": 743.37290709
"ne3d": 515,
"quality_histogram": "[0, 0, 0, 1, 2, 12, 25, 45, 55, 55, 63, 44, 38, 41, 26, 30, 42, 16, 13, 7]",
"total_badness": 981.48109509
},
{
"angles_tet": [
@ -941,14 +941,14 @@
167.27
],
"angles_trig": [
10.966,
10.973,
150.52
],
"ne1d": 48,
"ne2d": 142,
"ne3d": 162,
"quality_histogram": "[0, 0, 2, 7, 26, 32, 17, 2, 0, 2, 0, 1, 4, 4, 6, 13, 15, 13, 18, 0]",
"total_badness": 438.06788961
"quality_histogram": "[0, 0, 2, 7, 26, 32, 17, 2, 0, 2, 0, 1, 2, 5, 6, 15, 15, 13, 17, 0]",
"total_badness": 437.74460755
},
{
"angles_tet": [
@ -1014,18 +1014,18 @@
},
{
"angles_tet": [
3.5997,
172.04
4.2159,
171.02
],
"angles_trig": [
6.8707,
163.48
7.6756,
159.68
],
"ne1d": 0,
"ne2d": 192,
"ne3d": 1007,
"quality_histogram": "[0, 29, 63, 130, 181, 138, 104, 73, 68, 45, 42, 28, 23, 29, 16, 12, 9, 9, 6, 2]",
"total_badness": 3930.5060123
"ne3d": 957,
"quality_histogram": "[0, 21, 76, 109, 128, 111, 100, 84, 77, 55, 62, 31, 32, 22, 10, 15, 8, 10, 4, 2]",
"total_badness": 3582.099151
},
{
"angles_tet": [
@ -1074,18 +1074,18 @@
},
{
"angles_tet": [
23.713,
141.52
23.712,
141.53
],
"angles_trig": [
27.222,
121.78
27.221,
120.25
],
"ne1d": 0,
"ne2d": 4236,
"ne3d": 37098,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 11, 43, 183, 472, 1416, 3234, 5627, 7717, 8927, 7206, 2261]",
"total_badness": 44647.422985
"ne3d": 37109,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 1, 11, 43, 182, 476, 1429, 3220, 5619, 7718, 8934, 7209, 2267]",
"total_badness": 44660.376357
}
],
"ellipticcone.geo": [
@ -1162,7 +1162,7 @@
"ne2d": 3468,
"ne3d": 13471,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 8, 18, 67, 132, 305, 570, 999, 1594, 2335, 2604, 2480, 1787, 572]",
"total_badness": 17093.610487
"total_badness": 17093.610502
},
{
"angles_tet": [
@ -1175,9 +1175,9 @@
],
"ne1d": 432,
"ne2d": 9544,
"ne3d": 69860,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 7, 30, 69, 224, 646, 1567, 3678, 7012, 11245, 14665, 15510, 11805, 3401]",
"total_badness": 85646.633699
"ne3d": 69863,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 7, 30, 69, 222, 646, 1562, 3675, 7035, 11242, 14646, 15515, 11810, 3403]",
"total_badness": 85648.446235
}
],
"ellipticcyl.geo": [
@ -1367,18 +1367,18 @@
"frame.step": [
{
"angles_tet": [
2.6027,
2.6064,
169.75
],
"angles_trig": [
1.845,
158.55
168.38
],
"ne1d": 12598,
"ne2d": 39662,
"ne3d": 202894,
"quality_histogram": "[2, 10, 7, 6, 13, 48, 112, 309, 901, 2108, 4329, 8335, 14659, 22946, 29480, 33978, 34111, 28568, 18133, 4839]",
"total_badness": 271396.36361
"ne3d": 202536,
"quality_histogram": "[2, 10, 7, 6, 13, 37, 104, 289, 845, 2026, 4332, 8423, 14609, 22851, 29589, 34182, 33768, 28703, 18049, 4691]",
"total_badness": 270815.65433
},
{
"angles_tet": [
@ -1391,24 +1391,24 @@
],
"ne1d": 5988,
"ne2d": 11102,
"ne3d": 29168,
"quality_histogram": "[3, 4, 7, 13, 24, 42, 119, 241, 722, 989, 1571, 2460, 3055, 3939, 4323, 4223, 3360, 2411, 1347, 315]",
"total_badness": 43309.92559
"ne3d": 29144,
"quality_histogram": "[3, 4, 7, 13, 24, 39, 120, 238, 735, 977, 1562, 2454, 3050, 3952, 4320, 4203, 3345, 2437, 1347, 314]",
"total_badness": 43262.081817
},
{
"angles_tet": [
2.1657,
2.1686,
174.11
],
"angles_trig": [
2.2053,
1.6035,
174.13
],
"ne1d": 9622,
"ne2d": 23964,
"ne3d": 80728,
"quality_histogram": "[1, 16, 3, 20, 18, 44, 94, 232, 517, 1099, 2434, 4593, 7471, 10296, 12656, 13142, 11844, 9162, 5660, 1426]",
"total_badness": 111694.25744
"ne2d": 23960,
"ne3d": 80378,
"quality_histogram": "[1, 16, 3, 18, 17, 40, 88, 211, 453, 1061, 2481, 4518, 7443, 10609, 12618, 12976, 11798, 9193, 5456, 1378]",
"total_badness": 111174.13725
}
],
"hinge.stl": [
@ -1438,9 +1438,9 @@
],
"ne1d": 298,
"ne2d": 610,
"ne3d": 832,
"quality_histogram": "[0, 0, 1, 11, 8, 3, 21, 17, 42, 47, 76, 91, 104, 97, 92, 86, 57, 48, 27, 4]",
"total_badness": 1432.6971804
"ne3d": 817,
"quality_histogram": "[0, 0, 1, 11, 8, 5, 21, 16, 43, 41, 72, 88, 107, 100, 84, 87, 52, 50, 28, 3]",
"total_badness": 1409.8967045
},
{
"angles_tet": [
@ -1498,9 +1498,9 @@
],
"ne1d": 1862,
"ne2d": 19474,
"ne3d": 136621,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 14, 55, 291, 892, 2633, 6517, 13067, 21320, 29000, 31114, 23880, 7837]",
"total_badness": 166165.22295
"ne3d": 136597,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 1, 12, 54, 288, 870, 2618, 6513, 13052, 21346, 28986, 31108, 23898, 7851]",
"total_badness": 166108.75934
}
],
"lense.in2d": [
@ -1765,7 +1765,7 @@
"ne2d": 1198,
"ne3d": 5066,
"quality_histogram": "[0, 0, 11, 118, 169, 57, 61, 111, 95, 184, 293, 368, 508, 651, 617, 577, 496, 429, 246, 75]",
"total_badness": 8799.2034124
"total_badness": 8799.2034431
},
{
"angles_tet": [
@ -1795,7 +1795,7 @@
"ne2d": 830,
"ne3d": 2488,
"quality_histogram": "[0, 0, 3, 37, 71, 155, 161, 102, 158, 211, 284, 276, 249, 203, 195, 139, 108, 79, 42, 15]",
"total_badness": 5146.3098742
"total_badness": 5146.3098744
},
{
"angles_tet": [
@ -1839,8 +1839,8 @@
"ne1d": 418,
"ne2d": 5968,
"ne3d": 101047,
"quality_histogram": "[0, 0, 0, 0, 0, 1, 5, 8, 52, 104, 356, 989, 2551, 5548, 10164, 16045, 20725, 22252, 16919, 5328]",
"total_badness": 124081.8709
"quality_histogram": "[0, 0, 0, 0, 0, 1, 5, 8, 52, 104, 356, 989, 2551, 5548, 10164, 16045, 20725, 22251, 16920, 5328]",
"total_badness": 124081.88321
}
],
"ortho.geo": [
@ -1964,7 +1964,7 @@
"ne2d": 288,
"ne3d": 528,
"quality_histogram": "[0, 0, 0, 2, 4, 2, 4, 3, 16, 24, 36, 41, 54, 70, 68, 73, 59, 47, 24, 1]",
"total_badness": 813.79298259
"total_badness": 813.79298254
},
{
"angles_tet": [
@ -2024,39 +2024,39 @@
],
"ne1d": 344,
"ne2d": 1136,
"ne3d": 3267,
"quality_histogram": "[0, 0, 0, 0, 1, 4, 15, 26, 55, 93, 181, 259, 350, 454, 454, 445, 400, 295, 185, 50]",
"total_badness": 4760.8393552
"ne3d": 3263,
"quality_histogram": "[0, 0, 0, 0, 1, 4, 15, 26, 53, 90, 178, 259, 351, 445, 457, 447, 406, 297, 185, 49]",
"total_badness": 4746.5378667
},
{
"angles_tet": [
9.7531,
164.55
9.7417,
164.57
],
"angles_trig": [
12.309,
141.65
12.303,
141.6
],
"ne1d": 160,
"ne2d": 286,
"ne3d": 585,
"quality_histogram": "[0, 0, 0, 2, 9, 14, 21, 29, 35, 70, 61, 78, 66, 39, 36, 37, 36, 33, 14, 5]",
"total_badness": 1085.7831583
"ne3d": 568,
"quality_histogram": "[0, 0, 0, 2, 9, 12, 20, 25, 31, 69, 59, 78, 60, 40, 38, 40, 34, 33, 14, 4]",
"total_badness": 1044.7873254
},
{
"angles_tet": [
10.104,
163.38
13.063,
161.0
],
"angles_trig": [
14.246,
16.741,
141.37
],
"ne1d": 232,
"ne2d": 598,
"ne3d": 1538,
"quality_histogram": "[0, 0, 0, 2, 14, 22, 43, 65, 85, 110, 147, 167, 147, 176, 174, 120, 115, 80, 58, 13]",
"total_badness": 2657.5718121
"ne3d": 1523,
"quality_histogram": "[0, 0, 0, 1, 7, 20, 34, 48, 65, 111, 135, 155, 165, 189, 171, 134, 132, 89, 52, 15]",
"total_badness": 2538.6647915
},
{
"angles_tet": [
@ -2069,9 +2069,9 @@
],
"ne1d": 344,
"ne2d": 1136,
"ne3d": 3229,
"quality_histogram": "[0, 0, 0, 0, 1, 4, 13, 23, 46, 81, 150, 228, 330, 443, 467, 439, 439, 323, 180, 62]",
"total_badness": 4634.0843144
"ne3d": 3233,
"quality_histogram": "[0, 0, 0, 0, 1, 4, 12, 23, 48, 81, 149, 226, 335, 430, 473, 436, 439, 333, 186, 57]",
"total_badness": 4637.4815537
},
{
"angles_tet": [
@ -2090,7 +2090,7 @@
},
{
"angles_tet": [
21.559,
21.56,
145.28
],
"angles_trig": [
@ -2099,9 +2099,9 @@
],
"ne1d": 820,
"ne2d": 6226,
"ne3d": 68687,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 11, 49, 183, 506, 1537, 3645, 6895, 10992, 14335, 15196, 11647, 3691]",
"total_badness": 84001.076915
"ne3d": 68692,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 11, 49, 185, 510, 1531, 3657, 6895, 10997, 14320, 15199, 11644, 3694]",
"total_badness": 84012.009025
}
],
"plane.stl": [
@ -2116,9 +2116,9 @@
],
"ne1d": 890,
"ne2d": 2626,
"ne3d": 8294,
"quality_histogram": "[4, 17, 28, 31, 56, 53, 52, 65, 101, 174, 258, 406, 664, 825, 1173, 1279, 1268, 1067, 604, 169]",
"total_badness": 12467.41506
"ne3d": 8292,
"quality_histogram": "[4, 17, 28, 31, 55, 55, 51, 64, 101, 174, 260, 405, 664, 824, 1173, 1279, 1268, 1066, 604, 169]",
"total_badness": 12461.942534
},
{
"angles_tet": [
@ -2131,9 +2131,9 @@
],
"ne1d": 570,
"ne2d": 1202,
"ne3d": 1838,
"quality_histogram": "[2, 29, 38, 59, 64, 78, 101, 142, 154, 179, 190, 164, 155, 136, 119, 81, 72, 47, 24, 4]",
"total_badness": 4626.8081476
"ne3d": 1831,
"quality_histogram": "[2, 29, 38, 60, 65, 77, 105, 141, 152, 176, 189, 161, 156, 135, 118, 80, 71, 48, 24, 4]",
"total_badness": 4620.6249923
},
{
"angles_tet": [
@ -2161,9 +2161,9 @@
],
"ne1d": 956,
"ne2d": 2828,
"ne3d": 8553,
"quality_histogram": "[3, 9, 39, 50, 44, 51, 59, 58, 82, 134, 194, 341, 553, 831, 1187, 1355, 1471, 1204, 712, 176]",
"total_badness": 12579.823603
"ne3d": 8549,
"quality_histogram": "[3, 9, 39, 50, 44, 51, 59, 59, 82, 133, 195, 336, 560, 830, 1174, 1357, 1462, 1224, 706, 176]",
"total_badness": 12575.367761
},
{
"angles_tet": [
@ -2176,9 +2176,9 @@
],
"ne1d": 1554,
"ne2d": 6372,
"ne3d": 31632,
"quality_histogram": "[2, 8, 13, 8, 24, 53, 51, 72, 93, 187, 306, 631, 1287, 2372, 3831, 5340, 6171, 5877, 4151, 1155]",
"total_badness": 40867.972596
"ne3d": 31639,
"quality_histogram": "[2, 8, 13, 8, 24, 53, 51, 73, 92, 189, 305, 634, 1290, 2378, 3824, 5340, 6177, 5876, 4146, 1156]",
"total_badness": 40882.230035
},
{
"angles_tet": [
@ -2192,8 +2192,8 @@
"ne1d": 2992,
"ne2d": 23322,
"ne3d": 281660,
"quality_histogram": "[4, 9, 10, 11, 11, 22, 32, 66, 101, 250, 741, 2131, 5596, 13622, 27762, 44430, 59896, 63856, 48363, 14747]",
"total_badness": 344296.42922
"quality_histogram": "[4, 9, 10, 11, 11, 22, 32, 66, 101, 250, 741, 2131, 5596, 13622, 27762, 44429, 59897, 63856, 48363, 14747]",
"total_badness": 344296.42526
}
],
"revolution.geo": [
@ -2209,8 +2209,8 @@
"ne1d": 320,
"ne2d": 3110,
"ne3d": 8379,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 27, 91, 210, 452, 680, 983, 1089, 1149, 1165, 1083, 812, 518, 117]",
"total_badness": 11964.310541
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 27, 91, 210, 453, 679, 983, 1088, 1150, 1165, 1083, 812, 518, 117]",
"total_badness": 11964.310211
},
{
"angles_tet": [
@ -2229,18 +2229,18 @@
},
{
"angles_tet": [
15.455,
15.408,
145.04
],
"angles_trig": [
14.648,
14.362,
134.93
],
"ne1d": 240,
"ne2d": 1830,
"ne3d": 3862,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 32, 67, 154, 280, 412, 508, 495, 499, 430, 398, 332, 213, 40]",
"total_badness": 5742.111994
"ne3d": 3864,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 31, 69, 157, 283, 417, 507, 494, 513, 422, 403, 319, 206, 40]",
"total_badness": 5758.3866216
},
{
"angles_tet": [
@ -2255,7 +2255,7 @@
"ne2d": 3110,
"ne3d": 8253,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 13, 47, 138, 333, 624, 839, 1047, 1151, 1187, 1166, 945, 608, 153]",
"total_badness": 11468.849016
"total_badness": 11468.848993
},
{
"angles_tet": [
@ -2430,63 +2430,63 @@
"shaft.geo": [
{
"angles_tet": [
11.861,
162.65
11.152,
164.8
],
"angles_trig": [
11.536,
151.09
13.065,
153.81
],
"ne1d": 708,
"ne2d": 1722,
"ne3d": 2888,
"quality_histogram": "[0, 0, 0, 5, 22, 31, 50, 68, 109, 164, 278, 418, 327, 290, 256, 301, 246, 188, 106, 29]",
"total_badness": 4780.7450312
"ne3d": 2786,
"quality_histogram": "[0, 0, 1, 6, 23, 42, 45, 55, 94, 140, 280, 392, 314, 282, 250, 301, 240, 180, 105, 36]",
"total_badness": 4609.6986746
},
{
"angles_tet": [
14.99,
157.83
14.566,
156.38
],
"angles_trig": [
17.101,
121.63
120.3
],
"ne1d": 410,
"ne2d": 606,
"ne3d": 837,
"quality_histogram": "[0, 0, 0, 0, 0, 3, 0, 5, 21, 42, 43, 54, 83, 94, 118, 110, 89, 78, 51, 46]",
"total_badness": 1215.3787027
"ne3d": 870,
"quality_histogram": "[0, 0, 0, 0, 0, 3, 2, 5, 22, 36, 42, 53, 91, 101, 127, 131, 94, 85, 47, 31]",
"total_badness": 1263.6238885
},
{
"angles_tet": [
8.4343,
167.31
9.5449,
167.3
],
"angles_trig": [
10.596,
155.64
10.216,
148.27
],
"ne1d": 510,
"ne2d": 1004,
"ne3d": 2038,
"quality_histogram": "[0, 0, 4, 28, 43, 77, 101, 140, 143, 120, 135, 161, 142, 194, 216, 184, 195, 85, 56, 14]",
"total_badness": 3926.3340848
"ne3d": 2013,
"quality_histogram": "[0, 0, 2, 11, 38, 79, 90, 131, 106, 114, 113, 172, 155, 218, 217, 207, 190, 98, 58, 14]",
"total_badness": 3713.7502435
},
{
"angles_tet": [
14.303,
14.302,
162.65
],
"angles_trig": [
15.347,
147.74
17.889,
130.85
],
"ne1d": 708,
"ne2d": 1722,
"ne3d": 2795,
"quality_histogram": "[0, 0, 0, 1, 2, 2, 18, 29, 64, 128, 269, 412, 331, 316, 289, 307, 277, 209, 109, 32]",
"total_badness": 4321.8306337
"ne3d": 2748,
"quality_histogram": "[0, 0, 0, 0, 5, 3, 17, 26, 54, 118, 266, 416, 341, 298, 267, 329, 256, 205, 110, 37]",
"total_badness": 4242.1246898
},
{
"angles_tet": [
@ -2982,7 +2982,7 @@
"torus.geo": [
{
"angles_tet": [
16.896,
16.805,
152.81
],
"angles_trig": [
@ -2991,24 +2991,24 @@
],
"ne1d": 0,
"ne2d": 2534,
"ne3d": 5725,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 26, 89, 206, 394, 548, 658, 774, 820, 719, 629, 496, 275, 88]",
"total_badness": 8397.4026608
"ne3d": 5726,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 3, 26, 89, 209, 392, 549, 656, 774, 819, 718, 633, 497, 273, 88]",
"total_badness": 8399.0875048
},
{
"angles_tet": [
1.6289,
174.98
1.8454,
174.07
],
"angles_trig": [
4.715,
167.36
3.7635,
166.86
],
"ne1d": 0,
"ne2d": 692,
"ne3d": 3327,
"quality_histogram": "[18, 376, 565, 458, 423, 303, 290, 219, 148, 131, 120, 79, 58, 39, 36, 20, 15, 21, 4, 4]",
"total_badness": 18184.120092
"ne3d": 3289,
"quality_histogram": "[22, 357, 521, 490, 397, 337, 276, 212, 158, 125, 86, 85, 59, 35, 37, 25, 30, 23, 11, 3]",
"total_badness": 17806.714921
},
{
"angles_tet": [
@ -3036,9 +3036,9 @@
],
"ne1d": 0,
"ne2d": 2534,
"ne3d": 5622,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 7, 30, 146, 290, 432, 650, 749, 830, 788, 702, 543, 347, 107]",
"total_badness": 7969.2642686
"ne3d": 5613,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 1, 7, 32, 146, 287, 439, 640, 748, 826, 786, 707, 539, 349, 106]",
"total_badness": 7957.8333725
},
{
"angles_tet": [
@ -3051,9 +3051,9 @@
],
"ne1d": 0,
"ne2d": 5894,
"ne3d": 25266,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 11, 45, 117, 415, 859, 1688, 2866, 4124, 4942, 5200, 3815, 1184]",
"total_badness": 31475.174764
"ne3d": 25261,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 11, 44, 119, 414, 855, 1696, 2860, 4123, 4940, 5200, 3813, 1186]",
"total_badness": 31467.735079
},
{
"angles_tet": [
@ -3160,7 +3160,7 @@
"ne2d": 10042,
"ne3d": 84837,
"quality_histogram": "[0, 0, 0, 0, 0, 3, 55, 1435, 719, 373, 691, 1186, 2492, 5459, 8935, 13171, 16437, 16966, 12825, 4090]",
"total_badness": 108583.90758
"total_badness": 108583.90765
}
],
"twobricks.geo": [
@ -3252,7 +3252,7 @@
"ne2d": 346,
"ne3d": 595,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 23, 40, 55, 95, 101, 105, 99, 60, 8]",
"total_badness": 777.63273621
"total_badness": 777.63275563
}
],
"twocubes.geo": [
@ -3344,7 +3344,7 @@
"ne2d": 346,
"ne3d": 595,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 23, 40, 55, 95, 101, 105, 99, 60, 8]",
"total_badness": 777.63273621
"total_badness": 777.63275563
}
],
"twocyl.geo": [
@ -3365,33 +3365,33 @@
},
{
"angles_tet": [
18.424,
18.404,
153.38
],
"angles_trig": [
27.664,
26.007,
121.51
],
"ne1d": 68,
"ne2d": 100,
"ne3d": 152,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 2, 5, 6, 12, 11, 10, 14, 22, 19, 18, 23, 4, 4]",
"total_badness": 226.47203657
"ne3d": 150,
"quality_histogram": "[0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 12, 12, 8, 13, 24, 18, 18, 23, 4, 4]",
"total_badness": 222.6797729
},
{
"angles_tet": [
10.647,
163.92
12.34,
161.32
],
"angles_trig": [
11.415,
146.97
12.084,
152.05
],
"ne1d": 102,
"ne2d": 238,
"ne3d": 548,
"quality_histogram": "[0, 0, 0, 5, 10, 19, 40, 65, 83, 49, 39, 31, 25, 38, 34, 37, 44, 20, 7, 2]",
"total_badness": 1137.6676071
"ne3d": 497,
"quality_histogram": "[0, 0, 0, 2, 11, 31, 40, 56, 65, 43, 34, 21, 26, 25, 30, 31, 43, 28, 8, 3]",
"total_badness": 1042.5778658
},
{
"angles_tet": [

4
tests/pytest/test_tutorials.py
View File

@ -41,8 +41,8 @@ def checkData(mesh, mp, ref):
assert ref['ne3d'] == data['ne3d']
assert json.loads(ref['quality_histogram']) == pytest.approx(json.loads(data['quality_histogram']), abs=1, rel=0.4)
assert ref['total_badness'] == pytest.approx(data['total_badness'], rel=1e-5)
assert ref['angles_trig'] == pytest.approx(data['angles_trig'], rel=1e-5)
assert ref['angles_tet'] == pytest.approx(data['angles_tet'], rel=1e-5)
assert ref['angles_trig'] == pytest.approx(data['angles_trig'], rel=1e-4)
assert ref['angles_tet'] == pytest.approx(data['angles_tet'], rel=1e-4)
# get tutorials
def getFiles(fileEnding):