From 24847cbb2567f508a7c30b39c6fb7ba6379d1adc Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 2 Nov 2019 17:18:32 +0100
Subject: Restructure LBM model / lattice distinction

---
 boltzgen/kernel/template/bounce_back_boundary.cl.mako  | 2 +-
 boltzgen/kernel/template/bounce_back_boundary.cpp.mako | 2 +-
 boltzgen/kernel/template/collide_and_stream.cl.mako    | 2 +-
 boltzgen/kernel/template/collide_and_stream.cpp.mako   | 2 +-
 boltzgen/kernel/template/momenta_boundary.cl.mako      | 4 ++--
 boltzgen/kernel/template/momenta_boundary.cpp.mako     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'boltzgen/kernel/template')

diff --git a/boltzgen/kernel/template/bounce_back_boundary.cl.mako b/boltzgen/kernel/template/bounce_back_boundary.cl.mako
index 8bb4f6c..4766bba 100644
--- a/boltzgen/kernel/template/bounce_back_boundary.cl.mako
+++ b/boltzgen/kernel/template/bounce_back_boundary.cl.mako
@@ -10,7 +10,7 @@ __kernel void bounce_back_boundary_gid(__global ${float_type}* f_next,
 % endfor
 
 <%
-    subexpr, assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = True))
+    subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True))
 %>
 
 % for i, expr in enumerate(subexpr):
diff --git a/boltzgen/kernel/template/bounce_back_boundary.cpp.mako b/boltzgen/kernel/template/bounce_back_boundary.cpp.mako
index 91dcfa0..c37233e 100644
--- a/boltzgen/kernel/template/bounce_back_boundary.cpp.mako
+++ b/boltzgen/kernel/template/bounce_back_boundary.cpp.mako
@@ -10,7 +10,7 @@ void bounce_back_boundary(      ${float_type}* f_next,
 % endfor
 
 <%
-    subexpr, assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = True))
+    subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True))
 %>
 
 % for i, expr in enumerate(subexpr):
diff --git a/boltzgen/kernel/template/collide_and_stream.cl.mako b/boltzgen/kernel/template/collide_and_stream.cl.mako
index 303b21b..6b55cd2 100644
--- a/boltzgen/kernel/template/collide_and_stream.cl.mako
+++ b/boltzgen/kernel/template/collide_and_stream.cl.mako
@@ -10,7 +10,7 @@ __kernel void collide_and_stream_gid(__global ${float_type}* f_next,
 % endfor
 
 <%
-    subexpr, assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = True))
+    subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True))
 %>
 
 % for i, expr in enumerate(subexpr):
diff --git a/boltzgen/kernel/template/collide_and_stream.cpp.mako b/boltzgen/kernel/template/collide_and_stream.cpp.mako
index 47dd6dd..2c52b54 100644
--- a/boltzgen/kernel/template/collide_and_stream.cpp.mako
+++ b/boltzgen/kernel/template/collide_and_stream.cpp.mako
@@ -10,7 +10,7 @@ void collide_and_stream(      ${float_type}* f_next,
 % endfor
 
 <%
-    subexpr, assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = True))
+    subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True))
 %>
 
 % for i, expr in enumerate(subexpr):
diff --git a/boltzgen/kernel/template/momenta_boundary.cl.mako b/boltzgen/kernel/template/momenta_boundary.cl.mako
index 4e29601..7c1e3df 100644
--- a/boltzgen/kernel/template/momenta_boundary.cl.mako
+++ b/boltzgen/kernel/template/momenta_boundary.cl.mako
@@ -1,6 +1,6 @@
 <%
 moments_subexpr, moments_assignment = model.moments()
-collision_subexpr, collision_assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = False))
+collision_subexpr, collision_assignment = model.collision(f_eq = model.equilibrium(resolve_moments = False))
 %>
 
 <%def name="momenta_boundary(name, param)">
@@ -30,7 +30,7 @@ __kernel void ${name}_momenta_boundary_gid(
     const ${float_type} ${ccode(expr)}
 % endfor
 
-% for i in range(0,descriptor.q):
+% for i, expr in enumerate(collision_assignment):
     preshifted_f_next[${layout.pop_offset(i)}] = f_next_${i};
 % endfor
 }
diff --git a/boltzgen/kernel/template/momenta_boundary.cpp.mako b/boltzgen/kernel/template/momenta_boundary.cpp.mako
index 6d05288..c41d07e 100644
--- a/boltzgen/kernel/template/momenta_boundary.cpp.mako
+++ b/boltzgen/kernel/template/momenta_boundary.cpp.mako
@@ -1,6 +1,6 @@
 <%
 moments_subexpr, moments_assignment = model.moments()
-collision_subexpr, collision_assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = False))
+collision_subexpr, collision_assignment = model.collision(f_eq = model.equilibrium(resolve_moments = False))
 %>
 
 <%def name="momenta_boundary(name, param)">
-- 
cgit v1.2.3