diff --git a/python/dune/perftool/pdelab/localoperator.py b/python/dune/perftool/pdelab/localoperator.py index d18496374ee0b0adca2cd78dfa56635d2756482f..ecf578882a001960830e0dad814b5613b01e71e0 100644 --- a/python/dune/perftool/pdelab/localoperator.py +++ b/python/dune/perftool/pdelab/localoperator.py @@ -230,7 +230,7 @@ def determine_accumulation_space(expr, number, measure, idims=None): subel = select_subelement(ma.argexpr.ufl_element(), ma.tree_path) # And generate a local function space for it! - from dune.perftool.pdelab.spaces import name_lfs, name_lfs_bound, lfs_child, lfs_inames + from dune.perftool.pdelab.spaces import name_lfs, name_lfs_bound, lfs_child lfs = name_lfs(ma.argexpr.ufl_element(), ma.restriction, ma.tree_path) from dune.perftool.generation import valuearg from loopy.types import NumpyType @@ -243,12 +243,13 @@ def determine_accumulation_space(expr, number, measure, idims=None): lfs = lfs_child(lfs, idims, shape=subel.value_shape(), symmetry=subel.symmetry()) subel = subel.sub_elements()[0] - iname, = get_backend("lfs_inames", selector=option_switch("blockstructured"))(subel, ma.restriction, count=number) if get_option("blockstructured"): from dune.perftool.blockstructured.tools import micro_index_to_macro_index - lfsi = micro_index_to_macro_index(subel, iname) + from dune.perftool.blockstructured.spaces import lfs_inames + lfsi = micro_index_to_macro_index(subel, lfs_inames(subel, ma.restriction, count=number)[0]) else: - lfsi = Variable(iname) + from dune.perftool.pdelab.spaces import lfs_inames + lfsi = Variable(lfs_inames(subel, ma.restriction, count=number)[0]) # If the LFS is not yet a pymbolic expression, make it one from pymbolic.primitives import Expression