Skip to content
Snippets Groups Projects
Commit 94fbc877 authored by Markus Holzer's avatar Markus Holzer
Browse files

More adaptions

parent 43ea98e9
Branches
No related tags found
No related merge requests found
Pipeline #32396 failed
......@@ -22,7 +22,7 @@ try:
except ImportError:
ParallelDataHandling = None
DEFAULT_FLAG_TYPE = np.uint32
DEFAULT_FLAG_TYPE = np.uint64
class FlagInterface:
......
......@@ -19,8 +19,8 @@ ctypedef fused IntegerType:
def create_boundary_neighbor_index_list_2d(object[IntegerType, ndim=2] flag_field,
int nr_of_ghost_layers, IntegerType boundary_mask, IntegerType fluid_mask,
object[int, ndim=2] stencil, int single_link):
cdef int xs, ys, x, y
cdef int dirIdx, num_directions, dx, dy
cdef long long xs, ys, x, y
cdef long long dirIdx, num_directions, dx, dy
xs, ys = flag_field.shape
boundary_index_list = []
......@@ -44,8 +44,8 @@ def create_boundary_neighbor_index_list_2d(object[IntegerType, ndim=2] flag_fiel
def create_boundary_neighbor_index_list_3d(object[IntegerType, ndim=3] flag_field,
int nr_of_ghost_layers, IntegerType boundary_mask, IntegerType fluid_mask,
object[int, ndim=2] stencil, int single_link):
cdef int xs, ys, zs, x, y, z
cdef int dirIdx, num_directions, dx, dy, dz
cdef long long xs, ys, zs, x, y, z
cdef long long dirIdx, num_directions, dx, dy, dz
xs, ys, zs = flag_field.shape
boundary_index_list = []
......@@ -72,8 +72,8 @@ def create_boundary_neighbor_index_list_3d(object[IntegerType, ndim=3] flag_fiel
def create_boundary_cell_index_list_2d(object[IntegerType, ndim=2] flag_field,
IntegerType boundary_mask, IntegerType fluid_mask,
object[int, ndim=2] stencil, int single_link):
cdef int xs, ys, x, y
cdef int dirIdx, num_directions, dx, dy
cdef long long xs, ys, x, y
cdef long long dirIdx, num_directions, dx, dy
xs, ys = flag_field.shape
boundary_index_list = []
......@@ -98,8 +98,8 @@ def create_boundary_cell_index_list_2d(object[IntegerType, ndim=2] flag_field,
def create_boundary_cell_index_list_3d(object[IntegerType, ndim=3] flag_field,
IntegerType boundary_mask, IntegerType fluid_mask,
object[int, ndim=2] stencil, int single_link):
cdef int xs, ys, zs, x, y, z
cdef int dirIdx, num_directions, dx, dy, dz
cdef long long xs, ys, zs, x, y, z
cdef long long dirIdx, num_directions, dx, dy, dz
xs, ys, zs = flag_field.shape
boundary_index_list = []
......
......@@ -425,7 +425,7 @@ class Block:
Cell indices start at 0 at the first inner cell, lower ghost layers have negative indices
"""
mesh_grid_params = [offset + np.arange(width, dtype=np.int32)
mesh_grid_params = [offset + np.arange(width, dtype=np.int64)
for offset, width in zip(self.offset, self.shape)]
return np.meshgrid(*mesh_grid_params, indexing='ij', copy=False)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment