Skip to content
Snippets Groups Projects
Commit 7cf6ca59 authored by Dominic Kempf's avatar Dominic Kempf
Browse files

Fix up merge resolution

parent 5a1a0bd2
No related branches found
No related tags found
No related merge requests found
...@@ -712,16 +712,7 @@ class SumfactKernel(SumfactKernelBase, ImmutableRecord, prim.Variable): ...@@ -712,16 +712,7 @@ class SumfactKernel(SumfactKernelBase, ImmutableRecord, prim.Variable):
return tuple(mat.quadrature_size for mat in self.matrix_sequence_quadrature_permuted) return tuple(mat.quadrature_size for mat in self.matrix_sequence_quadrature_permuted)
def quadrature_index(self, sf, visitor): def quadrature_index(self, sf, visitor):
if visitor.current_info[1] is None: quad_inames = visitor.quadrature_inames()
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)
if len(self.matrix_sequence_quadrature_permuted) == local_dimension(): if len(self.matrix_sequence_quadrature_permuted) == local_dimension():
return tuple(prim.Variable(i) for i in quad_inames) return tuple(prim.Variable(i) for i in quad_inames)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment