diff --git a/test/hyperbolic/linearacoustics.ufl b/test/hyperbolic/linearacoustics.ufl index 3a310abd7a338e3b0cd615a2f07b3c0846d2cff4..8b9d48c4433f72395c054c88ea6c4eaeedb9fcb0 100644 --- a/test/hyperbolic/linearacoustics.ufl +++ b/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 diff --git a/test/sumfact/hyperbolic/linearacoustics.ufl b/test/sumfact/hyperbolic/linearacoustics.ufl index 3a310abd7a338e3b0cd615a2f07b3c0846d2cff4..8b9d48c4433f72395c054c88ea6c4eaeedb9fcb0 100644 --- a/test/sumfact/hyperbolic/linearacoustics.ufl +++ b/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