Fixed tests

Author: harpolea

advection/simulation.py

@@ -128,7 +128,7 @@ def dovis(self):
             particle_positions = self.particles.get_positions()
 
             # dye particles
-            colors = self.particles.get_init_positions()[:,0]
+            colors = self.particles.get_init_positions()[:, 0]
 
             # plot particles
             ax.scatter(particle_positions[:, 0],

particles/particles.py

@@ -269,7 +269,7 @@ def get_init_positions(self):
         We defined the particles as a dictionary with their initial positions
         as the keys, so this just becomes a restructuring operation.
         """
-        return np.array([[x, y] for (x,y) in self.particles.keys()])
+        return np.array([[x, y] for (x, y) in self.particles.keys()])
 
     def write_particles(self, filename):
         """

particles/tests/test_particles.py

@@ -40,7 +40,7 @@ def test_particles_random_gen():
     np.random.seed(3287469)
 
     ps = particles.Particles(sim.cc_data, bc, rp)
-    positions = set([(p.x, p.y) for p in ps.particles])
+    positions = set([(p.x, p.y) for p in ps.particles.values()])
 
     assert len(ps.particles) == 50, "There should be 50 particles"
 
@@ -76,7 +76,7 @@ def test_particles_grid_gen():
 
     assert len(ps.particles) == 49, "There should be 49 particles"
 
-    positions = set([(p.x, p.y) for p in ps.particles])
+    positions = set([(p.x, p.y) for p in ps.particles.values()])
 
     xs, step = np.linspace(0, 1, num=7, endpoint=False, retstep=True)
     xs += 0.5 * step

swe/tests/test_swe.py

@@ -22,6 +22,7 @@ def setup_method(self):
 
         self.rp.params["mesh.nx"] = 8
         self.rp.params["mesh.ny"] = 8
+        self.rp.params["particles.do_particles"] = 0
 
         self.rp.params["swe.grav"] = 1.0