update from comments

devitocodes · Apr 14, 2020 · a8b7ab0 · a8b7ab0
1 parent 1e91124
commit a8b7ab0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/devito/operator/operator.py b/devito/operator/operator.py
@@ -306,7 +306,7 @@ def _lower_exprs(cls, expressions, **kwargs):
                 dimension_map = {}
 
             # Handle Functions (typical case)
-            mapper = {f: f.indexify(w_shift=True, extra_subs=dimension_map)
+            mapper = {f: f.indexify(lshift=True, subs=dimension_map)
                       for f in retrieve_functions(expr)}
 
             # Handle Indexeds (from index notation)

diff --git a/devito/types/basic.py b/devito/types/basic.py
@@ -919,17 +919,17 @@ def _data_alignment(self):
         """
         return default_allocator().guaranteed_alignment
 
-    def indexify(self, indices=None, w_shift=False, extra_subs=None):
+    def indexify(self, indices=None, lshift=False, subs=None):
         """Create a types.Indexed from the current object."""
         if indices is not None:
             return Indexed(self.indexed, *indices)
 
         # Substitution for each index (spacing only used in own dimension)
-        extra_subs = extra_subs or {}
-        subs = [{**d._indexify_map, **extra_subs} for d in self.dimensions]
+        subs = subs or {}
+        subs = [{**{d.spacing: 1, -d.spacing: -1}, **subs} for d in self.dimensions]
 
         # Add halo shift
-        shift = self._size_nodomain.left if w_shift else tuple([0]*len(self.dimensions))
+        shift = self._size_nodomain.left if lshift else tuple([0]*len(self.dimensions))
         # Indices after substitutions
         indices = [(a - o + f).xreplace(s) for a, o, f, s in
                    zip(self.args, self.origin, shift, subs)]

diff --git a/devito/types/dimension.py b/devito/types/dimension.py
@@ -305,10 +305,6 @@ def __new__(cls, *args, **kwargs):
     def __init_finalize__(self, name, spacing=None):
         self._spacing = spacing or Scalar(name='h_%s' % name, is_const=True)
 
-    @cached_property
-    def _indexify_map(self):
-        return {self.spacing: 1}
-
 
 class DefaultDimension(Dimension, DataSymbol):
 
@@ -746,10 +742,6 @@ def free_symbols(self):
             retval |= self.condition.free_symbols
         return retval
 
-    @cached_property
-    def _indexify_map(self):
-        return {self.spacing: 1, -self.spacing: -1}
-
     # Pickling support
     _pickle_kwargs = DerivedDimension._pickle_kwargs + ['factor', 'condition', 'indirect']