Merge branch 'main' into main

Author: uvilla

python/demo/demo_biharmonic.py

@@ -155,9 +155,10 @@
 facets = mesh.locate_entities_boundary(
     msh,
     dim=1,
-    marker=lambda x: np.logical_or.reduce(
-        (np.isclose(x[0], 0.0), np.isclose(x[0], 1.0), np.isclose(x[1], 0.0), np.isclose(x[1], 1.0))
-    ),
+    marker=lambda x: np.isclose(x[0], 0.0)
+    | np.isclose(x[0], 1.0)
+    | np.isclose(x[1], 0.0)
+    | np.isclose(x[1], 1.0),
 )
 
 # We now find the degrees-of-freedom that are associated with the

python/demo/demo_elasticity.py

@@ -146,7 +146,7 @@ def σ(v):
 # a Dirichlet boundary condition object.
 
 facets = locate_entities_boundary(
-    msh, dim=2, marker=lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[1], 1.0))
+    msh, dim=2, marker=lambda x: np.isclose(x[0], 0.0) | np.isclose(x[1], 1.0)
 )
 bc = dirichletbc(
     np.zeros(3, dtype=dtype), locate_dofs_topological(V, entity_dim=2, entities=facets), V=V

python/demo/demo_lagrange_variants.py

@@ -124,7 +124,7 @@
 )
 V = fem.functionspace(msh, ufl_element)
 facets = mesh.locate_entities_boundary(
-    msh, dim=1, marker=lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 2.0))
+    msh, dim=1, marker=lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 2.0)
 )
 dofs = fem.locate_dofs_topological(V=V, entity_dim=1, entities=facets)
 bc = fem.dirichletbc(value=default_scalar_type(0), dofs=dofs, V=V)

python/demo/demo_poisson.py

@@ -111,7 +111,7 @@
 facets = mesh.locate_entities_boundary(
     msh,
     dim=(msh.topology.dim - 1),
-    marker=lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 2.0)),
+    marker=lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 2.0),
 )
 
 # We now find the degrees-of-freedom that are associated with the

python/demo/demo_stokes.py

@@ -120,9 +120,7 @@
 
 # Function to mark x = 0, x = 1 and y = 0
 def noslip_boundary(x):
-    return np.logical_or(
-        np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0)), np.isclose(x[1], 0.0)
-    )
+    return np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0) | np.isclose(x[1], 0.0)
 
 
 # Function to mark the lid (y = 1)

python/demo/demo_types.py

@@ -105,7 +105,7 @@ def poisson(dtype):
         dtype=np.real(dtype(0)).dtype,
     )
     facets = mesh.locate_entities_boundary(
-        msh, dim=1, marker=lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 2.0))
+        msh, dim=1, marker=lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 2.0)
     )
 
     # Define a variational problem.
@@ -167,7 +167,7 @@ def elasticity(dtype) -> fem.Function:
         dtype=np.real(dtype(0)).dtype,
     )
     facets = mesh.locate_entities_boundary(
-        msh, dim=1, marker=lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 2.0))
+        msh, dim=1, marker=lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 2.0)
     )
 
     # Define the variational problem.

python/test/unit/fem/test_assembler.py

@@ -207,9 +207,7 @@ def test_assembly_bcs(mode):
     a = form(inner(u, v) * dx + inner(u, v) * ds)
     L = form(inner(1.0, v) * dx)
 
-    bdofsV = locate_dofs_geometrical(
-        V, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
-    )
+    bdofsV = locate_dofs_geometrical(V, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0))
     bc = dirichletbc(PETSc.ScalarType(1), bdofsV, V)
 
     # Assemble and apply 'global' lifting of bcs
@@ -295,7 +293,7 @@ def test_matrix_assembly_block(mode):
     # Locate facets on boundary
     facetdim = mesh.topology.dim - 1
     bndry_facets = locate_entities_boundary(
-        mesh, facetdim, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
+        mesh, facetdim, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)
     )
     bdofsV1 = locate_dofs_topological(V1, facetdim, bndry_facets)
     u_bc = PETSc.ScalarType(50.0)
