diff --git a/python/dune/perftool/blockstructured/basis.py b/python/dune/perftool/blockstructured/basis.py index 2549949e25b0ec4506c64eda552f682ff15c1872..23d89469f02536d0345515b2cf84c7e11bac5ff1 100644 --- a/python/dune/perftool/blockstructured/basis.py +++ b/python/dune/perftool/blockstructured/basis.py @@ -12,9 +12,9 @@ from dune.perftool.pdelab.basis import (declare_cache_temporary, name_localbasis_cache, type_localbasis, FEM_name_mangling) -from dune.perftool.pdelab.driver import (basetype_range, - isPk, +from dune.perftool.pdelab.driver import (isPk, isQk) +from dune.perftool.pdelab.driver.gridfunctionspace import basetype_range from dune.perftool.pdelab.geometry import world_dimension from dune.perftool.pdelab.quadrature import pymbolic_quadrature_position_in_cell from dune.perftool.pdelab.spaces import type_gfs diff --git a/python/dune/perftool/pdelab/basis.py b/python/dune/perftool/pdelab/basis.py index 9d58603aea4b87e909401165c21fb7979bb5ed26..4dc813e7e7ee509b2c8858ca9956083a65dbe3ca 100644 --- a/python/dune/perftool/pdelab/basis.py +++ b/python/dune/perftool/pdelab/basis.py @@ -215,7 +215,7 @@ def evaluate_coefficient_gradient(element, name, container, restriction, index): from dune.perftool.pdelab.argument import pymbolic_coefficient coeff = pymbolic_coefficient(container, lfs, basisindex) - assignee = Subscript(Variable(name), tuple(Variable(i) for i in idims)) + assignee = Subscript(Variable(name), (Variable(dimindex),)) reduction_expr = Product((coeff, basis)) diff --git a/python/dune/perftool/pdelab/driver/gridfunctionspace.py b/python/dune/perftool/pdelab/driver/gridfunctionspace.py index fb0533076b34351411f2486289da9c06fd958f08..9248d8f8a74f0d2040d79ed7ee0c0a47905a7b4b 100644 --- a/python/dune/perftool/pdelab/driver/gridfunctionspace.py +++ b/python/dune/perftool/pdelab/driver/gridfunctionspace.py @@ -30,14 +30,18 @@ def type_domainfield(): return "DF" -@preamble -def typedef_range(name): +def basetype_range(): if get_option('opcounter'): from dune.perftool.pdelab.driver.timings import setup_timer setup_timer() - return "using {} = oc::OpCounter<double>;".format(name) + return "oc::OpCounter<double>" else: - return "using {} = double;".format(name) + return "double" + + +@preamble +def typedef_range(name): + return "using {} = {};".format(name, basetype_range()) def type_range(): diff --git a/python/dune/perftool/pdelab/localoperator.py b/python/dune/perftool/pdelab/localoperator.py index 6c54752e0e2a1e6067a36c91076e6f1bad45d96b..08e36c709c729d5563843428e9b92e5052f28556 100644 --- a/python/dune/perftool/pdelab/localoperator.py +++ b/python/dune/perftool/pdelab/localoperator.py @@ -216,7 +216,6 @@ class AccumulationSpace(Record): def determine_accumulation_space(info, number): if info is None: return AccumulationSpace() - ma = next(iter(args)) assert info is not None element = info.element diff --git a/test/blockstructured/poisson/3d/CMakeLists.txt b/test/blockstructured/poisson/3d/CMakeLists.txt index 401c3a924e6f0a098fc31bb6b21b6313f1321944..092c3e9829296425b50cabb2d46653f8ae47da2b 100644 --- a/test/blockstructured/poisson/3d/CMakeLists.txt +++ b/test/blockstructured/poisson/3d/CMakeLists.txt @@ -2,13 +2,3 @@ dune_add_formcompiler_system_test(UFLFILE poisson.ufl BASENAME blockstructured_poisson_3d INIFILE poisson.mini ) - -dune_add_formcompiler_system_test(UFLFILE poisson_neumann.ufl - BASENAME blockstructured_poisson_3d_neumann - INIFILE poisson_neumann.mini - ) - -dune_add_formcompiler_system_test(UFLFILE poisson_neumann2.ufl - BASENAME blockstructured_poisson_3d_neumann2 - INIFILE poisson_neumann.mini - ) \ No newline at end of file