From f446dc2e48613e3c02c4c8015e1ce56353077362 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Tue, 8 Aug 2017 15:17:11 +0200
Subject: [PATCH] Rewrite linear acoustics a small bit
---
test/hyperbolic/linearacoustics.ufl | 12 +++++++-----
test/sumfact/hyperbolic/linearacoustics.ufl | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/test/hyperbolic/linearacoustics.ufl b/test/hyperbolic/linearacoustics.ufl
index 3a310abd..8b9d48c4 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 3a310abd..8b9d48c4 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
--
GitLab