k

Author: ksagiyam

tsfc/fem.py

@@ -74,10 +74,13 @@ def fiat_cell(self):
 
     @cached_property
     def integration_dim(self):
-        domain, integral_type = tuple(self.domain_integral_type_map.items())[0]
-        cell = domain.ufl_cell()
-        fiat_cell = as_fiat_cell(cell)
-        integration_dim, _ = lower_integral_type(fiat_cell, integral_type)
+        integration_dims = set()
+        for domain, integral_type in self.domain_integral_type_map.items():
+            cell = domain.ufl_cell()
+            fiat_cell = as_fiat_cell(cell)
+            integration_dim, _ = lower_integral_type(fiat_cell, integral_type)
+            integration_dims.add(integration_dim)
+        integration_dim, = integration_dims
         return integration_dim
 
     @cached_property
@@ -121,22 +124,20 @@ def use_canonical_quadrature_point_ordering(self):
         # Directly set use_canonical_quadrature_point_ordering = False in context
         # for translation of special nodes, e.g., CellVolume, FacetArea, CellOrigin, and CellVertices,
         # as quadrature point ordering is not relevant for those node types.
-        cell_integral_type_map = {
-            as_fiat_cell(domain.ufl_cell()): integral_type
-            for domain, integral_type in self.domain_integral_type_map.items()
-            if integral_type is not None
-        }
-        if all(integral_type == 'cell' for integral_type in cell_integral_type_map.values()):
+        def _any(cell_type, integral_types):
+            for d, it in self.domain_integral_type_map.items():
+                if it is None:
+                    continue
+                c = as_fiat_cell(d.ufl_cell())
+                if isinstance(c, cell_type) and it in integral_types:
+                    return True
             return False
-        elif all(integral_type in ['exterior_facet', 'interior_facet'] for integral_type in cell_integral_type_map.values()):
-            if all(isinstance(cell, UFCHexahedron) for cell in cell_integral_type_map):
-                return True
-            elif len(set(cell_integral_type_map)) > 1:  # mixed cell types
-                return True
-        elif any(isinstance(cell, UFCHexahedron) for cell in cell_integral_type_map) and \
-                any(isinstance(cell, UFCQuadrilateral) for cell in cell_integral_type_map):
+        if _any(UFCHexahedron, ['exterior_facet', 'interior_facet']):
             return True
-        return False
+        elif _any(UFCQuadrilateral, ['exterior_facet', 'interior_facet']) and _any(UFCSimplex, ['cell', 'exterior_facet', 'interior_facet']):
+            return True
+        else:
+            return False
 
 
 class CellKernelInterface(ProxyKernelInterface):