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
|
--- a/python/test/unit/fem/test_assemble_domains.py
+++ b/python/test/unit/fem/test_assemble_domains.py
@@ -67,7 +67,7 @@
cell_map = mesh.topology.index_map(mesh.topology.dim)
num_cells = cell_map.size_local + cell_map.num_ghosts
indices = np.arange(0, num_cells)
- values = np.full(indices.shape, 3, dtype=np.intc)
+ values = np.full(indices.shape, 3, dtype=np.int32)
values[0] = 1
values[1] = 2
marker = meshtags_factory(mesh, mesh.topology.dim, indices, values)
@@ -142,16 +142,16 @@
return np.isclose(x[0], 1.0)
bottom_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, bottom)
- bottom_vals = np.full(bottom_facets.shape, 1, np.intc)
+ bottom_vals = np.full(bottom_facets.shape, 1, np.int32)
top_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, top)
- top_vals = np.full(top_facets.shape, 2, np.intc)
+ top_vals = np.full(top_facets.shape, 2, np.int32)
left_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, left)
- left_vals = np.full(left_facets.shape, 3, np.intc)
+ left_vals = np.full(left_facets.shape, 3, np.int32)
right_facets = locate_entities_boundary(mesh, mesh.topology.dim - 1, right)
- right_vals = np.full(right_facets.shape, 6, np.intc)
+ right_vals = np.full(right_facets.shape, 6, np.int32)
indices = np.hstack((bottom_facets, top_facets, left_facets, right_facets))
values = np.hstack((bottom_vals, top_vals, left_vals, right_vals))
--- a/python/test/unit/fem/test_element_integrals.py
+++ b/python/test/unit/fem/test_element_integrals.py
@@ -211,7 +211,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
@@ -262,7 +262,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
--- a/python/test/unit/fem/test_custom_assembler.py
+++ b/python/test/unit/fem/test_custom_assembler.py
@@ -154,7 +154,7 @@
b[dofmap[cell, 2]] += A * q1
-@numba.njit(parallel=True, fastmath=True)
+@numba.njit(parallel=(not numba.core.config.IS_32BITS), fastmath=True)
def assemble_vector_parallel(b, v, x, dofmap_t_data, dofmap_t_offsets, num_cells):
"""Assemble simple linear form over a mesh into the array b using a parallel loop"""
q0 = 1 / 3.0
|
