tests: Fix typo in interpolation and shore up tests

Author: EdCaunt

devito/operations/interpolators.py

@@ -254,7 +254,8 @@ def _augment_implicit_dims(self, implicit_dims, extras=None):
             for v in extras:
                 try:
                     if v.grid.is_SubDomain:
-                        edims.extend([d for d in v.grid.dims if d.root in self._gdims])
+                        edims.extend([d for d in v.grid.dimensions
+                                      if d.is_Sub and d.root in self._gdims])
                 except AttributeError:
                     pass
 

examples/userapi/07_functions_on_subdomains.ipynb

@@ -2887,34 +2887,22 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Operator `Kernel` ran in 0.68 s\n"
+      "Operator `Kernel` ran in 0.74 s\n"
      ]
-    },
-    {
-     "data": {
-      "text/plain": [
-       "PerformanceSummary([(PerfKey(name='section0', rank=None),\n",
-       "                     PerfEntry(time=0.198681000000007, gflopss=0.0, gpointss=0.0, oi=0.0, ops=0, itershapes=[])),\n",
-       "                    (PerfKey(name='section1', rank=None),\n",
-       "                     PerfEntry(time=0.19470700000000477, gflopss=0.0, gpointss=0.0, oi=0.0, ops=0, itershapes=[])),\n",
-       "                    (PerfKey(name='section2', rank=None),\n",
-       "                     PerfEntry(time=0.14005600000000007, gflopss=0.0, gpointss=0.0, oi=0.0, ops=0, itershapes=[])),\n",
-       "                    (PerfKey(name='section3', rank=None),\n",
-       "                     PerfEntry(time=0.1434430000000003, gflopss=0.0, gpointss=0.0, oi=0.0, ops=0, itershapes=[]))])"
-      ]
-     },
-     "execution_count": 45,
-     "metadata": {},
-     "output_type": "execute_result"
     }
    ],
    "source": [
     "#NBVAL_IGNORE_OUTPUT\n",
-    "op1 = Operator([eq_v,\n",
+    "from devito import switchconfig\n",
+    "\n",
+    "# Note: switchconfig(safe_math=True) is only required here to get consistent norms for testing purposes\n",
+    "# This is not required more widely and can be omitted in practical applications\n",
+    "with switchconfig(safe_math=True):\n",
+    "    op1 = Operator([eq_v,\n",
     "                eq_p, eq_t,\n",
     "                eq_p_tr, eq_txx_tr, eq_tyy_tr]\n",
     "               + src_term + rec_term)\n",
-    "op1(dt=dt)"
+    "    op1(dt=dt)"
    ]
   },
   {
@@ -3020,8 +3008,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.11.5"
   }
  },
  "nbformat": 4,

tests/test_interpolation.py

@@ -3,6 +3,7 @@
 import pytest
 from sympy import Float
 
+from conftest import assert_structure
 from devito import (Grid, Operator, Dimension, SparseFunction, SparseTimeFunction,
                     Function, TimeFunction, DefaultDimension, Eq, switchconfig,
                     PrecomputedSparseFunction, PrecomputedSparseTimeFunction,
@@ -958,6 +959,10 @@ def test_interpolate_subdomain(self):
         assert np.all(np.isclose(sr0.data, check0))
         assert np.all(np.isclose(sr1.data, check1))
         assert np.all(np.isclose(sr2.data, check2))
+        assert_structure(op,
+                         ['p_sr0', 'p_sr0rsr0xrsr0y', 'p_sr1',
+                          'p_sr1rsr1xrsr1y', 'p_sr2', 'p_sr2rsr2xrsr2y'],
+                         'p_sr0rsr0xrsr0yp_sr1rsr1xrsr1yp_sr2rsr2xrsr2y')
 
     def test_interpolate_subdomain_sinc(self):
         """
@@ -997,6 +1002,10 @@ def test_interpolate_subdomain_sinc(self):
 
         assert np.all(np.isclose(sr0.data, sr2.data))
         assert np.all(np.isclose(sr1.data, sr2.data))
+        assert_structure(op,
+                         ['p_sr0', 'p_sr0rsr0xrsr0y', 'p_sr1',
+                          'p_sr1rsr1xrsr1y', 'p_sr2', 'p_sr2rsr2xrsr2y'],
+                         'p_sr0rsr0xrsr0yp_sr1rsr1xrsr1yp_sr2rsr2xrsr2y')
 
     def test_inject_subdomain(self):
         """
@@ -1041,6 +1050,9 @@ def test_inject_subdomain(self):
 
         assert np.all(np.isclose(f0.data, check0))
         assert np.all(np.isclose(f1.data, check1))
+        assert_structure(op,
+                         ['p_sr0rsr0xrsr0y'],
+                         'p_sr0rsr0xrsr0y')
 
     def test_inject_subdomain_sinc(self):
         """
@@ -1070,6 +1082,9 @@ def test_inject_subdomain_sinc(self):
 
         assert np.all(np.isclose(f0.data, f2.data[:9, -9:]))
         assert np.all(np.isclose(f1.data, f2.data[1:-1, 1:-1]))
+        assert_structure(op,
+                         ['p_sr0rsr0xrsr0y'],
+                         'p_sr0rsr0xrsr0y')
 
     @pytest.mark.parallel(mode=4)
     def test_interpolate_subdomain_mpi(self, mode):