Add Sobolev spaces to custom element

.github/workflows/dolfin-tests.yml

@@ -50,7 +50,7 @@ jobs:
         if: github.event_name != 'workflow_dispatch'
         run: |
           python3 -m pip install git+https://github.com/FEniCS/ufl.git
-          python3 -m pip install git+https://github.com/FEniCS/basix.git
+          python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/sobolev_spaces
       - name: Install UFL and Basix (specified branches/tags)
         if: github.event_name == 'workflow_dispatch'
         run: |
@@ -67,6 +67,7 @@ jobs:
         with:
           path: ./dolfinx
           repository: FEniCS/dolfinx
+          ref: mscroggs/sobolev_spaces
       - name: Get DOLFINx source (specified branch/tag)
         if: github.event_name == 'workflow_dispatch'
         uses: actions/checkout@v2

.github/workflows/pythonapp.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Install FEniCS dependencies (Python)
         run: |
           python -m pip install git+https://github.com/FEniCS/ufl.git
-          python -m pip install git+https://github.com/FEniCS/basix.git
+          python -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/sobolev_spaces
 
       - name: Install FFCx
         run: |

ffcx/codegeneration/basix_custom_element_template.py

@@ -26,6 +26,7 @@
   .x = {x},
   .M = {M},
   .map_type = {map_type},
+  .sobolev_space = {sobolev_space},
   .discontinuous = {discontinuous},
   .highest_complete_degree = {highest_complete_degree},
   .interpolation_nderivs = {interpolation_nderivs},

ffcx/codegeneration/finite_element.py

@@ -120,6 +120,7 @@ def generate_custom_element(name, ir):
     d["factory_name"] = name
     d["cell_type"] = int(ir.cell_type)
     d["map_type"] = int(ir.map_type)
+    d["sobolev_space"] = int(ir.sobolev_space)
     d["highest_complete_degree"] = ir.highest_complete_degree
     d["highest_degree"] = ir.highest_degree
     d["discontinuous"] = "true" if ir.discontinuous else "false"

ffcx/codegeneration/ufcx.h

@@ -186,6 +186,9 @@ extern "C"
     /// The map type for the element
     int map_type;
 
+    /// The Sobolev space for the element
+    int sobolev_space;
+
     /// Indicates whether or not this is the discontinuous version of the element
     bool discontinuous;
 

ffcx/element_interface.py

@@ -126,9 +126,9 @@ def __init__(self, element: ufl.finiteelement.FiniteElementBase):
             f"QuadratureElement({element})", "quadrature element", element.cell().cellname(), element.value_shape(),
             element.degree())
 
-    def sobolev_space(self):
+    def basix_sobolev_space(self):
         """Return the underlying Sobolev space."""
-        return ufl.sobolevspace.L2
+        return basix.sobolev_spaces.L2
 
     def __eq__(self, other) -> bool:
         """Check if two elements are equal."""
@@ -257,6 +257,11 @@ def discontinuous(self) -> bool:
         """True if the discontinuous version of the element is used."""
         return False
 
+    @property
+    def map_type(self) -> basix.MapType:
+        """The Basix map type."""
+        return basix.MapType.identity
+
 
 class RealElement(basix.ufl_wrapper._BasixElementBase):
     """A real element."""
@@ -408,6 +413,11 @@ def discontinuous(self) -> bool:
         """True if the discontinuous version of the element is used."""
         return False
 
-    def sobolev_space(self):
+    def basix_sobolev_space(self):
         """Return the underlying Sobolev space."""
-        return ufl.sobolevspace.Hinf
+        return basix.sobolev_spaces.Hinf
+
+    @property
+    def map_type(self) -> basix.MapType:
+        """The Basix map type."""
+        return basix.MapType.identity

ffcx/ir/representation.py

@@ -63,6 +63,7 @@ class CustomElementIR(typing.NamedTuple):
     x: typing.List[typing.List[numpy.typing.NDArray[numpy.float64]]]
     M: typing.List[typing.List[numpy.typing.NDArray[numpy.float64]]]
     map_type: basix.MapType
+    sobolev_space: basix.SobolevSpace
     interpolation_nderivs: int
     discontinuous: bool
     highest_complete_degree: int
@@ -274,6 +275,7 @@ def _compute_custom_element_ir(basix_element: basix.finite_element.FiniteElement
     ir["x"] = basix_element.x
     ir["M"] = basix_element.M
     ir["map_type"] = basix_element.map_type
+    ir["sobolev_space"] = basix_element.sobolev_space
     ir["discontinuous"] = basix_element.discontinuous
     ir["interpolation_nderivs"] = basix_element.interpolation_nderivs
     ir["highest_complete_degree"] = basix_element.highest_complete_degree