Skip to content
Snippets Groups Projects
Commit b3d7062a authored by Martin Bauer's avatar Martin Bauer
Browse files

Adapted tests to changes in walberla sweep generation

parent 115d558d
No related merge requests found
...@@ -373,8 +373,7 @@ class SerialDataHandling(DataHandling): ...@@ -373,8 +373,7 @@ class SerialDataHandling(DataHandling):
ghost_layers = actual_ghost_layers ghost_layers = actual_ghost_layers
gl_to_remove = actual_ghost_layers - ghost_layers gl_to_remove = actual_ghost_layers - ghost_layers
assert len(self._field_information[name]['values_per_cell']) == 1 ind_dims = len(self._field_information[name]['values_per_cell'])
ind_dims = 1 if self._field_information[name]['values_per_cell'][0] > 1 else 0
return remove_ghost_layers(self.cpu_arrays[name], ind_dims, gl_to_remove) return remove_ghost_layers(self.cpu_arrays[name], ind_dims, gl_to_remove)
def log(self, *args, level='INFO'): def log(self, *args, level='INFO'):
......
...@@ -158,6 +158,7 @@ def create_indexed_kernel(assignments, index_fields, target='cpu', data_type="do ...@@ -158,6 +158,7 @@ def create_indexed_kernel(assignments, index_fields, target='cpu', data_type="do
else: else:
raise ValueError("Unknown target %s. Has to be either 'cpu' or 'gpu'" % (target,)) raise ValueError("Unknown target %s. Has to be either 'cpu' or 'gpu'" % (target,))
def create_staggered_kernel_from_assignments(assignments, **kwargs): def create_staggered_kernel_from_assignments(assignments, **kwargs):
assert 'iteration_slice' not in kwargs and 'ghost_layers' not in kwargs assert 'iteration_slice' not in kwargs and 'ghost_layers' not in kwargs
lhs_fields = {a.lhs.atoms(Field.Access) for a in assignments} lhs_fields = {a.lhs.atoms(Field.Access) for a in assignments}
......
...@@ -17,6 +17,7 @@ class SlicedGetter(object): ...@@ -17,6 +17,7 @@ class SlicedGetter(object):
def __getitem__(self, item): def __getitem__(self, item):
return self._functionReturningArray(item) return self._functionReturningArray(item)
class SlicedGetterDataHandling: class SlicedGetterDataHandling:
def __init__(self, data_handling, name): def __init__(self, data_handling, name):
self.dh = data_handling self.dh = data_handling
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment