resolved merge conflicts

Author: cheginit

advection_nonuniform/problems/inputs.slotted

@@ -32,7 +32,7 @@ yrboundary = periodic
 u = 1.0
 v = 1.0
 
-limiter = 1
+limiter = 2
 
 [particles]
 do_particles = 0

pyro.py

@@ -12,10 +12,10 @@
 from util import msg, profile, runparams, io
 
 valid_solvers = ["advection",
+                 "advection_nonuniform",
                  "advection_rk",
                  "advection_fv4",
                  "advection_weno",
-                 "advection_nonuniform",
                  "compressible",
                  "compressible_rk",
                  "compressible_fv4",
@@ -213,8 +213,7 @@ def single_step(self):
                 basename = self.rp.get_param("io.basename")
                 plt.savefig("{}{:04d}.png".format(basename, self.sim.n))
 
-        if self.make_bench or (result != 0 and self.reset_bench_on_fail):
-            self.store_as_benchmark()
+            tm_vis.end()
 
     def __repr__(self):
         """ Return a representation of the Pyro object """