Skip to content

Commit d03b829

Browse files
committed
Change quad isTruncated test function.
1 parent c29a860 commit d03b829

File tree

1 file changed

+7
-24
lines changed

1 file changed

+7
-24
lines changed

test_modules/test_quadrangular_mesh_analysis.py

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,38 +59,21 @@ def test_is_valid_action(self):
5959
with self.assertRaises(ValueError):
6060
QMA.isValidAction(cmap, 0, 6)
6161

62-
def test_valid_triangle(self):
63-
# test Lmax invalid
64-
vect_AB = (5.0, 0.0)
65-
vect_AC = (2.5, 5.0)
66-
vect_BC = (-2.5, 5.0)
67-
self.assertFalse(QMA.valid_triangle(vect_AB, vect_AC, vect_BC))
68-
# test invalid angles
69-
vect_AB = (3.0, 0.0)
70-
vect_AC = (1.5, 0.05)
71-
vect_BC = (-1.5, 0.05)
72-
self.assertFalse(QMA.valid_triangle(vect_AB, vect_AC, vect_BC))
73-
# test valid triangle
74-
vect_AB = (3.0, 0.0)
75-
vect_AC = (1.5, 3.0)
76-
vect_BC = (-1.5, 3.0)
77-
self.assertTrue(QMA.valid_triangle(vect_AB, vect_AC, vect_BC))
78-
7962
def test_isTruncated(self):
80-
nodes = [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0]]
81-
faces = [[0, 1, 2]]
82-
cmap = Mesh(nodes, faces)
63+
filename = os.path.join(TESTFILE_FOLDER, 't1_quad.msh')
64+
cmap = read_gmsh(filename)
8365
darts_list = []
8466
for d_info in cmap.active_darts():
8567
darts_list.append(d_info[0])
86-
self.assertTrue(QMA.isTruncated(cmap, darts_list))
87-
nodes = [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [2.0, 0.0]]
88-
faces = [[0, 1, 2], [0, 2, 3], [1, 4, 2]]
68+
self.assertFalse(QMA.isTruncated(cmap, darts_list))
69+
70+
nodes = [[0.0, 0.0], [1.0, 0.0], [0.0, 1.0], [1.0, 1.0]]
71+
faces = [[0, 1, 3, 2]]
8972
cmap = Mesh(nodes, faces)
9073
darts_list = []
9174
for d_info in cmap.active_darts():
9275
darts_list.append(d_info[0])
93-
self.assertFalse(QMA.isTruncated(cmap, darts_list))
76+
self.assertTrue(QMA.isTruncated(cmap, darts_list))
9477

9578
if __name__ == '__main__':
9679
unittest.main()

0 commit comments

Comments
 (0)