diff --git a/pystencils/boundaries/createindexlist.py b/pystencils/boundaries/createindexlist.py index afa2d5a9f1e1a869802cdd473fb4764d7d74bc4f..8619a31d6646ea7b5ce97500f0478388c0e2bcca 100644 --- a/pystencils/boundaries/createindexlist.py +++ b/pystencils/boundaries/createindexlist.py @@ -46,8 +46,8 @@ def _create_index_list_python(flag_field_arr, boundary_mask, nr_of_ghost_layers = 0 coordinate_names = boundary_index_array_coordinate_names[:len(flag_field_arr.shape)] - index_arr_dtype = np.dtype([(name, default_index_array_dtype) for name in coordinate_names] + - [(direction_member_name, default_index_array_dtype)]) + index_arr_dtype = np.dtype([(name, default_index_array_dtype) for name in coordinate_names] + + [(direction_member_name, default_index_array_dtype)]) # boundary cells are extracted via np.where. To ensure continous memory access in the compute kernel these cells # have to be sorted. @@ -119,8 +119,8 @@ def create_boundary_index_list(flag_field, stencil, boundary_mask, fluid_mask, """ dim = len(flag_field.shape) coordinate_names = boundary_index_array_coordinate_names[:dim] - index_arr_dtype = np.dtype([(name, default_index_array_dtype) for name in coordinate_names] + - [(direction_member_name, default_index_array_dtype)]) + index_arr_dtype = np.dtype([(name, default_index_array_dtype) for name in coordinate_names] + + [(direction_member_name, default_index_array_dtype)]) stencil = np.array(stencil, dtype=default_index_array_dtype) args = (flag_field, nr_of_ghost_layers, boundary_mask, fluid_mask, stencil, single_link) diff --git a/pystencils/cpu/kernelcreation.py b/pystencils/cpu/kernelcreation.py index 746e7b1918b16cb7e70b6309efadb646a51e4ca9..4cf0955a5af86a5e0ccb65ed96d85f6e171006b8 100644 --- a/pystencils/cpu/kernelcreation.py +++ b/pystencils/cpu/kernelcreation.py @@ -1,7 +1,6 @@ from typing import Union import sympy as sp -import numpy as np import pystencils.astnodes as ast from pystencils.simp.assignment_collection import AssignmentCollection @@ -9,7 +8,7 @@ from pystencils.config import CreateKernelConfig from pystencils.enums import Target, Backend from pystencils.astnodes import Block, KernelFunction, LoopOverCoordinate, SympyAssignment from pystencils.cpu.cpujit import make_python_function -from pystencils.typing import StructType, TypedSymbol, create_type, get_type_of_expression +from pystencils.typing import StructType, TypedSymbol, create_type from pystencils.typing.transformations import add_types from pystencils.field import Field, FieldType from pystencils.node_collection import NodeCollection