Skip to content

api: fix injection expression indices #2927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mloubout merged 2 commits into from
May 12, 2026
+4 −13
Merged

api: fix injection expression indices #2927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05f954
api: add option to apply interp indices to function coeffs at inject
mloubout May 11, 2026
a0b7fc0
always interp whole expr for inject as doesn't make sense
mloubout May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions devito/operations/interpolators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ def _positions(self, implicit_dims):
return [Eq(v, INT(floor(k)), implicit_dims=implicit_dims)
for k, v in self.sfunction._position_map.items()]

def _interp_idx(self, variables, implicit_dims=None, pos_only=(), subdomain=None):
def _interp_idx(self, variables, implicit_dims=None, subdomain=None):
"""
Generate interpolation indices for the DiscreteFunctions in ``variables``.
"""
Expand All @@ -331,16 +331,6 @@ def _interp_idx(self, variables, implicit_dims=None, pos_only=(), subdomain=None

idx_subs = {v: v.subs(subs) for v in variables}

# Position only replacement, not radius dependent.
# E.g src.inject(vp(x)*src) needs to use vp[posx] at all points
# not vp[posx + rx]
idx_subs.update({
v: v.subs({
k: p
for (k, p) in zip(mapper, pos, strict=True)
}) for v in pos_only
})

return idx_subs, temps

@check_radius
Expand Down Expand Up @@ -479,8 +469,9 @@ def _inject(self, field, expr, implicit_dims=None):
self._rdim(subdomain=subdomain))

# List of indirection indices for all adjacent grid points
idx_subs, temps = self._interp_idx(fields, implicit_dims=implicit_dims,
pos_only=variables, subdomain=subdomain)
finterp = fields + as_tuple(variables)
idx_subs, temps = self._interp_idx(finterp, implicit_dims=implicit_dims,
subdomain=subdomain)

# Substitute coordinate base symbols into the interpolation coefficients
eqns = [Inc(_field.xreplace(idx_subs),
Expand Down
Loading