aboutsummaryrefslogtreecommitdiff
path: root/simulation.py
diff options
context:
space:
mode:
Diffstat (limited to 'simulation.py')
-rw-r--r--simulation.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/simulation.py b/simulation.py
index 0f7e904..b9df3f0 100644
--- a/simulation.py
+++ b/simulation.py
@@ -36,8 +36,6 @@ class Geometry:
else:
return (self.size_x-2, self.size_y-2, self.size_z-2)
-
-
def pad(n, m):
return (n // m + min(1,n % m)) * m
@@ -110,24 +108,6 @@ class Memory:
def cells(self):
return ndindex(self.size(), order='F')
-class Particles:
- def __init__(self, context, float_type, geometry, n):
- self.context = context
- self.count = n
-
- self.np_particles = numpy.ndarray(shape=(self.count, 4), dtype=float_type)
-
- self.np_particles[:,0:2] = numpy.mgrid[
- geometry.size_x//20:2*geometry.size_x//20:100j,
- 4*geometry.size_y//9:5*geometry.size_y//9:n/100j
- ].reshape(2,-1).T
- self.np_particles[:,2] = 0.0
- self.np_particles[:,3] = 0.0
-
- self.gl_particles = vbo.VBO(data=self.np_particles, usage=gl.GL_DYNAMIC_DRAW, target=gl.GL_ARRAY_BUFFER)
- self.gl_particles.bind()
- self.cl_gl_particles = cl.GLBuffer(self.context, mf.READ_WRITE, int(self.gl_particles))
-
class Lattice:
def __init__(self,
descriptor, geometry, moments, collide,
@@ -265,4 +245,4 @@ class Lattice:
self.queue, self.grid.size(), self.layout, self.memory.cl_pop_a, self.memory.cl_material, self.memory.cl_gl_moments)
self.program.update_particles(
- self.queue, (particles.count,1), None, self.memory.cl_gl_moments, particles.cl_gl_particles)
+ self.queue, (particles.count,1), None, self.memory.cl_gl_moments, self.memory.cl_material, particles.cl_gl_particles)