From a6dcb57cff9a1dd9de7e5fafdc87230489be87b9 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Tue, 29 Oct 2019 19:25:38 +0100
Subject: Move further generator arguments into its constructor

---
 boltzgen/kernel/target/__init__.py   |  2 +-
 boltzgen/kernel/target/cell_index.py | 18 ------------------
 boltzgen/kernel/target/index.py      | 18 ++++++++++++++++++
 boltzgen/kernel/target/layout/AOS.py |  6 +++---
 boltzgen/kernel/target/layout/SOA.py |  6 +++---
 5 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 boltzgen/kernel/target/cell_index.py
 create mode 100644 boltzgen/kernel/target/index.py

(limited to 'boltzgen/kernel/target')

diff --git a/boltzgen/kernel/target/__init__.py b/boltzgen/kernel/target/__init__.py
index d39f48b..5927d1b 100644
--- a/boltzgen/kernel/target/__init__.py
+++ b/boltzgen/kernel/target/__init__.py
@@ -1,3 +1,3 @@
 from . import layout
 from . import precision
-from . import cell_index
+from . import index
diff --git a/boltzgen/kernel/target/cell_index.py b/boltzgen/kernel/target/cell_index.py
deleted file mode 100644
index 7e74dc5..0000000
--- a/boltzgen/kernel/target/cell_index.py
+++ /dev/null
@@ -1,18 +0,0 @@
-class CellIndexer:
-    def __init__(self, geometry):
-        self.geometry   = geometry
-
-    def neighbor(self, c_i):
-        return self.gid(*[ c for _, c in enumerate(c_i) ])
-
-class XYZ(CellIndexer):
-    pass
-
-    def gid(self, x, y, z=0):
-        return x*self.geometry.size_y*self.geometry.size_z + y*self.geometry.size_z + z
-
-class ZYX(CellIndexer):
-    pass
-
-    def gid(self, x, y, z=0):
-        return z*self.geometry.size_x*self.geometry.size_y + y*self.geometry.size_x + x
diff --git a/boltzgen/kernel/target/index.py b/boltzgen/kernel/target/index.py
new file mode 100644
index 0000000..e89e9ee
--- /dev/null
+++ b/boltzgen/kernel/target/index.py
@@ -0,0 +1,18 @@
+class CellIndex:
+    def __init__(self, geometry):
+        self.geometry   = geometry
+
+    def neighbor(self, c_i):
+        return self.gid(*[ c for _, c in enumerate(c_i) ])
+
+class XYZ(CellIndex):
+    pass
+
+    def gid(self, x, y, z=0):
+        return x*self.geometry.size_y*self.geometry.size_z + y*self.geometry.size_z + z
+
+class ZYX(CellIndex):
+    pass
+
+    def gid(self, x, y, z=0):
+        return z*self.geometry.size_x*self.geometry.size_y + y*self.geometry.size_x + x
diff --git a/boltzgen/kernel/target/layout/AOS.py b/boltzgen/kernel/target/layout/AOS.py
index c603869..88e5377 100644
--- a/boltzgen/kernel/target/layout/AOS.py
+++ b/boltzgen/kernel/target/layout/AOS.py
@@ -1,7 +1,7 @@
 class AOS:
-    def __init__(self, descriptor, cell_index, geometry):
+    def __init__(self, descriptor, index, geometry):
         self.descriptor = descriptor
-        self.cell_index = cell_index
+        self.index    = index(geometry)
         self.geometry = geometry
 
     def cell_preshift(self, gid):
@@ -11,4 +11,4 @@ class AOS:
         return i
 
     def neighbor_offset(self, c_i):
-        return self.descriptor.q * self.cell_index.neighbor(c_i)
+        return self.descriptor.q * self.index.neighbor(c_i)
diff --git a/boltzgen/kernel/target/layout/SOA.py b/boltzgen/kernel/target/layout/SOA.py
index 8f126ff..05e9e84 100644
--- a/boltzgen/kernel/target/layout/SOA.py
+++ b/boltzgen/kernel/target/layout/SOA.py
@@ -1,7 +1,7 @@
 class SOA:
-    def __init__(self, descriptor, cell_index, geometry):
+    def __init__(self, descriptor, index, geometry):
         self.descriptor = descriptor
-        self.cell_index = cell_index
+        self.index    = index(geometry)
         self.geometry = geometry
 
     def cell_preshift(self, gid):
@@ -11,4 +11,4 @@ class SOA:
         return i * self.geometry.volume
 
     def neighbor_offset(self, c_i):
-        return self.cell_index.neighbor(c_i)
+        return self.index.neighbor(c_i)
-- 
cgit v1.2.3