From f6adcb21312bda379d2676ac0d668d1cde74dde9 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Fri, 25 Aug 2017 11:33:23 +0200
Subject: [PATCH] Fixups after rebasing
---
python/dune/perftool/blockstructured/basis.py | 4 ++--
python/dune/perftool/pdelab/basis.py | 2 +-
.../dune/perftool/pdelab/driver/gridfunctionspace.py | 12 ++++++++----
python/dune/perftool/pdelab/localoperator.py | 1 -
test/blockstructured/poisson/3d/CMakeLists.txt | 10 ----------
5 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/python/dune/perftool/blockstructured/basis.py b/python/dune/perftool/blockstructured/basis.py
index 2549949e..23d89469 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 9d58603a..4dc813e7 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 fb053307..9248d8f8 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 6c54752e..08e36c70 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 401c3a92..092c3e98 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
--
GitLab