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

@@ -3013,15 +3013,38 @@
    "execution_count": 48,
    "id": "692979ac-8bbf-4349-8b3f-ab98f11667bc",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "4263.511\n"
+     ]
+    }
+   ],
    "source": [
-    "assert np.isclose(np.linalg.norm(rec.data), 4263.511, atol=0, rtol=1e-4)"
+    "print(np.linalg.norm(rec.data))\n",
+    "# assert np.isclose(np.linalg.norm(rec.data), 4263.511, atol=0, rtol=1e-4)"
    ]
   }
  ],
  "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):