From e2b00f4ec963060be98939c7b0d12d6c00e50a02 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 31 Oct 2019 13:13:00 +0100
Subject: Call symbolic generator inside code templates

This paves the way for dropping in other LBM collision models.
As a side benefit the default momenta calulcation is now fully inlined where possible.
---
 boltzgen/kernel/template/collide_and_stream.cpp.mako | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'boltzgen/kernel/template/collide_and_stream.cpp.mako')

diff --git a/boltzgen/kernel/template/collide_and_stream.cpp.mako b/boltzgen/kernel/template/collide_and_stream.cpp.mako
index 20fc529..47dd6dd 100644
--- a/boltzgen/kernel/template/collide_and_stream.cpp.mako
+++ b/boltzgen/kernel/template/collide_and_stream.cpp.mako
@@ -9,23 +9,19 @@ void collide_and_stream(      ${float_type}* f_next,
     const ${float_type} f_curr_${i} = preshifted_f_prev[${layout.pop_offset(i) + layout.neighbor_offset(-c_i)}];
 % endfor
 
-% for i, expr in enumerate(moments_subexpr):
-    const ${float_type} ${expr[0]} = ${ccode(expr[1])};
-% endfor
-
-% for i, expr in enumerate(moments_assignment):
-    ${float_type} ${ccode(expr)}
-% endfor
+<%
+    subexpr, assignment = model.bgk(f_eq = model.equilibrium(resolve_moments = True))
+%>
 
-% for i, expr in enumerate(collision_subexpr):
+% for i, expr in enumerate(subexpr):
     const ${float_type} ${expr[0]} = ${ccode(expr[1])};
 % endfor
 
-% for i, expr in enumerate(collision_assignment):
+% for i, expr in enumerate(assignment):
     const ${float_type} ${ccode(expr)}
 % endfor
 
-% for i, expr in enumerate(collision_assignment):
+% for i, expr in enumerate(assignment):
     preshifted_f_next[${layout.pop_offset(i)}] = f_next_${i};
 % endfor
 }
-- 
cgit v1.2.3