1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
Index: dolfinx/python/test/unit/fem/test_assemble_domains.py
===================================================================
--- dolfinx.orig/python/test/unit/fem/test_assemble_domains.py 2021-01-31 13:22:00.310281852 +0100
+++ dolfinx/python/test/unit/fem/test_assemble_domains.py 2021-01-31 13:22:00.302281845 +0100
@@ -43,7 +43,7 @@
cell_map = mesh.topology.index_map(mesh.topology.dim)
num_cells = cell_map.size_local + cell_map.num_ghosts
indices = numpy.arange(0, num_cells)
- values = numpy.full(indices.shape, 3, dtype=numpy.intc)
+ values = numpy.full(indices.shape, 3, dtype=numpy.int32)
values[0] = 1
values[1] = 2
marker = dolfinx.mesh.MeshTags(mesh, mesh.topology.dim, indices, values)
@@ -110,16 +110,16 @@
return numpy.isclose(x[0], 1.0)
bottom_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, bottom)
- bottom_vals = numpy.full(bottom_facets.shape, 1, numpy.intc)
+ bottom_vals = numpy.full(bottom_facets.shape, 1, numpy.int32)
top_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, top)
- top_vals = numpy.full(top_facets.shape, 2, numpy.intc)
+ top_vals = numpy.full(top_facets.shape, 2, numpy.int32)
left_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, left)
- left_vals = numpy.full(left_facets.shape, 3, numpy.intc)
+ left_vals = numpy.full(left_facets.shape, 3, numpy.int32)
right_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, right)
- right_vals = numpy.full(right_facets.shape, 6, numpy.intc)
+ right_vals = numpy.full(right_facets.shape, 6, numpy.int32)
indices = numpy.hstack((bottom_facets, top_facets, left_facets, right_facets))
values = numpy.hstack((bottom_vals, top_vals, left_vals, right_vals))
Index: dolfinx/python/test/unit/fem/test_element_integrals.py
===================================================================
--- dolfinx.orig/python/test/unit/fem/test_element_integrals.py 2021-01-31 13:22:00.310281852 +0100
+++ dolfinx/python/test/unit/fem/test_element_integrals.py 2021-01-31 13:22:00.302281845 +0100
@@ -142,7 +142,7 @@
map_f = mesh.topology.index_map(tdim - 1)
num_facets = map_f.size_local + map_f.num_ghosts
indices = np.arange(0, num_facets)
- values = np.arange(0, num_facets, dtype=np.intc)
+ values = np.arange(0, num_facets, dtype=np.int32)
marker = MeshTags(mesh, tdim - 1, indices, values)
# Functions that will have the same integral over each facet
@@ -183,7 +183,7 @@
map_f = mesh.topology.index_map(tdim - 1)
num_facets = map_f.size_local + map_f.num_ghosts
indices = np.arange(0, num_facets)
- values = np.arange(0, num_facets, dtype=np.intc)
+ values = np.arange(0, num_facets, dtype=np.int32)
marker = MeshTags(mesh, tdim - 1, indices, values)
# For each facet, check that the inner product of the normal and
Index: dolfinx/python/test/unit/io/test_xdmf_meshtags.py
===================================================================
--- dolfinx.orig/python/test/unit/io/test_xdmf_meshtags.py 2021-01-31 13:22:00.310281852 +0100
+++ dolfinx/python/test/unit/io/test_xdmf_meshtags.py 2021-01-31 13:22:00.302281845 +0100
@@ -35,18 +35,18 @@
mesh = UnitCubeMesh(comm, 4, 4, 4, cell_type)
bottom_facets = locate_entities(mesh, 2, lambda x: np.isclose(x[1], 0.0))
- bottom_values = np.full(bottom_facets.shape, 1, dtype=np.intc)
+ bottom_values = np.full(bottom_facets.shape, 1, dtype=np.int32)
left_facets = locate_entities(mesh, 2, lambda x: np.isclose(x[0], 0.0))
- left_values = np.full(left_facets.shape, 2, dtype=np.intc)
+ left_values = np.full(left_facets.shape, 2, dtype=np.int32)
indices, pos = np.unique(np.hstack((bottom_facets, left_facets)), return_index=True)
mt = MeshTags(mesh, 2, indices, np.hstack((bottom_values, left_values))[pos])
mt.name = "facets"
top_lines = locate_entities(mesh, 1, lambda x: np.isclose(x[2], 1.0))
- top_values = np.full(top_lines.shape, 3, dtype=np.intc)
+ top_values = np.full(top_lines.shape, 3, dtype=np.int32)
right_lines = locate_entities(mesh, 1, lambda x: np.isclose(x[0], 1.0))
- right_values = np.full(right_lines.shape, 4, dtype=np.intc)
+ right_values = np.full(right_lines.shape, 4, dtype=np.int32)
indices, pos = np.unique(np.hstack((top_lines, right_lines)), return_index=True)
mt_lines = MeshTags(mesh, 1, indices, np.hstack((top_values, right_values))[pos])
|
