Merge branch 'main' into pbrubeck/fix/constant-value

firedrakeproject · Jul 17, 2024 · 14a25e9 · 14a25e9
2 parents 1905eaa + e69de17
commit 14a25e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/test/test_external_operator.py b/test/test_external_operator.py
@@ -275,7 +275,6 @@ def test_adjoint_action_jacobian(V1, V2, V3):
 
     # N(u, m; v*)
     N = ExternalOperator(u, m, function_space=V3)
-    (vstar_N,) = N.arguments()
 
     # Arguments for the Gateaux-derivative
     def u_hat(number):

diff --git a/ufl/algorithms/apply_geometry_lowering.py b/ufl/algorithms/apply_geometry_lowering.py
@@ -304,7 +304,7 @@ def _reduce_cell_edge_length(self, o, reduction_op):
 
         domain = extract_unique_domain(o)
 
-        if domain.ufl_coordinate_element().embedded_superdegree > 1:
+        if domain.ufl_coordinate_element().embedded_subdegree > 1:
             # Don't lower bendy cells, instead leave it to form compiler
             warnings.warn("Only know how to compute cell edge lengths of P1 or Q1 cell.")
             return o
@@ -329,7 +329,7 @@ def cell_diameter(self, o):
 
         domain = extract_unique_domain(o)
 
-        if domain.ufl_coordinate_element().embedded_superdegree > 1:
+        if domain.ufl_coordinate_element().embedded_subdegree > 1:
             # Don't lower bendy cells, instead leave it to form compiler
             warnings.warn("Only know how to compute cell diameter of P1 or Q1 cell.")
             return o
@@ -366,7 +366,7 @@ def _reduce_facet_edge_length(self, o, reduction_op):
         if domain.ufl_cell().topological_dimension() < 3:
             raise ValueError("Facet edge lengths only make sense for topological dimension >= 3.")
 
-        elif domain.ufl_coordinate_element().embedded_superdegree > 1:
+        elif domain.ufl_coordinate_element().embedded_subdegree > 1:
             # Don't lower bendy cells, instead leave it to form compiler
             warnings.warn("Only know how to compute facet edge lengths of P1 or Q1 cell.")
             return o