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.

1 files changed, 1 insertions, 4 deletions

diff --git a/boltzgen.py b/boltzgen.py
index b4a9fe8..82adafe 100755
--- a/boltzgen.py
+++ b/boltzgen.py
@@ -26,11 +26,8 @@ lattice = eval("lbm.model.%s" % args.lattice)
 if args.index is None:
     args.index = 'XYZ'
 
-lbm = LBM(lattice)
 generator = Generator(
-    descriptor = lattice,
-    moments    = lbm.moments(optimize = not args.disable_cse),
-    collision  = lbm.bgk(f_eq = lbm.equilibrium(), tau = float(args.tau), optimize = not args.disable_cse),
+    model      = LBM(lattice, tau = float(args.tau), optimize = not args.disable_cse),
     target     = args.target,
     precision  = args.precision,
     index      = args.index,