diff --git a/python/damask/_grid.py b/python/damask/_grid.py index 1b184d6e7..6dc9879ce 100644 --- a/python/damask/_grid.py +++ b/python/damask/_grid.py @@ -754,8 +754,8 @@ class Grid: # materials: 1 """ - offset_ = np.array(offset,int) if offset is not None else np.zeros(3,int) - cells_ = np.array(cells,int) if cells is not None else self.cells + offset_ = np.array(offset,np.int64) if offset is not None else np.zeros(3,np.int64) + cells_ = np.array(cells,np.int64) if cells is not None else self.cells canvas = np.full(cells_,np.nanmax(self.material) + 1 if fill is None else fill,self.material.dtype) @@ -797,7 +797,7 @@ class Grid: >>> import numpy as np >>> import damask - >>> g = damask.Grid(np.zeros([32]*3,int), np.ones(3)*1e-4) + >>> g = damask.Grid(np.zeros([32]*3,int),np.ones(3)*1e-4) >>> g.mirror('xy',True) cells : 64 x 64 x 32 size : 0.0002 x 0.0002 x 0.0001 m³ diff --git a/python/damask/grid_filters.py b/python/damask/grid_filters.py index b6b907699..747fc629d 100644 --- a/python/damask/grid_filters.py +++ b/python/damask/grid_filters.py @@ -159,8 +159,8 @@ def coordinates0_point(cells: _IntSequence, """ size_ = _np.array(size,float) - start = origin + size_/_np.array(cells,int)*.5 - end = origin + size_ - size_/_np.array(cells,int)*.5 + start = origin + size_/_np.array(cells,_np.int64)*.5 + end = origin + size_ - size_/_np.array(cells,_np.int64)*.5 return _np.stack(_np.meshgrid(_np.linspace(start[0],end[0],cells[0]), _np.linspace(start[1],end[1],cells[1]), @@ -290,7 +290,7 @@ def cellsSizeOrigin_coordinates0_point(coordinates0: _np.ndarray, coords = [_np.unique(coordinates0[:,i]) for i in range(3)] mincorner = _np.array(list(map(min,coords))) maxcorner = _np.array(list(map(max,coords))) - cells = _np.array(list(map(len,coords)),int) + cells = _np.array(list(map(len,coords)),_np.int64) size = cells/_np.maximum(cells-1,1) * (maxcorner-mincorner) delta = size/cells origin = mincorner - delta*.5 @@ -455,7 +455,7 @@ def cellsSizeOrigin_coordinates0_node(coordinates0: _np.ndarray, coords = [_np.unique(coordinates0[:,i]) for i in range(3)] mincorner = _np.array(list(map(min,coords))) maxcorner = _np.array(list(map(max,coords))) - cells = _np.array(list(map(len,coords)),int) - 1 + cells = _np.array(list(map(len,coords)),_np.int64) - 1 size = maxcorner-mincorner origin = mincorner diff --git a/python/damask/util.py b/python/damask/util.py index a18fe9503..e7e75718d 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -431,7 +431,7 @@ def hybrid_IA(dist: np.ndarray, scale_,scale,inc_factor = (0.0,float(N_opt_samples),1.0) while (not np.isclose(scale, scale_)) and (N_inv_samples != N_opt_samples): - repeats = np.rint(scale*dist).astype(int) + repeats = np.rint(scale*dist).astype(np.int64) N_inv_samples = np.sum(repeats) scale_,scale,inc_factor = (scale,scale+inc_factor*0.5*(scale - scale_), inc_factor*2.0) \ if N_inv_samples < N_opt_samples else \