Rewrite linear acoustics a small bit

test/hyperbolic/linearacoustics.ufl

@@ -12,17 +12,19 @@ n = FacetNormal(cell)('+')
 u = TrialFunction(MV)
 v = TestFunction(MV)
 
+rho, q0, q1 = split(u)
+
 mass = inner(u, v)*dx
 
-def flux(s):
-    rho, q0, q1 = split(s)
-    return as_matrix([[q0, q1], [rho, 0.], [0., rho]])
+flux = as_matrix([[q0,  q1],
+                  [rho, 0.],
+                  [0., rho]])
 
 # Define numerical fluxes to choose from
-llf_flux = dot(avg(flux(u)), n) - 0.5*jump(u)
+llf_flux = dot(avg(flux), n) - 0.5*jump(u)
 numerical_flux = llf_flux
 
-r = -1. * inner(flux(u), grad(v))*dx \
+r = -1. * inner(flux, grad(v))*dx \
   - inner(numerical_flux, jump(v))*dS \
   + inner(u, v)*ds
 

test/sumfact/hyperbolic/linearacoustics.ufl

@@ -12,17 +12,19 @@ n = FacetNormal(cell)('+')
 u = TrialFunction(MV)
 v = TestFunction(MV)
 
+rho, q0, q1 = split(u)
+
 mass = inner(u, v)*dx
 
-def flux(s):
-    rho, q0, q1 = split(s)
-    return as_matrix([[q0, q1], [rho, 0.], [0., rho]])
+flux = as_matrix([[q0,  q1],
+                  [rho, 0.],
+                  [0., rho]])
 
 # Define numerical fluxes to choose from
-llf_flux = dot(avg(flux(u)), n) - 0.5*jump(u)
+llf_flux = dot(avg(flux), n) - 0.5*jump(u)
 numerical_flux = llf_flux
 
-r = -1. * inner(flux(u), grad(v))*dx \
+r = -1. * inner(flux, grad(v))*dx \
   - inner(numerical_flux, jump(v))*dS \
   + inner(u, v)*ds