examples: Update DRP notebook

Author: EdCaunt

devito/data/decomposition.py

@@ -214,12 +214,13 @@ def index_glb_to_loc(self, *args, rel=True):
         if not self.loc_empty:
             loc_abs_min = self.loc_abs_min - self.glb_min
             loc_abs_max = self.loc_abs_max - self.glb_min
+            glb_max = self.glb_max - self.glb_min
         else:
             loc_abs_min = self.loc_abs_min
             loc_abs_max = self.loc_abs_max
+            glb_max = self.glb_max
 
         glb_min = 0
-        glb_max = self.glb_max - self.glb_min
 
         base = loc_abs_min if rel else 0
         top = loc_abs_max

devito/operations/interpolators.py

@@ -294,8 +294,8 @@ def _interp_idx(self, variables, implicit_dims=None, pos_only=(), subdomain=None
         mapper = self._rdim(subdomain=subdomain).getters
 
         # Index substitution to make in variables
-        subs = {k: c + p for ((k, c), p) in zip(mapper.items(), pos)}
-        subs.update({k.root: c + p for ((k, c), p) in zip(mapper.items(), pos)})
+        subs = {ki: c + p for ((k, c), p)
+                in zip(mapper.items(), pos) for ki in {k, k.root}}
 
         idx_subs = {v: v.subs(subs) for v in variables}
 

devito/types/basic.py

@@ -1477,7 +1477,7 @@ def _offset_subdomain(self):
                     offsets.append(l_tkn)
             else:
                 offsets.append(0)
-        return DimensionTuple(offsets, getters=self.dimensions)
+        return DimensionTuple(*offsets, getters=self.dimensions)
 
     @property
     def _data_alignment(self):

examples/seismic/tutorials/07_DRP_schemes.ipynb

@@ -396,18 +396,14 @@
     "        x, z = dimensions\n",
     "        # We want our lower layer to span the entire x-dimension and all\n",
     "        # but the top 121 (+boundary layer) cells in the z-direction.\n",
-    "        return {x: x, z: ('right', 121+nbl)}\n",
-    "\n",
-    "# Create these subdomains:\n",
-    "ur = Upper()\n",
-    "lr = Lower()"
+    "        return {x: x, z: ('right', 121+nbl)}"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We now create our model incoporating these subdomains:"
+    "We now create our `Model` and attach these `SubDomain`s:"
    ]
   },
   {
@@ -432,7 +428,11 @@
     "\n",
     "# Create our model passing it our 'upper' and 'lower' subdomains: \n",
     "model = Model(vp=v, origin=origin, shape=shape, spacing=spacing,\n",
-    "              space_order=order, nbl=nbl, subdomains=(ur,lr), bcs=\"damp\")"
+    "              space_order=order, nbl=nbl, bcs=\"damp\")\n",
+    "\n",
+    "# Create these subdomains:\n",
+    "ur = Upper(grid=model.grid)\n",
+    "lr = Lower(grid=model.grid)"
    ]
   },
   {
@@ -504,9 +504,9 @@
     "\n",
     "# Create a stencil for each subdomain:\n",
     "stencil_u = Eq(u_DRP.forward, solve(pde_DRP, u_DRP.forward).subs({H: u_lap}),\n",
-    "               subdomain = model.grid.subdomains['upper'])\n",
+    "               subdomain=ur)\n",
     "stencil_l = Eq(u_DRP.forward, solve(pde_DRP, u_DRP.forward).subs({H: l_lap}),\n",
-    "               subdomain = model.grid.subdomains['lower'])\n",
+    "               subdomain=lr)\n",
     "\n",
     "# Source term:\n",
     "src_term = src.inject(field=u_DRP.forward, expr=src * dt**2 / model.m)\n",