misc: conflict?

Author: JDBetteridge

examples/timestepping/acoustic_superstep_2d.py

@@ -127,7 +127,7 @@ def acoustic_model(model, step=1, snapshots=1):
         new_u.data[1, :] = u.data[idx - 1]
         new_u.data[2, :] = u.data[idx]
     else:
-        new_u, new_u_p, *stencil = superstep_generator(u, stencil.rhs, step)
+        new_u, new_u_p, *stencil = superstep_generator(u, stencil.rhs, step, tn=tn1)
 
     tn2 = int(np.ceil((t2 - t1)/model.critical_dt))
     dt = (t2 - t1)/tn2

examples/timestepping/superstep_2d.py

@@ -28,7 +28,6 @@ def gaussian2d(xx, yy, mu=0, sigma_sq=1):
 def ripple_on_pond(step=1, snapshots=1):
     # Construct 2D Grid
     grid = Grid(shape=shape, extent=extent)
-    x, y = grid.dimensions
 
     # Need to ensure that the velocity function supports the largest superstep stencil
     velocity = Function(name="velocity", grid=grid, space_order=(2, step, step))