Unify AOS, SOA specific cell preshift between targets

SOA and AOS should not be target specific, neighbor offset calculation /
bijection between gid and cell coordinates should be customizable.

1 files changed, 10 insertions, 10 deletions

diff --git a/boltzgen/kernel/target/layout/cpp.py b/boltzgen/kernel/target/layout/cpp.py
index bb5dba0..2a8c89e 100644
--- a/boltzgen/kernel/target/layout/cpp.py
+++ b/boltzgen/kernel/target/layout/cpp.py
@@ -1,33 +1,33 @@
-class AOS:
+class SOA:
     def __init__(self, descriptor, geometry):
         self.descriptor = descriptor
         self.geometry = geometry
 
-    def gid_offset(self):
-        return self.descriptor.q
+    def cell_preshift(self, gid):
+        return gid
 
     def pop_offset(self, i):
-        return i
+        return i * self.geometry.volume
 
     def neighbor_offset(self, c_i):
-        return self.descriptor.q * {
+        return {
             2: lambda:                                                    c_i[0]*self.geometry.size_y + c_i[1],
             3: lambda: c_i[0]*self.geometry.size_y*self.geometry.size_z + c_i[1]*self.geometry.size_z + c_i[2]
         }.get(self.descriptor.d)()
 
-class SOA:
+class AOS:
     def __init__(self, descriptor, geometry):
         self.descriptor = descriptor
         self.geometry = geometry
 
-    def gid_offset(self):
-        return 1
+    def cell_preshift(self, gid):
+        return "(%s)*%d" % (gid, self.descriptor.q)
 
     def pop_offset(self, i):
-        return i * self.geometry.volume
+        return i
 
     def neighbor_offset(self, c_i):
-        return {
+        return self.descriptor.q * {
             2: lambda:                                                    c_i[0]*self.geometry.size_y + c_i[1],
             3: lambda: c_i[0]*self.geometry.size_y*self.geometry.size_z + c_i[1]*self.geometry.size_z + c_i[2]
         }.get(self.descriptor.d)()