Skip to content

fix(numpy): aliases of builtin types is deprecated #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2021
Merged

fix(numpy): aliases of builtin types is deprecated #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions flopy/plot/crosssection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ def plot_inactive(self, ibound=None, color_noflow="black", **kwargs):
else:
ibound = self.mg.idomain

plotarray = np.zeros(ibound.shape, dtype=np.int)
plotarray = np.zeros(ibound.shape, dtype=int)
idx1 = ibound == 0
plotarray[idx1] = 1
plotarray = np.ma.masked_equal(plotarray, 0)
Expand Down Expand Up @@ -685,7 +685,7 @@ def plot_ibound(

ibound = self.mg.idomain

plotarray = np.zeros(ibound.shape, dtype=np.int)
plotarray = np.zeros(ibound.shape, dtype=int)
idx1 = ibound == 0
idx2 = ibound < 0
plotarray[idx1] = 1
Expand Down Expand Up @@ -823,11 +823,11 @@ def plot_bc(
idx = mflist["node"]

if len(self.mg.shape) != 3:
plotarray = np.zeros((self._nlay, self._ncpl), dtype=np.int)
plotarray = np.zeros((self._nlay, self._ncpl), dtype=int)
plotarray[tuple(idx)] = 1
else:
plotarray = np.zeros(
(self.mg.nlay, self.mg.nrow, self.mg.ncol), dtype=np.int
(self.mg.nlay, self.mg.nrow, self.mg.ncol), dtype=int
)
plotarray[idx[0], idx[1], idx[2]] = 1

Expand Down Expand Up @@ -1155,7 +1155,7 @@ def plot_discharge(
# thickness by setting laytyp to zeros
if head is None or laytyp is None:
head = np.zeros(botm.shape, np.float32)
laytyp = np.zeros((nlay,), dtype=np.int)
laytyp = np.zeros((nlay,), dtype=int)
head[0, :, :] = top
if nlay > 1:
head[1:, :, :] = botm[:-1, :, :]
Expand All @@ -1170,7 +1170,7 @@ def plot_discharge(
)

if qz is None:
qz = np.zeros(qx.shape, dtype=np.float)
qz = np.zeros(qx.shape, dtype=float)

qx = qx.ravel()
qy = qy.ravel()
Expand Down
4 changes: 2 additions & 2 deletions flopy/plot/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,9 @@ def plot_bc(

nlay = self.mg.nlay

plotarray = np.zeros(self.mg.shape, dtype=np.int)
plotarray = np.zeros(self.mg.shape, dtype=int)
if plotAll and len(self.mg.shape) > 1:
pa = np.zeros(self.mg.shape[1:], dtype=np.int)
pa = np.zeros(self.mg.shape[1:], dtype=int)
pa[tuple(idx[1:])] = 1
for k in range(nlay):
plotarray[k] = pa.copy()
Expand Down
2 changes: 1 addition & 1 deletion flopy/utils/rasters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Raster:
FLOAT64 = (np.float64,)
INT8 = (np.int8,)
INT16 = (np.int16,)
INT32 = (int, np.int, np.int32, np.uint32)
INT32 = (int, np.int32, np.uint32)
Copy link
Contributor Author

@mwtoews mwtoews May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, FYI int is 32-bits on Windows and 64-bits on most other computers. This issue is not addressed in this PR.

INT64 = (np.int64,)

def __init__(
Expand Down