@@ -419,7 +417,7 @@ def test_assembly_solve_block(mode):
     # Locate facets on boundary
     facetdim = mesh.topology.dim - 1
     bndry_facets = locate_entities_boundary(
-        mesh, facetdim, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
+        mesh, facetdim, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)
     )
 
     bdofsV0 = locate_dofs_topological(V0, facetdim, bndry_facets)

python/test/unit/fem/test_nonlinear_assembler.py

@@ -83,7 +83,7 @@ def bc_value(x):
 
     facetdim = mesh.topology.dim - 1
     bndry_facets = locate_entities_boundary(
-        mesh, facetdim, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
+        mesh, facetdim, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)
     )
 
     u_bc = Function(V1)
@@ -332,7 +332,7 @@ def initial_guess_p(x):
 
     facetdim = mesh.topology.dim - 1
     bndry_facets = locate_entities_boundary(
-        mesh, facetdim, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
+        mesh, facetdim, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)
     )
 
     u_bc0 = Function(V0)

python/test/unit/mesh/test_mesh.py

@@ -485,17 +485,17 @@ def test_unit_hex_mesh_assemble():
 
 
 def boundary_0(x):
-    lr = np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
-    tb = np.logical_or(np.isclose(x[1], 0.0), np.isclose(x[1], 1.0))
-    return np.logical_or(lr, tb)
+    lr = np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)
+    tb = np.isclose(x[1], 0.0) | np.isclose(x[1], 1.0)
+    return lr | tb
 
 
 def boundary_1(x):
-    return np.logical_or(np.isclose(x[0], 1.0), np.isclose(x[1], 1.0))
+    return np.isclose(x[0], 1.0) | np.isclose(x[1], 1.0)
 
 
 def boundary_2(x):
-    return np.logical_and(np.isclose(x[1], 1), x[0] >= 0.5)
+    return np.isclose(x[1], 1) & (x[0] >= 0.5)
 
 
 # TODO Test that submesh of full mesh is a copy of the mesh

python/test/unit/mesh/test_refinement.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 import pytest
-from numpy import isclose, logical_and
+from numpy import isclose
 
 import ufl
 from dolfinx.fem import assemble_matrix, form, functionspace
@@ -98,7 +98,7 @@ def test_sub_refine():
     mesh.topology.create_entities(1)
 
     def left_corner_edge(x, tol=1e-7):
-        return logical_and(isclose(x[0], 0), x[1] < 1 / 4 + tol)
+        return isclose(x[0], 0) & (x[1] < 1 / 4 + tol)
 
     edges = locate_entities_boundary(mesh, 1, left_corner_edge)
     if MPI.COMM_WORLD.size == 0:

python/test/unit/nls/test_newton.py

@@ -103,9 +103,7 @@ def test_linear_pde():
 
     bc = dirichletbc(
         PETSc.ScalarType(1.0),
-        locate_dofs_geometrical(
-            V, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
-        ),
+        locate_dofs_geometrical(V, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)),
         V,
     )
 
@@ -144,9 +142,7 @@ def test_nonlinear_pde():
 
     bc = dirichletbc(
         PETSc.ScalarType(1.0),
-        locate_dofs_geometrical(
-            V, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
-        ),
+        locate_dofs_geometrical(V, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)),
         V,
     )
 
@@ -184,9 +180,7 @@ def test_nonlinear_pde_snes():
     u_bc.x.array[:] = 1.0
     bc = dirichletbc(
         u_bc,
-        locate_dofs_geometrical(
-            V, lambda x: np.logical_or(np.isclose(x[0], 0.0), np.isclose(x[0], 1.0))
-        ),
+        locate_dofs_geometrical(V, lambda x: np.isclose(x[0], 0.0) | np.isclose(x[0], 1.0)),
     )
 
     # Create nonlinear problem