diff --git a/src/scaffoldmaker/meshtypes/meshtype_3d_lung1.py b/src/scaffoldmaker/meshtypes/meshtype_3d_lung1.py index c1de139a..a137a19a 100644 --- a/src/scaffoldmaker/meshtypes/meshtype_3d_lung1.py +++ b/src/scaffoldmaker/meshtypes/meshtype_3d_lung1.py @@ -140,7 +140,6 @@ def generateBaseMesh(cls, region, options): eftWedgeCollapseXi1_15 = eftfactory.createEftWedgeCollapseXi1Quadrant([1, 5]) eftWedgeCollapseXi1_26 = eftfactory.createEftWedgeCollapseXi1Quadrant([2, 6]) eftWedgeCollapseXi1_37 = eftfactory.createEftWedgeCollapseXi1Quadrant([3, 7]) - eftWedgeCollapseXi1_48 = eftfactory.createEftWedgeCollapseXi1Quadrant([4, 8]) eftWedgeCollapseXi1_57 = eftfactory.createEftWedgeCollapseXi1Quadrant([5, 7]) eftWedgeCollapseXi1_68 = eftfactory.createEftWedgeCollapseXi1Quadrant([6, 8]) eftWedgeCollapseXi2_56 = eftfactory.createEftWedgeCollapseXi2Quadrant([5, 6]) @@ -148,7 +147,6 @@ def generateBaseMesh(cls, region, options): eftTetCollapseXi1Xi2_71 = eftfactory.createEftTetrahedronCollapseXi1Xi2Quadrant(7, 1) eftTetCollapseXi1Xi2_82 = eftfactory.createEftTetrahedronCollapseXi1Xi2Quadrant(8, 2) eftTetCollapseXi1Xi2_63 = eftfactory.createEftTetrahedronCollapseXi1Xi2Quadrant(6, 3) - eftTetCollapseXi1Xi2_53 = eftfactory.createEftTetrahedronCollapseXi1Xi2Quadrant(5, 3) if isHuman: #valueLabels = [ Node.VALUE_LABEL_VALUE, Node.VALUE_LABEL_D_DS1, Node.VALUE_LABEL_D_DS2, Node.VALUE_LABEL_D_DS3 ] @@ -159,10 +157,10 @@ def generateBaseMesh(cls, region, options): ( 4, [ [ 175.176, 162.285,-317.267], [ -27.384, -29.319, -26.704], [ 9.020, -29.937, 61.149], [ 2.480, 21.158, 82.660] ] ), ( 5, [ [ 292.990, 153.587,-341.674], [ -10.831, 26.074, 66.575], [ -10.247, -58.090, 17.240], [ 10.595, 29.035, 61.452] ] ), ( 6, [ [ 241.787, 149.543,-291.578], [ -78.934, -21.344, 11.789], [ 22.813, -35.233, 12.622], [ -6.632, 28.612, 43.054] ] ), - ( 7, [ [ 155.646, 121.977,-271.628], [ -83.355, -36.289, 19.187], [ 35.892, -31.652, 7.476], [ 14.994, 29.267, 38.119] ] ), + ( 7, [ [ 155.702, 126.322,-273.198], [ -89.521, -38.973, 20.606], [ 16.492, -32.096, 4.354], [ 14.895, 29.074, 37.867] ] ), ( 8, [ [ 279.346, 98.455,-327.717], [ -21.666, 16.370, 35.485], [ -18.452, -43.354, 8.934], [ 18.541, 53.843, 54.860] ] ), ( 9, [ [ 251.887, 110.979,-294.259], [ -46.884, -0.667, 13.029], [ -6.640, -34.923, -9.542], [ -1.793, 34.831, 57.261] ] ), - ( 10, [ [ 203.263, 108.034,-281.647], [ -46.008, -21.960, 13.143], [ 34.048, -17.679, -6.475], [ 5.003, 37.773, 28.793] ] ), + ( 10, [ [ 203.263, 108.034,-281.647], [ -46.333, -22.115, 13.236], [ 35.945, -18.664, -6.836], [ 5.249, 39.630, 30.209] ] ), ( 11, [ [ 256.412, 71.152,-323.525], [ -14.537, 11.023, 15.628], [ -7.850, -10.251, 25.280], [ 35.613, 35.978, 71.913] ] ), ( 12, [ [ 243.935, 80.999,-302.872], [ -16.394, 8.598, 18.165], [ -8.074, -19.651, -6.343], [ 10.839, 34.046, 66.123] ] ), ( 13, [ [ 226.628, 91.702,-285.892], [ -23.230, -0.285, 15.358], [ 7.839, -18.769, -11.448], [ 6.974, 29.647, 42.160] ] ), @@ -196,15 +194,15 @@ def generateBaseMesh(cls, region, options): ( 41, [ [ 246.491, 63.880,-307.113], [ -7.559, 4.781, 7.258], [ -10.994, -7.365, 11.231], [ 30.221, 28.933, 71.221] ] ), ( 42, [ [ 239.325, 70.695,-300.571], [ -8.415, 6.741, 6.479], [ -7.094, -9.314, 3.351], [ 10.779, 13.380, 72.272] ] ), ( 43, [ [ 231.513, 77.178,-292.656], [ -12.525, 4.255, 3.319], [ -0.928, -16.243, -4.197], [ 11.706, 13.532, 59.617] ] ), - ( 44, [ [ 230.978, 62.444,-297.245], [ -14.698, 11.188, -2.359], [ -8.962, -8.354, 1.170], [ 0.931, 7.312, 54.971] ] ), + ( 44, [ [ 230.978, 62.444,-297.245], [ -9.805, 9.975, 8.601], [ -8.962, -8.354, 1.170], [ -5.556, 2.237, 55.703] ] ), ( 45, [ [ 258.329, 78.766,-234.210], [ -8.603, 4.498, 0.874], [ -37.867, -20.422, 2.056], [ 3.424, 4.618, 67.449] ] ), ( 46, [ [ 248.799, 84.344,-233.104], [ -10.725, 6.321, 0.445], [ -24.858, -21.841, -4.453], [ -12.855, -3.519, 64.769] ] ), ( 47, [ [ 238.275, 93.157,-232.136], [ -12.861, 7.971, -1.034], [ -9.789, -33.602, -12.451], [ -9.411, 14.946, 61.906] ] ), - ( 48, [ [ 223.573, 66.187,-240.080], [ -19.654, 31.273, -7.973], [ -20.558, -22.685, -0.982], [ -25.963, -0.396, 55.488] ] ), + ( 48, [ [ 223.573, 66.187,-240.080], [ -17.027, 20.665, -0.831], [ -28.759, -7.073, -9.354], [ -34.523, 0.750, 50.708] ] ), ( 49, [ [ 254.223, 82.226,-174.237], [ -21.821, 14.346, -0.313], [ -70.819, -36.828, -4.473], [ -6.474, 1.765, 58.654] ] ), ( 50, [ [ 232.669, 96.602,-174.812], [ -20.714, 13.936, 0.272], [ -45.067, -35.411, -8.030], [ -18.872, 10.884, 54.020] ] ), ( 51, [ [ 211.888, 109.358,-175.186], [ -20.256, 12.504, 0.821], [ -16.313, -50.413, -13.321], [ -35.462, 14.924, 45.481] ] ), - ( 52, [ [ 187.821, 69.713,-187.140], [ -13.187, 61.646, 5.702], [ -34.715, -33.733, -12.517], [ -31.504, 10.855, 49.018] ] ), + ( 52, [ [ 187.821, 69.713,-187.140], [ -17.219, 27.275, 2.313], [ -45.037, -16.749, -14.126], [ -30.897, 6.798, 50.061] ] ), ( 53, [ [ 213.425, 207.382, -42.148], [ -56.500, 0.342, -5.827], [ 6.048, -18.275, -16.938], [ -5.756, -22.958, 37.324] ] ), ( 54, [ [ 258.130, 182.777, -53.571], [ -32.759, -3.828, -5.952], [ 46.842, -36.257, -14.249], [ -42.970, -18.327, 45.780] ] ), ( 55, [ [ 221.272, 179.757, -61.791], [ -41.743, -3.435, -5.875], [ 10.486, -36.897, -21.690], [ -5.754, -11.017, 49.078] ] ), @@ -214,77 +212,77 @@ def generateBaseMesh(cls, region, options): ( 59, [ [ 185.274, 147.077,-102.145], [ -35.411, -3.106, -4.228], [ 15.191, -29.940, -31.756], [ -14.714, -1.454, 64.340] ] ), ( 60, [ [ 236.417, 87.160,-119.825], [ -26.717, 14.046, -6.516], [ -56.297, -42.646, -20.424], [ -33.135, 2.045, 67.489] ] ), ( 61, [ [ 209.605, 101.124,-126.121], [ -27.728, 12.727, -4.885], [ -42.756, -25.066, -21.644], [ -36.638, 1.272, 45.800] ] ), - ( 62, [ [ 181.792, 113.536,-131.292], [ -27.851, 13.168, -2.607], [ -10.444, -42.179, -14.896], [ -23.513, 15.200, 47.902] ] ), - ( 63, [ [ 162.311, 78.408,-140.383], [ -5.741, 48.954, -11.944], [ -48.917, -26.754, 6.663], [ -11.741, 16.148, 53.528] ] ), + ( 62, [ [ 181.792, 113.536,-131.292], [ -27.851, 13.168, -2.607], [ -7.595, -34.516, -8.836], [ -30.082, -2.456, 33.978] ] ), + ( 63, [ [ 161.721, 78.671,-141.179], [ -21.726, 42.029, -15.240], [ -51.129, -20.611, -10.957], [ -8.563, 21.673, 52.565] ] ), ( 64, [ [ 203.028, 174.619, -25.286], [ -60.155, -2.415, -3.955], [ -17.934, -44.396, 2.254], [ -5.864, 0.361, 32.179] ] ), - ( 65, [ [ 189.331, 131.538, -54.161], [ -73.019, 16.272, -14.723], [ -17.980, -26.665, -45.176], [ -2.116, -19.030, 46.007] ] ), - ( 66, [ [ 157.938, 103.099, -87.963], [ -38.581, 50.234, -40.028], [ -29.507, -44.106, -22.230], [ -56.230, -1.913, 36.555] ] ), - ( 67, [ [ 112.805, 220.636,-344.408], [ -57.668, 31.639, -21.158], [ -27.490, -7.728, 31.544], [ -7.261, 25.118, 94.161] ] ), - ( 68, [ [ 144.624, 170.181,-319.593], [ -45.954, 32.756, 25.839], [ 29.801, -31.427, 46.872], [ -14.588, 30.925, 88.492] ] ), + ( 65, [ [ 189.729, 132.313, -57.386], [ -66.731, 15.839, -24.611], [ -7.400, -14.578, -13.799], [ -31.717, 2.116, 31.478] ] ), + ( 66, [ [ 162.058, 109.623, -84.659], [ -29.742, 25.246, -50.572], [ -39.636, -28.589, -27.407], [ -49.298, 7.984, 46.787] ] ), + ( 67, [ [ 112.805, 220.636,-344.408], [ -57.668, 31.639, -21.158], [ -27.490, -7.728, 31.544], [ -7.261, 25.118, 94.160] ] ), + ( 68, [ [ 138.804, 176.487,-317.842], [ -42.283, 17.815, 25.150], [ 35.114, -29.696, 45.703], [ -14.588, 30.925, 88.491] ] ), ( 69, [ [ 91.579, 200.374,-316.049], [ -54.312, 26.071, -18.610], [ -21.624, -23.063, 24.318], [ 4.200, -7.127, 69.610] ] ), - ( 70, [ [ 45.375, 218.344,-353.416], [ -33.267, 4.881, -54.505], [ -61.732, -41.224, 6.887], [ 0.041, 11.357, 87.727] ] ), - ( 71, [ [ 153.816, 137.480,-272.108], [ -79.344, 59.453, -10.789], [ -31.650, -32.032, 32.484], [ -3.217, 13.768, 41.588] ] ), - ( 72, [ [ 74.446, 172.925,-295.847], [ -76.526, 2.015, -34.054], [ -12.428, -38.556, 16.527], [ 4.041, -7.852, 55.915] ] ), + ( 70, [ [ 45.375, 218.344,-353.416], [ -33.266, 4.881, -54.504], [ -61.732, -41.224, 6.887], [ 0.041, 11.357, 87.726] ] ), + ( 71, [ [ 157.132, 141.529,-272.796], [ -81.449, 61.031, -11.075], [ -12.618, -42.064, 37.035], [ -3.164, 13.541, 40.904] ] ), + ( 72, [ [ 74.446, 172.925,-295.847], [ -76.526, 2.015, -34.054], [ -12.428, -38.556, 16.527], [ 4.041, -7.852, 55.914] ] ), ( 73, [ [ 19.591, 150.815,-334.755], [ -3.346, -58.150, -34.776], [ -2.241, -66.932, 16.771], [ -37.214, 32.111, 65.155] ] ), - ( 74, [ [ 108.352, 123.286,-268.077], [ -31.450, 15.693, 5.225], [ -33.972, -20.910, -4.547], [ 22.886, 10.749, 29.999] ] ), - ( 75, [ [ 69.151, 126.208,-283.827], [ -43.253, -15.831, -25.640], [ 5.343, -46.935, 6.573], [ -2.573, 8.979, 43.158] ] ), - ( 76, [ [ 36.295, 94.586,-323.318], [ -23.915, -46.011, -46.866], [ 28.031, -41.992, 18.733], [ -35.404, 53.450, 65.721] ] ), - ( 77, [ [ 102.378, 96.563,-272.210], [ -19.527, -13.375, -6.786], [ 9.534, -20.075, 2.002], [ 9.033, 23.903, 34.847] ] ), - ( 78, [ [ 83.599, 83.999,-282.740], [ -14.132, -14.812, -15.431], [ 32.104, -10.775, 2.129], [ -23.146, 18.638, 18.839] ] ), - ( 79, [ [ 67.542, 71.106,-298.778], [ -14.808, -11.987, -18.636], [ 32.907, -12.725, 14.740], [ -50.592, 24.213, 13.600] ] ), - ( 80, [ [ 109.300, 234.171,-248.531], [ -52.302, 25.979, -18.010], [ -19.304, -36.967, 0.740], [ -4.582, 1.836, 96.421] ] ), - ( 81, [ [ 135.331, 190.757,-238.135], [ -39.822, 0.430, -4.178], [ 22.077, -42.173, 7.556], [ -3.889, 9.995, 73.763] ] ), + ( 74, [ [ 110.041, 132.222,-267.112], [ -38.045, -0.257, 4.674], [ -17.685, -35.955, 7.777], [ 13.262, 5.765, 25.693] ] ), + ( 75, [ [ 69.151, 126.208,-283.827], [ -43.252, -15.831, -25.640], [ 5.343, -46.939, 6.574], [ -2.573, 8.979, 43.158] ] ), + ( 76, [ [ 36.295, 94.586,-323.318], [ -23.915, -46.011, -46.866], [ 28.030, -41.990, 18.732], [ -35.404, 53.450, 65.721] ] ), + ( 77, [ [ 102.468, 96.616,-272.124], [ -19.736, -13.518, -6.858], [ 7.724, -16.668, 0.398], [ 8.984, 23.773, 34.657] ] ), + ( 78, [ [ 83.599, 83.999,-282.740], [ -14.132, -14.812, -15.431], [ 32.211, -10.811, 2.136], [ -23.147, 18.638, 18.839] ] ), + ( 79, [ [ 67.542, 71.106,-298.778], [ -14.808, -11.987, -18.636], [ 32.574, -12.596, 14.591], [ -50.592, 24.213, 13.600] ] ), + ( 80, [ [ 109.300, 234.171,-248.531], [ -52.302, 25.979, -18.010], [ -19.303, -36.966, 0.740], [ -4.582, 1.836, 96.421] ] ), + ( 81, [ [ 135.331, 190.757,-238.135], [ -39.821, 0.430, -4.178], [ 22.077, -42.173, 7.556], [ -3.889, 9.995, 73.763] ] ), ( 82, [ [ 91.699, 199.576,-247.800], [ -46.192, 17.407, -15.151], [ -16.031, -32.155, 0.697], [ -3.291, 2.421, 66.468] ] ), - ( 83, [ [ 46.055, 227.254,-268.328], [ -44.923, 35.895, -26.293], [ -53.545, -36.498, -12.333], [ 1.708, 5.118, 82.513] ] ), - ( 84, [ [ 152.423, 152.232,-233.455], [ -80.327, 24.447, -7.950], [ -7.571, -34.911, -1.433], [ -4.926, 12.512, 36.525] ] ), - ( 85, [ [ 77.265, 169.881,-247.131], [ -69.352, 10.546, -19.469], [ -10.609, -28.576, 2.252], [ 1.874, 0.636, 41.232] ] ), - ( 86, [ [ 14.896, 174.390,-270.710], [ -54.453, -2.347, -27.972], [ -12.870, -45.688, 3.505], [ -0.893, 15.664, 55.196] ] ), - ( 87, [ [ 128.461, 142.532,-236.966], [ -58.190, 0.601, 0.855], [ -23.174, -13.575, -4.695], [ 19.504, 21.536, 33.741] ] ), - ( 88, [ [ 70.179, 142.990,-243.592], [ -57.695, 0.305, -14.313], [ -4.787, -27.614, 2.693], [ 4.708, 24.314, 36.010] ] ), - ( 89, [ [ 14.153, 142.929,-264.777], [ -53.192, -0.026, -29.221], [ 3.625, -31.170, 8.059], [ 4.661, 44.056, 51.260] ] ), - ( 90, [ [ 112.858, 122.968,-231.669], [ -45.051, -10.899, -8.599], [ -10.184, -27.018, 2.473], [ 14.630, 28.758, 45.554] ] ), - ( 91, [ [ 67.804, 115.230,-241.806], [ -44.888, -4.537, -11.644], [ 7.968, -30.392, 4.316], [ -6.116, 42.327, 60.537] ] ), - ( 92, [ [ 23.424, 113.892,-254.850], [ -43.703, 1.854, -14.388], [ 21.202, -35.008, 12.469], [ -29.770, 57.684, 72.277] ] ), - ( 93, [ [ 104.207, 234.698,-152.733], [ -57.745, 26.895, -7.074], [ -25.137, -25.018, -30.805], [ 0.558, -2.469, 77.754] ] ), + ( 83, [ [ 46.055, 227.254,-268.328], [ -44.924, 35.895, -26.293], [ -53.545, -36.498, -12.333], [ 1.708, 5.118, 82.513] ] ), + ( 84, [ [ 152.423, 152.232,-233.455], [ -80.326, 24.447, -7.950], [ -7.571, -34.911, -1.433], [ -4.926, 12.512, 36.525] ] ), + ( 85, [ [ 77.265, 169.881,-247.131], [ -69.352, 10.546, -19.469], [ -10.609, -28.577, 2.252], [ 1.874, 0.636, 41.232] ] ), + ( 86, [ [ 14.896, 174.390,-270.710], [ -54.454, -2.347, -27.972], [ -12.870, -45.688, 3.505], [ -0.893, 15.664, 55.197] ] ), + ( 87, [ [ 128.461, 142.532,-236.966], [ -58.190, 0.601, 0.855], [ -23.184, -13.581, -4.697], [ 19.504, 21.536, 33.741] ] ), + ( 88, [ [ 70.179, 142.990,-243.592], [ -57.694, 0.305, -14.313], [ -4.787, -27.614, 2.693], [ 4.708, 24.314, 36.010] ] ), + ( 89, [ [ 14.153, 142.929,-264.777], [ -53.191, -0.026, -29.220], [ 3.625, -31.174, 8.060], [ 4.661, 44.056, 51.260] ] ), + ( 90, [ [ 112.858, 122.968,-231.669], [ -45.051, -10.899, -8.599], [ -10.735, -28.480, 2.607], [ 14.630, 28.758, 45.554] ] ), + ( 91, [ [ 67.804, 115.230,-241.806], [ -44.888, -4.537, -11.644], [ 7.971, -30.404, 4.318], [ -6.116, 42.327, 60.537] ] ), + ( 92, [ [ 23.424, 113.892,-254.850], [ -43.703, 1.854, -14.388], [ 21.699, -35.829, 12.761], [ -29.770, 57.684, 72.277] ] ), + ( 93, [ [ 104.207, 234.698,-152.733], [ -57.745, 26.895, -7.074], [ -25.137, -25.018, -30.805], [ 0.558, -2.469, 77.755] ] ), ( 94, [ [ 135.749, 192.199,-173.993], [ -57.597, 9.559, -12.340], [ 21.057, -36.953, -26.041], [ 2.245, -7.457, 61.353] ] ), - ( 95, [ [ 84.928, 206.459,-183.823], [ -43.517, 18.872, -7.207], [ -13.067, -31.107, -30.940], [ 0.766, -1.586, 66.477] ] ), - ( 96, [ [ 49.256, 228.018,-188.624], [ -27.295, 23.783, -2.350], [ -46.031, -28.715, -40.634], [ 2.799, -2.519, 77.925] ] ), - ( 97, [ [ 146.834, 163.963,-199.827], [ -73.679, 9.289, -14.410], [ -1.766, -30.207, -31.660], [ -15.120, 1.557, 27.005] ] ), + ( 95, [ [ 84.928, 206.459,-183.823], [ -43.517, 18.872, -7.207], [ -13.067, -31.107, -30.940], [ 0.766, -1.586, 66.478] ] ), + ( 96, [ [ 49.256, 228.018,-188.624], [ -27.295, 23.783, -2.350], [ -46.031, -28.715, -40.634], [ 2.797, -2.517, 77.864] ] ), + ( 97, [ [ 146.834, 163.963,-199.827], [ -73.680, 9.289, -14.410], [ -1.766, -30.206, -31.659], [ -15.120, 1.557, 27.005] ] ), ( 98, [ [ 78.264, 173.394,-213.785], [ -63.451, 9.570, -13.504], [ -7.411, -31.806, -29.975], [ 1.456, -1.298, 43.628] ] ), - ( 99, [ [ 19.915, 182.976,-226.748], [ -53.237, 9.593, -12.420], [ -16.164, -43.819, -39.572], [ 3.936, 4.415, 60.584] ] ), - ( 100, [ [ 108.125, 230.310, -93.528], [ -60.591, 28.132, 1.067], [ -13.931, -33.044, -12.007], [ 4.596, -12.946, 57.696] ] ), - ( 101, [ [ 141.968, 177.527,-116.980], [ -50.185, 17.132, -3.637], [ 13.607, -45.829, -52.443], [ 9.725, -10.009, 55.550] ] ), + ( 99, [ [ 19.915, 182.976,-226.748], [ -53.236, 9.593, -12.420], [ -16.164, -43.819, -39.572], [ 3.936, 4.415, 60.578] ] ), + ( 100, [ [ 108.125, 230.310, -93.528], [ -60.591, 28.132, 1.067], [ -13.931, -33.044, -12.007], [ 4.596, -12.946, 57.694] ] ), + ( 101, [ [ 141.968, 177.527,-116.980], [ -50.186, 17.132, -3.637], [ 13.607, -45.829, -52.443], [ 9.726, -10.010, 55.555] ] ), ( 102, [ [ 93.588, 196.028,-117.204], [ -45.032, 22.969, 1.979], [ -14.635, -34.317, -34.909], [ 8.867, -14.370, 62.135] ] ), - ( 103, [ [ 51.988, 222.000,-112.818], [ -38.646, 27.605, 7.146], [ -48.820, -28.128, -36.207], [ 13.793, -1.876, 68.626] ] ), - ( 104, [ [ 133.055, 155.147,-183.014], [ -50.399, 9.084, 23.517], [ -9.191, -33.132, 20.300], [ 12.146, 20.340, 62.470] ] ), - ( 105, [ [ 80.120, 164.701,-163.613], [ -55.883, 12.515, 11.024], [ 5.475, -51.414, 35.591], [ 13.858, 40.686, 62.263] ] ), - ( 106, [ [ 22.839, 178.915,-159.278], [ -58.295, 15.237, -1.951], [ -15.355, -83.455, 10.218], [ 25.833, 57.492, 69.483] ] ), - ( 107, [ [ 113.145, 88.046,-272.215], [ -9.070, -8.548, -7.601], [ 9.970, -9.918, -1.262], [ -0.776, 3.825, 29.841] ] ), - ( 108, [ [ 104.281, 79.019,-281.413], [ -8.787, -10.019, -10.080], [ 18.983, -1.180, 4.253], [ -24.412, 8.417, 37.368] ] ), - ( 109, [ [ 95.507, 67.421,-291.581], [ -8.328, -11.367, -12.477], [ 28.245, 3.608, 12.840], [ -42.549, 9.803, 37.381] ] ), - ( 110, [ [ 120.464, 78.319,-274.878], [ -4.724, -18.291, -14.002], [ 13.797, 2.389, 6.929], [ 17.827, -6.047, 29.184] ] ), - ( 111, [ [ 111.260, 92.585,-233.087], [ -21.088, -3.634, 0.201], [ 16.044, -25.578, -6.389], [ 7.310, 10.462, 47.435] ] ), - ( 112, [ [ 87.111, 87.499,-235.179], [ -27.022, -6.613, -4.654], [ 33.506, -24.771, 1.279], [ -10.371, 9.996, 53.349] ] ), - ( 113, [ [ 58.498, 77.030,-243.404], [ -31.745, -9.942, -10.923], [ 61.050, -27.308, 9.195], [ -25.237, 14.981, 59.801] ] ), - ( 114, [ [ 132.087, 72.782,-241.575], [ 36.023, -40.841, -12.928], [ 52.732, -11.634, -8.495], [ 5.541, -5.631, 36.289] ] ), - ( 115, [ [ 120.546, 104.051,-176.461], [ -29.943, -7.987, 0.166], [ 1.491, -47.972, -13.737], [ 17.209, 6.934, 47.579] ] ), - ( 116, [ [ 86.014, 97.683,-176.263], [ -39.074, -4.278, 0.229], [ 32.208, -53.406, -23.992], [ 11.839, 5.546, 52.988] ] ), - ( 117, [ [ 42.944, 92.427,-176.508], [ -47.599, 1.553, 0.293], [ 68.016, -69.787, -28.090], [ 7.893, 7.843, 67.952] ] ), - ( 118, [ [ 131.468, 70.803,-204.192], [ 26.047, -61.656, -37.983], [ 50.646, -1.156, -25.775], [ 17.435, -17.925, 40.372] ] ), - ( 119, [ [ 113.261, 209.394, -39.187], [ -58.016, 16.946, 3.696], [ -7.484, -28.184, -16.526], [ 8.333, -32.245, 37.688] ] ), - ( 120, [ [ 153.826, 168.085, -64.529], [ -56.166, -3.576, 3.482], [ 4.306, -46.192, -41.902], [ -10.285, -1.501, 53.996] ] ), - ( 121, [ [ 102.498, 178.383, -60.042], [ -46.388, 16.516, 4.961], [ -14.042, -33.069, -26.005], [ 16.324, -10.383, 47.317] ] ), - ( 122, [ [ 64.189, 202.493, -54.339], [ -28.978, 30.762, 5.289], [ -43.522, -29.824, -24.792], [ 33.818, -25.021, 55.310] ] ), - ( 123, [ [ 123.540, 138.168,-101.485], [ -34.568, -0.978, 8.985], [ -6.301, -36.302, -41.920], [ -7.205, -12.370, 65.576] ] ), - ( 124, [ [ 85.021, 144.013, -90.695], [ -43.680, 7.293, 9.469], [ -0.486, -42.997, -39.184], [ 23.771, -17.396, 55.644] ] ), - ( 125, [ [ 37.425, 155.294, -80.316], [ -51.251, 17.213, 9.197], [ 0.428, -62.132, -36.932], [ 34.650, -21.397, 78.842] ] ), - ( 126, [ [ 142.299, 107.091,-139.264], [ -33.152, -9.595, 2.863], [ 20.194, -35.241, -29.898], [ 14.718, -2.715, 45.939] ] ), - ( 127, [ [ 107.369, 98.979,-132.633], [ -36.394, -6.366, 10.682], [ 41.976, -39.293, -37.022], [ 29.911, 0.154, 43.505] ] ), - ( 128, [ [ 70.498, 93.229,-117.454], [ -37.588, -2.021, 19.270], [ 74.771, -47.522, -46.139], [ 50.105, -10.662, 56.630] ] ), - ( 129, [ [ 164.309, 71.103,-160.266], [ 33.650, -70.498, -26.496], [ 68.512, -15.582, -15.674], [ 11.380, 14.458, 65.190] ] ), - ( 130, [ [ 122.301, 174.072, -24.143], [ -59.195, 19.083, 18.719], [ 3.799, -47.122, -6.384], [ 19.328, 1.610, 25.335] ] ), - ( 131, [ [ 116.697, 132.839, -56.273], [ -61.128, 4.816, 37.451], [ 11.875, -40.955, -35.954], [ 33.215, -5.911, 11.652] ] ), - ( 132, [ [ 145.531, 97.776, -91.141], [ -48.613, -14.290, 47.805], [ 40.807, -39.044, -38.399], [ 47.670, -2.075, 37.088] ] ) + ( 103, [ [ 51.988, 222.000,-112.818], [ -38.646, 27.605, 7.146], [ -48.820, -28.128, -36.207], [ 1.902, -5.868, 69.749] ] ), + ( 104, [ [ 133.055, 155.147,-183.014], [ -50.398, 9.084, 23.516], [ -9.198, -33.156, 20.315], [ 12.146, 20.340, 62.470] ] ), + ( 105, [ [ 80.120, 164.701,-163.613], [ -55.883, 12.515, 11.024], [ 5.477, -51.428, 35.601], [ 13.858, 40.686, 62.263] ] ), + ( 106, [ [ 22.839, 178.915,-159.278], [ -58.296, 15.237, -1.951], [ -15.341, -83.376, 10.208], [ 25.833, 57.492, 69.483] ] ), + ( 107, [ [ 113.145, 88.046,-272.215], [ -9.350, -8.812, -7.836], [ 13.248, -7.657, -1.039], [ -0.655, 3.227, 25.179] ] ), + ( 108, [ [ 104.281, 79.019,-281.413], [ -8.550, -9.748, -9.808], [ 22.001, 2.416, 6.648], [ -24.411, 8.417, 37.367] ] ), + ( 109, [ [ 94.545, 69.272,-290.944], [ -5.290, -12.555, -10.931], [ 29.050, 6.005, 16.206], [ -30.419, 6.714, 45.052] ] ), + ( 110, [ [ 126.005, 78.321,-270.120], [ -1.523, -8.676, -5.124], [ 23.157, -2.063, 11.752], [ 14.097, -10.214, 23.163] ] ), + ( 111, [ [ 110.779, 90.715,-234.929], [ -20.626, -3.554, 0.196], [ 25.282, -19.816, -8.626], [ -7.947, 4.073, 48.804] ] ), + ( 112, [ [ 87.111, 87.499,-235.179], [ -25.846, -6.325, -4.452], [ 34.640, -25.610, 1.322], [ -10.371, 9.996, 53.349] ] ), + ( 113, [ [ 60.277, 76.353,-242.362], [ -29.944, -9.378, -10.303], [ 59.866, -22.816, 11.218], [ -24.802, 14.723, 58.770] ] ), + ( 114, [ [ 134.247, 72.870,-242.126], [ -0.240, -10.729, 1.399], [ 58.738, 2.608, 2.449], [ 2.955, -0.060, 31.056] ] ), + ( 115, [ [ 120.546, 104.051,-176.461], [ -29.942, -7.987, 0.166], [ 1.555, -50.037, -14.328], [ 26.018, 2.579, 44.916] ] ), + ( 116, [ [ 86.014, 97.683,-176.263], [ -39.074, -4.278, 0.229], [ 32.793, -54.376, -24.428], [ 11.840, 5.546, 52.991] ] ), + ( 117, [ [ 42.944, 92.427,-176.508], [ -47.600, 1.553, 0.293], [ 65.220, -66.919, -26.935], [ 7.926, 7.876, 68.237] ] ), + ( 118, [ [ 131.420, 72.412,-210.024], [ -0.226, -19.168, 1.863], [ 53.830, -1.229, -27.395], [ -0.892, -2.235, 47.338] ] ), + ( 119, [ [ 113.261, 209.394, -39.187], [ -58.015, 16.946, 3.696], [ -7.484, -28.183, -16.526], [ 8.287, -32.069, 37.482] ] ), + ( 120, [ [ 153.826, 168.085, -64.529], [ -56.165, -3.576, 3.482], [ 4.306, -46.196, -41.906], [ -10.396, -1.517, 54.580] ] ), + ( 121, [ [ 102.498, 178.383, -60.042], [ -46.388, 16.516, 4.961], [ -14.042, -33.069, -26.005], [ 16.284, -10.358, 47.201] ] ), + ( 122, [ [ 64.189, 202.493, -54.339], [ -28.979, 30.763, 5.289], [ -43.499, -29.808, -24.779], [ 33.688, -24.925, 55.097] ] ), + ( 123, [ [ 123.540, 138.168,-101.485], [ -34.841, -0.986, 9.056], [ -6.374, -36.724, -42.407], [ -7.235, -12.421, 65.846] ] ), + ( 124, [ [ 85.021, 144.013, -90.695], [ -43.409, 7.248, 9.410], [ -0.486, -43.000, -39.187], [ 23.904, -17.493, 55.956] ] ), + ( 125, [ [ 37.909, 155.369, -80.880], [ -50.463, 16.948, 9.056], [ 0.425, -61.681, -36.664], [ 34.615, -21.375, 78.761] ] ), + ( 126, [ [ 141.972, 106.508,-140.392], [ -33.103, -6.698, 5.569], [ 24.138, -37.596, -25.097], [ 17.276, -3.374, 47.967] ] ), + ( 127, [ [ 107.369, 98.979,-132.633], [ -36.268, -6.344, 10.645], [ 42.344, -39.637, -37.346], [ 30.705, 0.158, 44.660] ] ), + ( 128, [ [ 70.498, 93.229,-117.454], [ -37.708, -2.027, 19.331], [ 68.482, -57.114, -32.013], [ 58.629, -15.041, 46.951] ] ), + ( 129, [ [ 163.749, 72.265,-157.014], [ -9.560, -38.172, 14.941], [ 64.175, -23.344, 7.170], [ -12.951, 22.136, 66.011] ] ), + ( 130, [ [ 121.257, 174.979, -23.486], [ -61.541, 10.197, 19.011], [ -3.863, -47.244, -6.568], [ 14.695, -1.216, 28.119] ] ), + ( 131, [ [ 117.057, 132.479, -55.764], [ -61.489, 4.844, 37.672], [ 11.585, -39.956, -35.077], [ 34.195, -6.085, 11.996] ] ), + ( 132, [ [ 146.435, 101.417, -88.480], [ -12.117, -28.636, 11.354], [ 25.548, -28.865, -55.831], [ 50.980, -2.219, 39.663] ] ) ] generateParameters = False @@ -464,12 +462,28 @@ def generateBaseMesh(cls, region, options): # Distal-front wedge elements nodeIdentifiers.pop(6) nodeIdentifiers.pop(2) - eft = eftWedgeCollapseXi1_37 + eft = eftfactory.createEftBasic() + setEftScaleFactorIds(eft, [1], []) + nodes = [3, 4, 7, 8] + collapseNodes = [3, 7] + remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS1, []) + remapEftNodeValueLabel(eft, collapseNodes, Node.VALUE_LABEL_D_DS2, [(Node.VALUE_LABEL_D_DS1, []), (Node.VALUE_LABEL_D_DS2, [])]) + ln_map = [1, 2, 3, 3, 4, 5, 6, 6] + remapEftLocalNodes(eft, 6, ln_map) + elif (e3 < (uElementsCount3 - 1)) and (e2 == (uElementsCount2 - 1)) and (e1 == (uElementsCount1 - 1)): # Distal-back wedge elements nodeIdentifiers.pop(7) nodeIdentifiers.pop(3) - eft = eftWedgeCollapseXi1_48 + eft = eftfactory.createEftBasic() + setEftScaleFactorIds(eft, [1], []) + nodes = [3, 4, 7, 8] + collapseNodes = [4, 8] + remapEftNodeValueLabel(eft, collapseNodes, Node.VALUE_LABEL_D_DS2, [(Node.VALUE_LABEL_D_DS1, [1]), (Node.VALUE_LABEL_D_DS2, [])]) + remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS1, []) + ln_map = [1, 2, 3, 3, 4, 5, 6, 6] + remapEftLocalNodes(eft, 6, ln_map) + elif (e3 == (uElementsCount3 - 2)) and (e2 == 0) and (e1 == 0): # Medial-front wedge elements nodeIdentifiers.pop(4) @@ -510,14 +524,38 @@ def generateBaseMesh(cls, region, options): nodeIdentifiers.pop(6) nodeIdentifiers.pop(4) nodeIdentifiers.pop(2) - eft = eftTetCollapseXi1Xi2_63 + eft = eftfactory.createEftBasic() + setEftScaleFactorIds(eft, [1], []) + nodes = [5, 6, 7, 8] + # remap parameters on xi3 = 1 before collapsing nodes + remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS1, []) + remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS2, []) + remapEftNodeValueLabel(eft, [7, 8], Node.VALUE_LABEL_D_DS3, [(Node.VALUE_LABEL_D_DS2, [1])]) + remapEftNodeValueLabel(eft, [5], Node.VALUE_LABEL_D_DS3, [(Node.VALUE_LABEL_D_DS1, [])]) + remapEftNodeValueLabel(eft, [3, 4], Node.VALUE_LABEL_D_DS1, []) + remapEftNodeValueLabel(eft, [3], Node.VALUE_LABEL_D_DS2, [(Node.VALUE_LABEL_D_DS1, []), (Node.VALUE_LABEL_D_DS2, [])]) + ln_map = [1, 2, 3, 3, 4, 4, 4, 4] + remapEftLocalNodes(eft, 4, ln_map) + elif (e3 == (uElementsCount3 - 1)) and (e2 == (uElementsCount2 - 1)) and (e1 == (uElementsCount1 - 1)): # Top-front-distal tetrahedron wedge elements nodeIdentifiers.pop(7) nodeIdentifiers.pop(6) nodeIdentifiers.pop(5) nodeIdentifiers.pop(3) - eft = eftTetCollapseXi1Xi2_53 + eft = eftfactory.createEftBasic() + setEftScaleFactorIds(eft, [1], []) + nodes = [5, 6, 7, 8] + # remap parameters on xi3 = 1 before collapsing nodes + remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS1, []) + remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS2, []) + remapEftNodeValueLabel(eft, [7, 8], Node.VALUE_LABEL_D_DS3, [(Node.VALUE_LABEL_D_DS2, [1])]) + remapEftNodeValueLabel(eft, [6], Node.VALUE_LABEL_D_DS3, [(Node.VALUE_LABEL_D_DS1, [1])]) + remapEftNodeValueLabel(eft, [3, 4], Node.VALUE_LABEL_D_DS1, []) + remapEftNodeValueLabel(eft, [4], Node.VALUE_LABEL_D_DS2, [(Node.VALUE_LABEL_D_DS1, [1]), (Node.VALUE_LABEL_D_DS2, [])]) + ln_map = [1, 2, 3, 3, 4, 4, 4, 4] + remapEftLocalNodes(eft, 4, ln_map) + elif (e3 == (uElementsCount3 - 2)) and (e2 == (uElementsCount2 - 3)): # Remapped cube element 1 eft = eftfactory.createEftBasic()