From 546a10a74e39d9938f80777b37ede838a0fd9dd1 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Thu, 3 Aug 2017 15:06:04 +0200
Subject: [PATCH] Port all the tests I forgot
---
test/heatequation/heatequation_dg.ufl | 2 +-
.../dimension-grid-variations/poisson_1d_cg_interval.mini | 2 --
.../dimension-grid-variations/poisson_1d_cg_interval.ufl | 5 ++++-
.../dimension-grid-variations/poisson_1d_dg_interval.mini | 2 --
.../dimension-grid-variations/poisson_1d_dg_interval.ufl | 1 +
.../poisson_2d_cg_quadrilateral.mini | 1 -
.../poisson_2d_cg_quadrilateral.ufl | 5 ++++-
.../dimension-grid-variations/poisson_2d_cg_triangle.mini | 2 --
.../dimension-grid-variations/poisson_2d_cg_triangle.ufl | 7 +++++--
.../poisson_2d_dg_quadrilateral.mini | 2 --
.../poisson_2d_dg_quadrilateral.ufl | 1 +
.../dimension-grid-variations/poisson_2d_dg_triangle.mini | 2 --
.../dimension-grid-variations/poisson_2d_dg_triangle.ufl | 1 +
.../poisson_3d_cg_hexahedron.mini | 2 --
.../dimension-grid-variations/poisson_3d_cg_hexahedron.ufl | 7 +++++--
.../poisson_3d_cg_tetrahedron.mini | 2 --
.../poisson_3d_cg_tetrahedron.ufl | 7 +++++--
.../poisson_3d_dg_hexahedron.mini | 2 --
.../dimension-grid-variations/poisson_3d_dg_hexahedron.ufl | 1 +
.../poisson_3d_dg_tetrahedron.mini | 2 --
.../poisson_3d_dg_tetrahedron.ufl | 1 +
21 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/test/heatequation/heatequation_dg.ufl b/test/heatequation/heatequation_dg.ufl
index 649c4db4..d6eb5141 100644
--- a/test/heatequation/heatequation_dg.ufl
+++ b/test/heatequation/heatequation_dg.ufl
@@ -2,7 +2,7 @@ f = Expression("Dune::FieldVector<double,2> c(0.5); c-= x; return 4.*(1.-c.two_n
g = Expression("Dune::FieldVector<double,2> c(0.5); c-= x; return std::exp(-1.*c.two_norm2());", on_intersection=True)
cell = triangle
-V = FiniteElement("DG", cell, 1, dirichlet_expression=g)
+V = FiniteElement("DG", cell, 1)
u = TrialFunction(V)
v = TestFunction(V)
diff --git a/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.mini b/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.mini
index 58e6f2fb..5bafa51f 100644
--- a/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.mini
+++ b/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.mini
@@ -8,6 +8,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-14
compare_l2errorsquared = 5e-8
diff --git a/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.ufl b/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.ufl
index d2b91341..5eefb2d7 100644
--- a/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_1d_cg_interval.ufl
@@ -5,8 +5,11 @@ c = (0.5-x[0])**2
g = exp(-1.*c)
f = 2*(1.-2*c)*g
-V = FiniteElement("CG", cell, 1, dirichlet_expression=g)
+V = FiniteElement("CG", cell, 1)
u = TrialFunction(V)
v = TestFunction(V)
forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+exact_solution = g
+is_dirichlet = 1
+dirichlet_expression = g
diff --git a/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.mini b/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.mini
index f29c5712..14789fb8 100644
--- a/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.mini
+++ b/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.mini
@@ -8,6 +8,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-2
compare_l2errorsquared = 6e-7
diff --git a/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl b/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl
index 27b51cc4..535d1024 100644
--- a/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_1d_dg_interval.ufl
@@ -30,3 +30,4 @@ r = inner(grad(u), grad(v))*dx \
- gamma*g*v*ds
forms = [r]
+exact_solution = g
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini
index 4bb79565..c5ec6e72 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini
+++ b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini
@@ -8,5 +8,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
compare_l2errorsquared = 9e-8
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.ufl b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.ufl
index 74d3f2b1..d3771aac 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.ufl
@@ -5,8 +5,11 @@ c = (0.5-x[0])**2 + (0.5-x[1])**2
g = exp(-1.*c)
f = 2*(2.-2*c)*g
-V = FiniteElement("CG", cell, 1, dirichlet_expression=g)
+V = FiniteElement("CG", cell, 1)
u = TrialFunction(V)
v = TestFunction(V)
forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+exact_solution = g
+is_dirichlet = 1
+dirichlet_expression = g
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.mini b/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.mini
index 7e106082..4231151b 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.mini
+++ b/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.mini
@@ -10,6 +10,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-14
compare_l2errorsquared = 3e-7
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.ufl b/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.ufl
index 2bc0536e..e95064df 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_2d_cg_triangle.ufl
@@ -4,8 +4,11 @@ x = SpatialCoordinate(cell)
f = -4.
g = x[0]*x[0] + x[1]*x[1]
-V = FiniteElement("CG", "triangle", 1, dirichlet_expression=g)
+V = FiniteElement("CG", "triangle", 1)
u = TrialFunction(V)
v = TestFunction(V)
-forms = [(inner(grad(u), grad(v)) - f*v)*dx]
\ No newline at end of file
+forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+exact_solution = g
+is_dirichlet = 1
+dirichlet_expression = g
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini
index 6f715e33..cce6d681 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini
@@ -8,6 +8,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-1
compare_l2errorsquared = 6e-7
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl
index 2ed2a867..84019c1e 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.ufl
@@ -30,3 +30,4 @@ r = inner(grad(u), grad(v))*dx \
- gamma*g*v*ds
forms = [r]
+exact_solution = g
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.mini b/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.mini
index 8baa9181..ec7396c3 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.mini
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.mini
@@ -10,6 +10,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-1
compare_l2errorsquared = 5e-7
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl b/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl
index 58be5d11..d518b118 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_triangle.ufl
@@ -29,3 +29,4 @@ r = inner(grad(u), grad(v))*dx \
- gamma*g*v*ds
forms = [r]
+exact_solution = g
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini
index ca5770a7..1d4c4e96 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini
+++ b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini
@@ -8,6 +8,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-14
compare_l2errorsquared = 9e-5
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.ufl b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.ufl
index e9ff908e..93e880da 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.ufl
@@ -4,8 +4,11 @@ x = SpatialCoordinate(cell)
f = -6.
g = x[0]*x[0] + x[1]*x[1] + x[2]*x[2]
-V = FiniteElement("CG", cell, 1, dirichlet_expression=g)
+V = FiniteElement("CG", cell, 1)
u = TrialFunction(V)
v = TestFunction(V)
-forms = [(inner(grad(u), grad(v)) - f*v)*dx]
\ No newline at end of file
+forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+exact_solution = g
+is_dirichlet = 1
+dirichlet_expression = g
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.mini b/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.mini
index 178cd983..6e6e4f67 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.mini
+++ b/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.mini
@@ -10,6 +10,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-14
compare_l2errorsquared = 1e-4
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.ufl b/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.ufl
index 27ee0fd5..61ebabe8 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_3d_cg_tetrahedron.ufl
@@ -4,8 +4,11 @@ x = SpatialCoordinate(cell)
f = -6.
g = x[0]*x[0] + x[1]*x[1] + x[2]*x[2]
-V = FiniteElement("CG", "tetrahedron", 1, dirichlet_expression=g)
+V = FiniteElement("CG", "tetrahedron", 1)
u = TrialFunction(V)
v = TestFunction(V)
-forms = [(inner(grad(u), grad(v)) - f*v)*dx]
\ No newline at end of file
+forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+exact_solution = g
+is_dirichlet = 1
+dirichlet_expression = g
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini
index a3eb3b37..14429885 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini
@@ -8,6 +8,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1
compare_l2errorsquared = 1e-4
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl
index 59b1d023..8abb5fb0 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.ufl
@@ -30,3 +30,4 @@ r = inner(grad(u), grad(v))*dx \
- gamma*g*v*ds
forms = [r]
+exact_solution = g
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.mini b/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.mini
index b885d1fe..1a03b30b 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.mini
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.mini
@@ -10,6 +10,4 @@ name = {__name}
extension = vtu
[formcompiler]
-exact_solution_expression = g
-compare_dofs = 1e-2
compare_l2errorsquared = 3e-5
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl b/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl
index 9c4b4540..384d582e 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_tetrahedron.ufl
@@ -29,3 +29,4 @@ r = inner(grad(u), grad(v))*dx \
- gamma*g*v*ds
forms = [r]
+exact_solution = g
--
GitLab