fix some unit tests

pyro/advection_nonuniform/tests/test_advection_nonuniform.py

@@ -1,4 +1,5 @@
-import pyro.advection_nonuniform.simulation as sn
+import pyro.advection_nonuniform.simulation as sim
+import pyro.advection_nonuniform.problems.test as test
 from pyro.util import runparams
 
 
@@ -19,7 +20,7 @@ def setup_method(self):
         self.rp.params["mesh.ny"] = 8
         self.rp.params["particles.do_particles"] = 0
 
-        self.sim = sn.Simulation("advection_nonuniform", "test", self.rp)
+        self.sim = sim.Simulation("advection_nonuniform", "test", self.rp, test.init_data)
         self.sim.initialize()
 
     def teardown_method(self):

pyro/compressible/tests/test_compressible.py

@@ -2,7 +2,8 @@
 import pytest
 from numpy.testing import assert_array_equal
 
-import pyro.compressible.simulation as sn
+import pyro.compressible.simulation as sim
+import pyro.compressible.problems.test as test
 from pyro.util import runparams
 
 
@@ -26,7 +27,7 @@ def setup_method(self):
         self.rp.params["eos.gamma"] = 1.4
         self.rp.params["compressible.grav"] = 1.0
 
-        self.sim = sn.Simulation("compressible", "test", self.rp)
+        self.sim = sim.Simulation("compressible", "test", self.rp, test.init_data)
         self.sim.initialize()
 
     def teardown_method(self):

pyro/compressible_rk/tests/test_compressible_rk.py

@@ -1,4 +1,5 @@
-import pyro.compressible_rk.simulation as sn
+import pyro.compressible_rk.simulation as sim
+import pyro.compressible_rk.problems.test as test
 from pyro.util import runparams
 
 
@@ -22,7 +23,7 @@ def setup_method(self):
         self.rp.params["eos.gamma"] = 1.4
         self.rp.params["compressible.grav"] = 1.0
 
-        self.sim = sn.Simulation("compressible", "test", self.rp)
+        self.sim = sim.Simulation("compressible", "test", self.rp, test.init_data)
         self.sim.initialize()
 
     def teardown_method(self):

pyro/diffusion/tests/test_diffusion.py

@@ -1,4 +1,5 @@
-import pyro.diffusion.simulation as sn
+import pyro.diffusion.simulation as sim
+import pyro.diffusion.problems.test as test
 from pyro.util import runparams
 
 
@@ -19,7 +20,7 @@ def setup_method(self):
         self.rp.params["mesh.nx"] = 8
         self.rp.params["mesh.ny"] = 8
 
-        self.sim = sn.Simulation("diffusion", "test", self.rp)
+        self.sim = sim.Simulation("diffusion", "test", self.rp, test.init_data)
         self.sim.initialize()
 
     def teardown_method(self):

pyro/particles/tests/test_particles.py

@@ -53,7 +53,7 @@ def setup_test(n_particles=50, extra_rp_params=None):
             rp.params[param] = value
 
     # set up sim
-    sim = NullSimulation("", "", rp)
+    sim = NullSimulation("", "", rp, None)
 
     # set up grid
     my_grid = grid_setup(rp)

pyro/swe/tests/test_swe.py

@@ -1,7 +1,8 @@
 import numpy as np
 from numpy.testing import assert_array_equal
 
-import pyro.swe.simulation as sn
+import pyro.swe.simulation as sim
+import pyro.swe.problems.test as test
 from pyro.util import runparams
 
 
@@ -24,7 +25,7 @@ def setup_method(self):
 
         self.rp.params["swe.grav"] = 1.0
 
-        self.sim = sn.Simulation("swe", "test", self.rp)
+        self.sim = sim.Simulation("swe", "test", self.rp, test.init_data)
         self.sim.initialize()
 
     def teardown_method(self):
@@ -39,10 +40,10 @@ def test_initializationst(self):
     def test_prim(self):
 
         # U -> q
-        q = sn.cons_to_prim(self.sim.cc_data.data, self.sim.ivars, self.sim.cc_data.grid)
+        q = sim.cons_to_prim(self.sim.cc_data.data, self.sim.ivars, self.sim.cc_data.grid)
 
         # q -> U
-        U = sn.prim_to_cons(q, self.sim.ivars, self.sim.cc_data.grid)
+        U = sim.prim_to_cons(q, self.sim.ivars, self.sim.cc_data.grid)
         assert_array_equal(U, self.sim.cc_data.data)
 
     def test_derives(self):