More fixes for dev.

demo/demo_reissner-mindlin-clamped-tdnns.py

@@ -39,12 +39,13 @@
 # +
 import numpy as np
 
+from basix.ufl import element, mixed_element
 import dolfinx
 import ufl
-from dolfinx.fem import Function, FunctionSpace, dirichletbc
+from dolfinx.fem import Function, functionspace, dirichletbc
 from dolfinx.fem.petsc import LinearProblem
 from dolfinx.mesh import CellType, create_unit_square
-from ufl import (FacetNormal, FiniteElement, Identity, Measure, MixedElement,
+from ufl import (FacetNormal, Identity, Measure,
                  grad, inner, split, sym, tr)
 
 from mpi4py import MPI
@@ -74,9 +75,10 @@
 
 # +
 k = 3
-U_el = MixedElement([FiniteElement("N2curl", ufl.triangle, k), FiniteElement("Lagrange", ufl.triangle, k + 1),
-                     FiniteElement("HHJ", ufl.triangle, k)])
-U = FunctionSpace(mesh, U_el)
+cell = mesh.basix_cell()
+U_el = mixed_element([element("N2curl", cell, k), element("Lagrange", cell, k + 1),
+                      element("HHJ", cell, k)])
+U = functionspace(mesh, U_el)
 
 u = ufl.TrialFunction(U)
 u_t = ufl.TestFunction(U)

demo/demo_reissner-mindlin-clamped.py

@@ -29,14 +29,14 @@
 
 import numpy as np
 
+from basix.ufl import element, mixed_element
 import dolfinx
 import ufl
-from dolfinx.fem import Function, FunctionSpace, dirichletbc
+from dolfinx.fem import Function, functionspace, dirichletbc
 from dolfinx.fem.petsc import LinearProblem
 from dolfinx.io.utils import XDMFFile
 from dolfinx.mesh import CellType, create_unit_square
-from ufl import (FiniteElement, MixedElement, VectorElement, dx, grad, inner,
-                 split, sym, tr)
+from ufl import (dx, grad, inner, split, sym, tr)
 
 from mpi4py import MPI
 
@@ -64,9 +64,10 @@
 # The final element definition is
 
 # +
-U_el = MixedElement([VectorElement("Lagrange", ufl.triangle, 2), FiniteElement("Lagrange", ufl.triangle, 1),
-                     FiniteElement("N1curl", ufl.triangle, 1), FiniteElement("N1curl", ufl.triangle, 1)])
-U = FunctionSpace(mesh, U_el)
+cell = mesh.basix_cell()
+U_el = mixed_element([element("Lagrange", cell, 2, shape=(2,)), element("Lagrange", cell, 1),
+                     element("N1curl", cell, 1), element("N1curl", cell, 1)])
+U = functionspace(mesh, U_el)
 
 u_ = Function(U)
 u = ufl.TrialFunction(U)

demo/demo_reissner-mindlin-simply-supported.py

@@ -29,13 +29,13 @@
 
 import numpy as np
 
+from basix.ufl import element, mixed_element
 import dolfinx
 import ufl
-from dolfinx.fem import Function, FunctionSpace, dirichletbc
+from dolfinx.fem import Function, functionspace, dirichletbc
 from dolfinx.fem.petsc import LinearProblem
 from dolfinx.mesh import CellType, create_unit_square
-from ufl import (FiniteElement, MixedElement, VectorElement, dx, grad, inner,
-                 split, sym, tr)
+from ufl import (dx, grad, inner, split, sym, tr)
 
 from mpi4py import MPI
 
@@ -63,9 +63,10 @@
 # The final element definition is
 
 # +
-U_el = MixedElement([VectorElement("Lagrange", ufl.quadrilateral, 1), FiniteElement("Lagrange", ufl.quadrilateral, 1),
-                     FiniteElement("RTCE", ufl.quadrilateral, 1), FiniteElement("RTCE", ufl.quadrilateral, 1)])
-U = FunctionSpace(mesh, U_el)
+cell = mesh.basix_cell()
+U_el = mixed_element([element("Lagrange", cell, 1, shape=(2,), element("Lagrange", cell, 1),
+                      element("RTCE", cell, 1), element("RTCE", cell, 1)])
+U = functionspace(mesh, U_el)
 
 u_ = Function(U)
 u = ufl.TrialFunction(U)