From b3d7062a1eb73ea9f7dbe646f6695a5a930c0062 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Fri, 1 Feb 2019 16:20:49 +0100
Subject: [PATCH] Adapted tests to changes in walberla sweep generation
---
datahandling/serial_datahandling.py | 3 +--
kernelcreation.py | 1 +
slicing.py | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/datahandling/serial_datahandling.py b/datahandling/serial_datahandling.py
index 11cf5c3..9752acc 100644
--- a/datahandling/serial_datahandling.py
+++ b/datahandling/serial_datahandling.py
@@ -373,8 +373,7 @@ class SerialDataHandling(DataHandling):
ghost_layers = actual_ghost_layers
gl_to_remove = actual_ghost_layers - ghost_layers
- assert len(self._field_information[name]['values_per_cell']) == 1
- ind_dims = 1 if self._field_information[name]['values_per_cell'][0] > 1 else 0
+ ind_dims = len(self._field_information[name]['values_per_cell'])
return remove_ghost_layers(self.cpu_arrays[name], ind_dims, gl_to_remove)
def log(self, *args, level='INFO'):
diff --git a/kernelcreation.py b/kernelcreation.py
index fa56776..0cb2c5e 100644
--- a/kernelcreation.py
+++ b/kernelcreation.py
@@ -158,6 +158,7 @@ def create_indexed_kernel(assignments, index_fields, target='cpu', data_type="do
else:
raise ValueError("Unknown target %s. Has to be either 'cpu' or 'gpu'" % (target,))
+
def create_staggered_kernel_from_assignments(assignments, **kwargs):
assert 'iteration_slice' not in kwargs and 'ghost_layers' not in kwargs
lhs_fields = {a.lhs.atoms(Field.Access) for a in assignments}
diff --git a/slicing.py b/slicing.py
index b925ac1..0fab367 100644
--- a/slicing.py
+++ b/slicing.py
@@ -17,6 +17,7 @@ class SlicedGetter(object):
def __getitem__(self, item):
return self._functionReturningArray(item)
+
class SlicedGetterDataHandling:
def __init__(self, data_handling, name):
self.dh = data_handling
--
GitLab