k

firedrake/pointeval_utils.py

@@ -61,7 +61,7 @@ def compile_element(expression, coordinates, parameters=None):
     f_arg = builder.generate_arg_from_expression(builder.coefficient_map[coefficient])
 
     # TODO: restore this for expression evaluation!
-    # expression = expression.traverse_dag_apply_coefficient_split(builder.coefficient_split, cache={})
+    # expression = apply_coefficient_split(expression, builder.coefficient_split)
 
     # Translate to GEM
     cell = domain.ufl_cell()

tsfc/driver.py

@@ -7,6 +7,7 @@
 import ufl
 from ufl.algorithms import extract_arguments, extract_coefficients
 from ufl.algorithms.analysis import has_type
+from ufl.algorithms.apply_coefficient_split import apply_coefficient_split
 from ufl.classes import Form, GeometricQuantity
 from ufl.domain import extract_unique_domain
 
@@ -225,7 +226,7 @@ def compile_expression_dual_evaluation(expression, to_element, ufl_element, *,
     builder.set_constants(constants)
 
     # Split mixed coefficients
-    expression = expression.traverse_dag_apply_coefficient_split(builder.coefficient_split, cache={})
+    expression = apply_coefficient_split(expression, builder.coefficient_split)
 
     # Set up kernel config for translation of UFL expression to gem
     kernel_cfg = dict(interface=builder,

tsfc/kernel_interface/common.py

@@ -18,6 +18,7 @@
 from finat.element_factory import as_fiat_cell, create_element
 from tsfc.kernel_interface import KernelInterface
 from tsfc.logging import logger
+from ufl.algorithms.apply_coefficient_split import apply_coefficient_split
 from ufl.utils.sequences import max_degree
 
 
@@ -133,7 +134,7 @@ def compile_integrand(self, integrand, params, ctx):
         """
         # Split Coefficients
         if self.coefficient_split:
-            integrand = integrand.traverse_dag_apply_coefficient_split(self.coefficient_split, cache={})
+            integrand = apply_coefficient_split(integrand, self.coefficient_split)
         # Compile: ufl -> gem
         info = self.integral_data_info
         functions = [*info.arguments, self.coordinate(info.domain), *info.coefficients]