From a162bc34bcd6dbc8ba57ed46c886bc9c539f66a3 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 25 Mar 2020 21:32:50 +0100
Subject: Move everything into main function

---
 boltzgas/simulation.py       |  2 +-
 boltzgas/visual/histogram.py | 11 ++++++-----
 boltzgas/visual/view.py      |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'boltzgas')

diff --git a/boltzgas/simulation.py b/boltzgas/simulation.py
index a4ae4da..6af9069 100644
--- a/boltzgas/simulation.py
+++ b/boltzgas/simulation.py
@@ -89,7 +89,7 @@ class HardSphereSimulation:
             self.tick = True
             kernelargs = (self.cl_particle_position_b, self.cl_particle_velocity_b, self.cl_particle_position_a, self.cl_particle_velocity_a, self.cl_last_collide)
 
-        self.program.evolve(self.queue, (self.n_particles,), None, *(kernelargs))
+        self.program.evolve(self.queue, (self.n_particles,), None, *(kernelargs)).wait()
 
     def gl_draw_particles(self):
         gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
diff --git a/boltzgas/visual/histogram.py b/boltzgas/visual/histogram.py
index 2f90b8b..fc1e853 100644
--- a/boltzgas/visual/histogram.py
+++ b/boltzgas/visual/histogram.py
@@ -19,7 +19,7 @@ def get_histogram(velocities, char_u):
     fig = plt.figure(figsize=(8,8))
     ax = fig.add_axes([0.1, 0.06, 0.88, 0.92])
 
-    plt.ylim(0, 0.003)
+    plt.ylim(0, 0.004)
     plt.ylabel('Probability')
 
     plt.xlim(0, 1.2*char_u)
@@ -55,7 +55,6 @@ class VelocityHistogram:
         self.tick = False
         self.mixing = 0.0
 
-    def setup(self):
         self.vertices = np.array([
             self.origin[0]                 , self.origin[1]                 , 0., 1.,
             self.origin[0] + self.extend[0], self.origin[1]                 , 1., 1.,
@@ -85,6 +84,9 @@ class VelocityHistogram:
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
+    def shutdown(self):
+        self.pool.shutdown()
+
     def update(self):
         self.steps = self.steps + 1
 
@@ -111,9 +113,9 @@ class VelocityHistogram:
 
     def display(self, uniform):
         if self.tick:
-            self.mixing = min(self.mixing+0.1, 1.0);
+            self.mixing = min(self.mixing+0.05, 1.0);
         else:
-            self.mixing = max(self.mixing-0.1, 0.0);
+            self.mixing = max(self.mixing-0.05, 0.0);
 
         glBindTextures(self.texture_id[0], 2, self.texture_id)
         glUniform1iv(uniform['picture'], len(self.texture_id), self.texture_id)
@@ -122,4 +124,3 @@ class VelocityHistogram:
         glBindVertexArray(self.vao);
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 4)
         glBindVertexArray(0)
-
diff --git a/boltzgas/visual/view.py b/boltzgas/visual/view.py
index d6e188b..e2746e2 100644
--- a/boltzgas/visual/view.py
+++ b/boltzgas/visual/view.py
@@ -146,7 +146,7 @@ class View:
         glUniformMatrix4fv(self.particle_shader.uniform['projection'], 1, False, np.asfortranarray(self.projection))
         glUniform3f(self.particle_shader.uniform['face_color'],  1., 1., 1.)
         glUniform3f(self.particle_shader.uniform['trace_color'], 1., 0., 0.)
-        glUniform1ui(self.particle_shader.uniform['trace_id'], 4)
+        glUniform1ui(self.particle_shader.uniform['trace_id'], -1)
         glEnable(GL_POINT_SPRITE)
         glPointSize(2*self.gas.radius*self.pixels_per_unit)
         self.gas.gl_draw_particles()
-- 
cgit v1.2.3