merge conflict

Author: pbrubeck

FIAT/expansions.py

@@ -640,9 +640,10 @@ def get_affine_mapping(xs, ys):
 def polynomial_dimension(ref_el, n, continuity=None):
     """Returns the dimension of the space of polynomials of degree no
     greater than n on the reference complex."""
-    if ref_el.get_spatial_dimension() == 0:
+    if ref_el.shape == reference_element.POINT:
         if n > 0:
             raise ValueError("Only degree zero polynomials supported on point elements.")
+        # Ignore continuity on a vertex-only complex
         continuity = None
     top = ref_el.get_topology()
 

finat/element_factory.py

@@ -163,15 +163,15 @@ def convert_finiteelement(element, **kwargs):
         codim = 1 if element.family() == "Boundary Quadrature" else 0
         return finat.make_quadrature_element(cell, degree, scheme, codim), set()
 
+    make_finat_element = supported_elements[element.family()]
     if element.cell.cellname in {"quadrilateral", "hexahedron"}:
         # Reconstruct Real and Bernstein on tensor product cells
         if element.family() == "Real":
             make_finat_element = None
             element = finat.ufl.FiniteElement("DQ", element.cell, 0)
-        elif element.family() == "Bernstein":
+        elif element.family() in {"Bernstein", "HDiv Trace"}:
             make_finat_element = None
 
-    make_finat_element = supported_elements[element.family()]
     if make_finat_element is None:
         # Handle quadrilateral short names like RTCE/F and NCE/F.
         try:

finat/ufl/finiteelement.py

@@ -96,13 +96,13 @@ def __new__(cls,
                                        HCurl(TensorProductElement(Qd_elt, Ic_elt, cell=cell)))
 
             elif family == "HDiv Trace":
-                cell_h, cell_v = cell.sub_cells()
+                cell_h, cell_v = cell.sub_cells
                 if not isinstance(degree, tuple):
                     degree = (degree, degree)
                 hdegree, vdegree = degree
 
-                dg_family = lambda cell: "DG" if cell.is_simplex() else "DQ"
-                is_interval = lambda cell: cell.cellname() == "interval"
+                dg_family = lambda cell: "DG" if cell.is_simplex else "DQ"
+                is_interval = lambda cell: cell.cellname == "interval"
 
                 dg_h = FiniteElement(dg_family(cell_h), cell_h, hdegree, variant=variant)
                 tr_h = FiniteElement("HDiv Trace", cell_h, 0 if is_interval(cell_h) else hdegree, variant=variant)

finat/ufl/hdivcurl.py

@@ -105,7 +105,7 @@ class HDivElement(WrapperElementBase):
     __slots__ = ("_element", )
 
     def __init__(self, element):
-        reference_value_shape = (element.cell.topological_dimension(),)
+        reference_value_shape = (element.cell.topological_dimension,)
         super().__init__(element, reference_value_shape, HDiv, "contravariant Piola")
 
 
@@ -115,7 +115,7 @@ class HCurlElement(WrapperElementBase):
 
     def __init__(self, element):
         """Doc."""
-        reference_value_shape = (element.cell.topological_dimension(),)
+        reference_value_shape = (element.cell.topological_dimension,)
         super().__init__(element, reference_value_shape, HCurl, "covariant Piola")
 
 
@@ -149,7 +149,7 @@ def __repr__(self):
 
     def value_shape(self, domain):
         """Doc."""
-        gdim = domain.geometric_dimension()
+        gdim = domain.geometric_dimension
         mapping = self.mapping()
         if mapping in {"covariant Piola", "contravariant Piola"}:
             return (gdim,)