Working vexcl integrator for 2pf, including full u2-tensor; still lacks initial conditions. Revamped macro substitution to fix bugs with summation convention.