From 7cf6ca59d31a68f8b5cfa6ba80db5eeb7ad8da2a Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Tue, 29 Jan 2019 14:04:59 +0100
Subject: [PATCH] Fix up merge resolution
---
python/dune/codegen/sumfact/symbolic.py | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/python/dune/codegen/sumfact/symbolic.py b/python/dune/codegen/sumfact/symbolic.py
index da128f82..2768ece8 100644
--- a/python/dune/codegen/sumfact/symbolic.py
+++ b/python/dune/codegen/sumfact/symbolic.py
@@ -712,16 +712,7 @@ class SumfactKernel(SumfactKernelBase, ImmutableRecord, prim.Variable):
return tuple(mat.quadrature_size for mat in self.matrix_sequence_quadrature_permuted)
def quadrature_index(self, sf, visitor):
- if visitor.current_info[1] is None:
- element = None
- element_index = 0
- else:
- element = visitor.current_info[1].element
- element_index = visitor.current_info[1].element_index
- if isinstance(element, MixedElement):
- element = element.extract_component(element_index)[1]
-
- quad_inames = quadrature_inames(element)
+ quad_inames = visitor.quadrature_inames()
if len(self.matrix_sequence_quadrature_permuted) == local_dimension():
return tuple(prim.Variable(i) for i in quad_inames)
--
GitLab