Compile expressions ahead of forms + fix coefficient assignment

Author: jorgensd

ffcx/codegeneration/codegeneration.py

@@ -32,9 +32,9 @@ class CodeBlocks(typing.NamedTuple):
     """
 
     file_pre: list[tuple[str, str]]
+    expressions: list[tuple[str, str]]
     integrals: list[tuple[str, str]]
     forms: list[tuple[str, str]]
-    expressions: list[tuple[str, str]]
     file_post: list[tuple[str, str]]
 
 

ffcx/codegeneration/integral_generator.py

@@ -340,7 +340,7 @@ def generate_proxy_coefficient_packing(self):
             # Pack coefficiets into contiguous array for expression evaluation
             coeff_loops = []
             for j in range(len(active_coefficients)):
-               coeff_loops.append(L.ForRange(pi, 0, sub_coefficient_sizes[j], [L.Assign(sub_coeff[pi], pw[sub_coefficient_offsets[j] + pi])]))
+               coeff_loops.append(L.ForRange(pi, 0, sub_coefficient_sizes[j], [L.Assign(sub_coeff[pi], self.backend.symbols.coefficients[sub_coefficient_offsets[j] + pi])]))
 
             pz_at_itg_points = L.Symbol(f"proxy_coefficient_at_itg_points_{i}", dtype=L.DataType.SCALAR)
             proxy_coefficient = L.ArrayDecl(pz_at_itg_points,sizes=int(np.prod(self.ir.proxy_pack_shape[i])))