bench: cleanup

fast/diffusion_2D_wBCs.py

@@ -42,49 +42,30 @@
 u = TimeFunction(name='u', grid=grid, space_order=so)
 
 # Reset our data field and ICs
-# u.data[:, :, :] = 0.1
 init_hat(field=u.data[0], dx=dx, dy=dy, value=1.)
 
-
-# u.data[0, :, int(ny/2)] = 2
-
 a = Constant(name='a')
 # Create an equation with second-order derivatives
-eq = Eq(u.dt, a * u.laplace, subdomain=grid.interior)
+# eq = Eq(u.dt, a * u.laplace, subdomain=grid.interior)
+eq = Eq(u.dt, a * u.laplace)
 stencil = solve(eq, u.forward)
 eq_stencil = Eq(u.forward, stencil)
 
 # Create boundary condition expressions
 x, y = grid.dimensions
 t = grid.stepping_dim
 
-# Add boundary conditions
-# bc = [Eq(u[t+1, x, y, 0], 2.)]  # bottom
-# bc += [Eq(u[t+1, x, y, nz-1], 2.)]  # top
-# bc += [Eq(u[t+1, 0, y, z], 2.)]  # left
-# bc += [Eq(u[t+1, nx-1, y, z], 2.)]  # right
-
-# bc += [Eq(u[t+1, x, 0, z], 2.)]  # front
-# bc += [Eq(u[t+1, x, ny-1, z], 2.)]  # back
-
-print(eq_stencil)
-
-# Create an operator that updates the forward stencil point
-# plus adding boundary conditions
-# op = Operator([eq_stencil] + bc, subdomain=grid.interior)
-
-# No BCs
-# op = XDSLOperator([eq_stencil])
+initdata = u.data[:]
 op = Operator([eq_stencil])
-# print(op.ccode)
-# dt = 0.00002
-# import pdb;pdb.set_trace()
-# Apply the operator for a number of timesteps
-print(dt)
 op.apply(time=nt, dt=dt, a=nu)
 
-print("Field norm is:", norm(u))
+print("Devito Field norm is:", norm(u))
 
-plot_image(u.data[0], cmap="seismic")
+# plot_image(u.data[0], cmap="seismic")
+
+# Reset data and run XDSLOperator
+init_hat(field=u.data[0], dx=dx, dy=dy, value=1.)
+xdslop = XDSLOperator([eq_stencil])
+xdslop.apply(time=nt, dt=dt, a=nu)
 
-# import pdb;pdb.set_trace()
+print("XDSL Field norm is:", norm(u))

fast/diffusion_3D_wBCs.py

@@ -73,24 +73,15 @@ def plot_3dfunc(u):
 x, y, z = grid.dimensions
 t = grid.stepping_dim
 
-# Add boundary conditions
-# bc = [Eq(u[t+1, x, y, 0], 2.)]  # bottom
-# bc += [Eq(u[t+1, x, y, nz-1], 2.)]  # top
-# bc += [Eq(u[t+1, 0, y, z], 2.)]  # left
-# bc += [Eq(u[t+1, nx-1, y, z], 2.)]  # right
-
-# bc += [Eq(u[t+1, x, 0, z], 2.)]  # front
-# bc += [Eq(u[t+1, x, ny-1, z], 2.)]  # back
-
 print(eq_stencil)
 
 # Create an operator that updates the forward stencil point
 # plus adding boundary conditions
 # op = Operator([eq_stencil] + bc, subdomain=grid.interior)
 
 # No BCs
-# op = XDSLOperator([eq_stencil])
-op = Operator([eq_stencil])
+op = XDSLOperator([eq_stencil])
+# op = Operator([eq_stencil])
 # print(op.ccode)
 
 # Apply the operator for a number of timesteps
@@ -100,4 +91,5 @@ def plot_3dfunc(u):
     plot_3dfunc(u)
 
 print("Field norm is:", norm(u))
+
 # import pdb;pdb.set_trace()

fast/nd_nwave_devito_nodamp.py

@@ -114,18 +114,22 @@ def plot_3dfunc(u):
     if args.plot:
         plot_3dfunc(u)
 
-# Run more with no sources now (Not supported in xdsl)
-# op = XDSLOperator([stencil])
 
-# op.apply(time=time_range.num-1, dt=model.critical_dt)
+initdata = u.data[:]
+
+# Run more with no sources now (Not supported in xdsl)
+xdslop = XDSLOperator([stencil])
+xdslop.apply(time=time_range.num-1, dt=model.critical_dt)
 
 if len(shape) == 3:
     if args.plot:
         plot_3dfunc(u)
 
-# print(norm(u))
+print(norm(u))
+
+
+u.data[:] = initdata
 
-# todo edit data
 
 # Run more with no sources now (Not supported in xdsl)
 xdslop = XDSLOperator([stencil])

fast/nd_wave_devito_nodamp.py

@@ -113,6 +113,8 @@ def plot_3dfunc(u):
     if args.plot:
         plot_3dfunc(u)
 
+init_data = u.data[:]
+
 # Run more with no sources now (Not supported in xdsl)
 op = Operator([stencil])
 op.apply(time=time_range.num-1, dt=model.critical_dt)
@@ -122,3 +124,16 @@ def plot_3dfunc(u):
         plot_3dfunc(u)
 
 print(norm(u))
+
+
+u.data[:] = init_data
+
+# Run more with no sources now (Not supported in xdsl)
+xdslop = XDSLOperator([stencil])
+xdslop.apply(time=time_range.num-1, dt=model.critical_dt)
+
+if len(shape) == 3:
+    if args.plot:
+        plot_3dfunc(u)
+
+print(norm(u))