ruff

Author: mscroggs

ffcx/codegeneration/C/expressions.py

@@ -106,7 +106,9 @@ def generator(ir, options):
 
     # FIXME: Should be handled differently, revise how
     # ufcx_function_space is generated (also for ufcx_form)
-    for name, (element, dofmap, cmap_family, cmap_degree, value_shape) in ir.function_spaces.items():
+    for name, (
+        element, dofmap, cmap_family, cmap_degree, value_shape,
+    ) in ir.function_spaces.items():
         code += [f"static ufcx_function_space function_space_{name}_{ir.name_from_uflfile} ="]
         code += ["{"]
         code += [f".finite_element = &{element},"]

ffcx/ir/representation.py

@@ -48,7 +48,7 @@ class FormIR(typing.NamedTuple):
     num_constants: int
     name_from_uflfile: str
     function_spaces: dict[str, tuple[str, str, str, int, basix.CellType, basix.LagrangeVariant,
-                           typing.Tuple[int]]]
+                           tuple[int]]]
     original_coefficient_position: list[int]
     coefficient_names: list[str]
     constant_names: list[str]
@@ -174,7 +174,7 @@ class ExpressionIR(typing.NamedTuple):
     constant_names: list[str]
     needs_facet_permutations: bool
     function_spaces: dict[str, tuple[str, str, str, int, basix.CellType, basix.LagrangeVariant,
-                          typing.Tuple[int]]]
+                          tuple[int]]]
     name_from_uflfile: str
     original_coefficient_positions: list[int]
 

test/test_tensor_product.py

@@ -26,18 +26,8 @@ def cell_to_gdim(cell_type):
 def create_tensor_product_element(cell_type, degree, variant, shape=None):
     """Create tensor product element."""
     family = basix.ElementFamily.P
-<<<<<<< HEAD
-    ref = basix.create_element(family, cell_type, degree, variant)
-    factors = ref.get_tensor_product_representation()[0]
-    perm = factors[1]
-    dof_ordering = np.argsort(perm)
-    element = basix.create_element(family, cell_type, degree, variant,
-                                   dof_ordering=dof_ordering)
-    uflelement = basix.ufl._BasixElement(element)
-=======
     element = basix.create_tp_element(family, cell_type, degree, variant)
-    uflelement = basix.ufl.wrap_element(element, gdim=gdim)
->>>>>>> main
+    uflelement = basix.ufl.wrap_element(element)
     if shape is None:
         return uflelement
     else: