Skip to content

Commit ee94ddb

Browse files
committed
change numpy types to python types due to deprecation
1 parent 168ba5d commit ee94ddb

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

solidspy/assemutil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def DME(cons, elements, ndof_node=2, ndof_el_max=18, ndof_el=None):
7676
7777
"""
7878
nels = elements.shape[0]
79-
assem_op = np.zeros([nels, ndof_el_max], dtype=np.integer)
79+
assem_op = np.zeros([nels, ndof_el_max], dtype=int)
8080
neq, bc_array = eqcounter(cons, ndof_node=ndof_node)
8181
for ele in range(nels):
8282
iet = elements[ele, 1]

solidspy/postprocesor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def complete_disp(bc_array, nodes, sol, ndof_node=2):
311311
312312
"""
313313
nnodes = nodes.shape[0]
314-
sol_complete = np.zeros([nnodes, ndof_node], dtype=np.float)
314+
sol_complete = np.zeros([nnodes, ndof_node], dtype=float)
315315
for row in range(nnodes):
316316
for col in range(ndof_node):
317317
cons = bc_array[row, col]
@@ -369,7 +369,7 @@ def strain_nodes(nodes, elements, mats, sol_complete):
369369
IELCON = elements[:, 3:]
370370

371371
for el in range(nelems):
372-
young, poisson = mats[np.int(elements[el, 2]), :]
372+
young, poisson = mats[int(elements[el, 2]), :]
373373
shear = young/(2*(1 + poisson))
374374
fact1 = young/(1 - poisson**2)
375375
fact2 = poisson*young/(1 - poisson**2)

solidspy/preprocesor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def readin(folder=""):
1515
"""Read the input files"""
1616
nodes = np.loadtxt(folder + 'nodes.txt', ndmin=2)
1717
mats = np.loadtxt(folder + 'mater.txt', ndmin=2)
18-
elements = np.loadtxt(folder + 'eles.txt', ndmin=2, dtype=np.int)
18+
elements = np.loadtxt(folder + 'eles.txt', ndmin=2, dtype=int)
1919
loads = np.loadtxt(folder + 'loads.txt', ndmin=2)
2020

2121
return nodes, mats, elements, loads

tests/test_assemutil.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_sparse_assem():
3030
[0, 1, 2, 3, 8, 9, 6, 7],
3131
[2, 3, 4, 5, 10, 11, 8, 9],
3232
[6, 7, 8, 9, 14, 15, 12, 13],
33-
[8, 9, 10, 11, 16, 17, 14, 15]], dtype=np.int)
33+
[8, 9, 10, 11, 16, 17, 14, 15]], dtype=int)
3434

3535
neq = 18
3636
K_ass, _ = ass.sparse_assem(elements, mats, nodes, neq, assem_op)
@@ -80,7 +80,7 @@ def test_dense_assem():
8080
[0, 1, 2, 3, 8, 9, 6, 7],
8181
[2, 3, 4, 5, 10, 11, 8, 9],
8282
[6, 7, 8, 9, 14, 15, 12, 13],
83-
[8, 9, 10, 11, 16, 17, 14, 15]], dtype=np.int)
83+
[8, 9, 10, 11, 16, 17, 14, 15]], dtype=int)
8484

8585
neq = 18
8686
K_ass, _ = ass.dense_assem(elements, mats, nodes, neq, assem_op)
@@ -124,7 +124,7 @@ def uel_ones(elcoord, params):
124124
[1, 2],
125125
[2, 2]])
126126
cons = np.zeros((9, 2))
127-
elements = np.ones((4, 7), dtype=np.int)
127+
elements = np.ones((4, 7), dtype=int)
128128
elements[:, 0] = range(0, 4)
129129
elements[:, 2] = 0
130130
elements[:, 3:] = np.array([

0 commit comments

Comments
 (0)