Fix quadrature rule

Author: srosenbu

src/fenicsxconcrete/sensor_definition/stress_sensor.py

@@ -3,9 +3,8 @@
 import os
 from typing import TYPE_CHECKING
 
-import numpy as np
 import dolfinx as df
-import ufl
+import numpy as np
 
 if TYPE_CHECKING:
     from fenicsxconcrete.finite_element_problem.base_material import MaterialProblem
@@ -43,17 +42,28 @@ def measure(self, problem: MaterialProblem) -> None:
             stress_tensor_dim = problem.experiment.mesh.topology.dim
             stress_function = project(
                 stress,  # stress fct from problem
-                df.fem.functionspace(problem.experiment.mesh, (problem.q_fields.plot_space_type[0], problem.q_fields.plot_space_type[1], (stress_tensor_dim,stress_tensor_dim))),  # tensor space
+                df.fem.functionspace(
+                    problem.experiment.mesh,
+                    (
+                        problem.q_fields.plot_space_type[0],
+                        problem.q_fields.plot_space_type[1],
+                        (stress_tensor_dim, stress_tensor_dim),
+                    ),
+                ),  # tensor space
                 problem.q_fields.measure,
             )
         elif mandel_stress is not None:
             stress_function = project(
                 mandel_stress,  # stress fct from problem
                 df.fem.functionspace(
-                    problem.experiment.mesh, (problem.q_fields.plot_space_type[0], problem.q_fields.plot_space_type[1], (problem.mandel_stress_dim,))
-                ),  # vector space
-                ufl.dx, #TODO: check consistency!
-                #problem.q_fields.measure,
+                    problem.experiment.mesh,
+                    (
+                        problem.q_fields.plot_space_type[0],
+                        problem.q_fields.plot_space_type[1],
+                        (problem.mandel_stress_dim,),
+                    ),
+                ),
+                problem.q_fields.measure,
             )
         else:
             raise Exception("Stress and Mandel stress not defined in problem")

src/fenicsxconcrete/util/quadrature.py

@@ -40,12 +40,9 @@ def __init__(
         self.degree = degree
         basix_cell = _ufl_cell_type_to_basix(self.cell_type)
         self.points, self.weights = basix.make_quadrature(basix_cell, self.degree, rule=self.type)
-        self.dx = ufl.dx(
-            metadata={
-                "quadrature_rule": self.type,
-                "quadrature_degree": self.degree,
-            }
-        )
+
+        metadata = {"quadrature_degree": self.degree, "quadrature_scheme": self.type.name}
+        self.dx = ufl.dx(metadata=metadata)
 
     def create_quadrature_space(self, mesh: df.mesh.Mesh) -> df.fem.functionspace:
         """
@@ -56,13 +53,9 @@ def create_quadrature_space(self, mesh: df.mesh.Mesh) -> df.fem.functionspace:
             A scalar quadrature `FunctionSpace` on `mesh`.
         """
         assert mesh.ufl_cell() == self.cell_type
-        Qe = basix.ufl.quadrature_element(mesh.topology.cell_name(), value_shape=(), degree=self.degree)
-        # Qe = ufl.FiniteElement(
-        #     "Quadrature",
-        #     self.cell_type,
-        #     self.degree,
-        #     quad_scheme=self.type.name,
-        # )
+        Qe = basix.ufl.quadrature_element(
+            mesh.topology.cell_name(), value_shape=(), degree=self.degree, scheme=self.type.name
+        )
 
         return df.fem.functionspace(mesh, Qe)
 
@@ -76,14 +69,10 @@ def create_quadrature_vector_space(self, mesh: df.mesh.Mesh, dim: int) -> df.fem
             A vector valued quadrature `FunctionSpace` on `mesh`.
         """
         assert mesh.ufl_cell() == self.cell_type
-        # Qe = ufl.VectorElement(
-        #     "Quadrature",
-        #     self.cell_type,
-        #     self.degree,
-        #     quad_scheme=self.type.name,
-        #     dim=dim,
-        # )
-        Qe = basix.ufl.quadrature_element(mesh.topology.cell_name(), value_shape=(dim,), degree=self.degree)
+
+        Qe = basix.ufl.quadrature_element(
+            mesh.topology.cell_name(), value_shape=(dim,), degree=self.degree, scheme=self.type.name
+        )
 
         return df.fem.functionspace(mesh, Qe)
 
@@ -97,14 +86,10 @@ def create_quadrature_tensor_space(self, mesh: df.mesh.Mesh, shape: tuple[int, i
             A tensor valued quadrature `FunctionSpace` on `mesh`.
         """
         assert mesh.ufl_cell() == self.cell_type
-        # Qe = ufl.TensorElement(
-        #     "Quadrature",
-        #     self.cell_type,
-        #     self.degree,
-        #     quad_scheme=self.type.name,
-        #     shape=shape,
-        # )
-        Qe = basix.ufl.quadrature_element(mesh.topology.cell_name(), value_shape=shape, degree=self.degree)
+
+        Qe = basix.ufl.quadrature_element(
+            mesh.topology.cell_name(), value_shape=shape, degree=self.degree, scheme=self.type.name
+        )
 
         return df.fem.functionspace(mesh, Qe)