Further the separation between descriptor and lattice

1 files changed, 0 insertions, 93 deletions

diff --git a/D2Q9.py b/D2Q9.py
deleted file mode 100644
index 27ae375..0000000
--- a/D2Q9.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import pyopencl as cl
-mf = cl.mem_flags
-
-import numpy
-
-import sympy
-import symbolic.D2Q9 as D2Q9
-
-from mako.template import Template
-
-class Lattice:
-    def idx(self, x, y):
-        return y * self.nX + x;
-
-    def __init__(self, nX, nY, geometry, moments, collide, pop_eq_src = '', boundary_src = ''):
-        self.nX = nX
-        self.nY = nY
-        self.nCells = nX * nY
-
-        self.moments = moments
-        self.collide = collide
-
-        self.pop_eq_src = pop_eq_src
-        self.boundary_src = boundary_src
-
-        self.platform = cl.get_platforms()[0]
-        self.context  = cl.Context(properties=[(cl.context_properties.PLATFORM, self.platform)])
-        self.queue = cl.CommandQueue(self.context)
-
-        self.np_material = numpy.ndarray(shape=(self.nCells, 1), dtype=numpy.int32)
-        self.setup_geometry(geometry)
-
-        self.tick = True
-        self.cl_pop_a = cl.Buffer(self.context, mf.READ_WRITE, size=9*self.nCells*numpy.float32(0).nbytes)
-        self.cl_pop_b = cl.Buffer(self.context, mf.READ_WRITE, size=9*self.nCells*numpy.float32(0).nbytes)
-
-        self.cl_moments  = cl.Buffer(self.context, mf.WRITE_ONLY, size=3*self.nCells*numpy.float32(0).nbytes)
-        self.cl_material = cl.Buffer(self.context, mf.READ_ONLY | mf.USE_HOST_PTR, hostbuf=self.np_material)
-
-        self.build_kernel()
-
-        self.program.equilibrilize(self.queue, (self.nX,self.nY), (32,1), self.cl_pop_a, self.cl_pop_b).wait()
-
-    def setup_geometry(self, geometry):
-        for y in range(1,self.nY-1):
-            for x in range(1,self.nX-1):
-                self.np_material[self.idx(x,y)] = geometry(self.nX,self.nY,x,y)
-
-    def build_kernel(self):
-        program_src = Template(filename = './template/kernel.mako').render(
-            nX     = self.nX,
-            nY     = self.nY,
-            nCells = self.nCells,
-            moments_helper     = self.moments[0],
-            moments_assignment = self.moments[1],
-            collide_helper     = self.collide[0],
-            collide_assignment = self.collide[1],
-            c     = D2Q9.c,
-            w     = D2Q9.w,
-            ccode = sympy.ccode,
-
-            pop_eq_src = Template(self.pop_eq_src).render(
-                nX     = self.nX,
-                nY     = self.nY,
-                nCells = self.nCells,
-                c     = D2Q9.c,
-                w     = D2Q9.w
-            ),
-            boundary_src = Template(self.boundary_src).render(
-                d = D2Q9.d
-            )
-        )
-        self.program = cl.Program(self.context, program_src).build('-cl-single-precision-constant')
-
-    def evolve(self):
-        if self.tick:
-            self.tick = False
-            self.program.collide_and_stream(self.queue, (self.nX,self.nY), (32,1), self.cl_pop_a, self.cl_pop_b, self.cl_material)
-        else:
-            self.tick = True
-            self.program.collide_and_stream(self.queue, (self.nX,self.nY), (32,1), self.cl_pop_b, self.cl_pop_a, self.cl_material)
-
-    def sync(self):
-        self.queue.finish()
-
-    def get_moments(self):
-        moments = numpy.ndarray(shape=(3, self.nCells), dtype=numpy.float32)
-        if self.tick:
-            self.program.collect_moments(self.queue, (self.nX,self.nY), (32,1), self.cl_pop_b, self.cl_moments)
-        else:
-            self.program.collect_moments(self.queue, (self.nX,self.nY), (32,1), self.cl_pop_a, self.cl_moments)
-        cl.enqueue_copy(self.queue, moments, self.cl_moments).wait();
-        return moments