Split descriptors and symbolic formulation

1 files changed, 6 insertions, 3 deletions

diff --git a/implosion.py b/implosion.py
index 05f3644..2ba831f 100644
--- a/implosion.py
+++ b/implosion.py
@@ -5,7 +5,8 @@ import matplotlib
 import matplotlib.pyplot as plt
 matplotlib.use('AGG')
 
-from lbm import Lattice, Geometry
+from simulation         import Lattice, Geometry
+from symbolic.generator import LBM
 
 import symbolic.D2Q9 as D2Q9
 
@@ -58,12 +59,14 @@ moments = []
 
 print("Initializing simulation...\n")
 
+lbm = LBM(D2Q9)
+
 lattice = Lattice(
     descriptor = D2Q9,
     geometry   = Geometry(1024, 1024),
 
-    moments = D2Q9.moments(optimize = False),
-    collide = D2Q9.bgk(tau = 0.8),
+    moments = lbm.moments(optimize = False),
+    collide = lbm.bgk(f_eq = lbm.equilibrium(), tau = 0.8),
 
     pop_eq_src   = pop_eq,
     boundary_src = boundary)