From 2eb84f3a86f1276f2f3680336cfe1d666595d5a3 Mon Sep 17 00:00:00 2001 From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de> Date: Mon, 10 Dec 2018 16:19:43 +0100 Subject: [PATCH] Move gemoetry mixin options into form section --- test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini | 3 ++- test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini | 3 ++- .../poisson_2d_cg_quadrilateral.mini | 2 ++ .../poisson_2d_dg_quadrilateral.mini | 2 ++ .../dimension-grid-variations/poisson_3d_cg_hexahedron.mini | 2 ++ .../dimension-grid-variations/poisson_3d_dg_hexahedron.mini | 2 ++ test/poisson/poisson_dg_tensor.mini | 4 ++-- test/stokes/stokes_3d_dg_quadrilateral.mini | 2 +- test/stokes/stokes_3d_quadrilateral.mini | 2 +- test/stokes/stokes_dg_quadrilateral.mini | 2 +- test/stokes/stokes_quadrilateral.mini | 2 +- 11 files changed, 18 insertions(+), 8 deletions(-) diff --git a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini index 460c5c14..787b3408 100644 --- a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini +++ b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini @@ -23,13 +23,14 @@ l2error_tree_path = 1, 1, 0 explicit_time_stepping = 0 yaspgrid_offset = 1 overlapping = 1 -geometry_mixins = equidistant [formcompiler.mass] numerical_jacobian = 0, 1 | expand num +geometry_mixins = equidistant [formcompiler.r] numerical_jacobian = 0, 1 | expand num +geometry_mixins = equidistant [instat] T = 1e-2 diff --git a/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini index 968e9894..c0bf23ea 100644 --- a/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini +++ b/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini @@ -18,13 +18,14 @@ compare_l2errorsquared = 5e-4 # Only calculate error for the velocity part l2error_tree_path = 1, 1, 1, 0 operators = mass, r -geometry_mixins = equidistant [formcompiler.mass] numerical_jacobian = 0, 1 | expand num +geometry_mixins = equidistant [formcompiler.r] numerical_jacobian = 0, 1 | expand num +geometry_mixins = equidistant [instat] T = 5e-2 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 2bdf9174..7cc6619b 100644 --- a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini +++ b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini @@ -9,4 +9,6 @@ extension = vtu [formcompiler] compare_l2errorsquared = 9e-8 + +[formcompiler.r] geometry_mixins = equidistant 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 6b4182ce..a4478b53 100644 --- a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini +++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini @@ -9,4 +9,6 @@ extension = vtu [formcompiler] compare_l2errorsquared = 6e-7 + +[formcompiler.r] geometry_mixins = equidistant 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 9365f433..23bc16ba 100644 --- a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini +++ b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini @@ -9,4 +9,6 @@ extension = vtu [formcompiler] compare_l2errorsquared = 9e-5 + +[formcompiler.r] geometry_mixins = equidistant 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 fa0b3a6d..3c8ebda0 100644 --- a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini +++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini @@ -9,4 +9,6 @@ extension = vtu [formcompiler] compare_l2errorsquared = 1e-4 + +[formcompiler.r] geometry_mixins = equidistant diff --git a/test/poisson/poisson_dg_tensor.mini b/test/poisson/poisson_dg_tensor.mini index c799f45d..e73c1ebf 100644 --- a/test/poisson/poisson_dg_tensor.mini +++ b/test/poisson/poisson_dg_tensor.mini @@ -13,7 +13,7 @@ extension = vtu [formcompiler] compare_l2errorsquared = 4e-6 -geometry_mixins = equidistant [formcompiler.r] -numerical_jacobian = 1, 0 | expand num \ No newline at end of file +numerical_jacobian = 1, 0 | expand num +geometry_mixins = equidistant \ No newline at end of file diff --git a/test/stokes/stokes_3d_dg_quadrilateral.mini b/test/stokes/stokes_3d_dg_quadrilateral.mini index 8cb5d51d..18bd43c7 100644 --- a/test/stokes/stokes_3d_dg_quadrilateral.mini +++ b/test/stokes/stokes_3d_dg_quadrilateral.mini @@ -11,7 +11,7 @@ extension = vtu [formcompiler] compare_l2errorsquared = 6e-8 -geometry_mixins = equidistant [formcompiler.r] +geometry_mixins = equidistant numerical_jacobian = 0, 1 | expand num diff --git a/test/stokes/stokes_3d_quadrilateral.mini b/test/stokes/stokes_3d_quadrilateral.mini index ecf02f57..d008c636 100644 --- a/test/stokes/stokes_3d_quadrilateral.mini +++ b/test/stokes/stokes_3d_quadrilateral.mini @@ -12,7 +12,7 @@ extension = vtu [formcompiler] compare_l2errorsquared = 1e-10 -geometry_mixins = equidistant [formcompiler.r] +geometry_mixins = equidistant numerical_jacobian = 1, 0 | expand num diff --git a/test/stokes/stokes_dg_quadrilateral.mini b/test/stokes/stokes_dg_quadrilateral.mini index e91ad9c8..5a1fb412 100644 --- a/test/stokes/stokes_dg_quadrilateral.mini +++ b/test/stokes/stokes_dg_quadrilateral.mini @@ -11,7 +11,7 @@ extension = vtu [formcompiler] compare_l2errorsquared = 1e-8 -geometry_mixins = equidistant [formcompiler.r] +geometry_mixins = equidistant numerical_jacobian = 0, 1 | expand num diff --git a/test/stokes/stokes_quadrilateral.mini b/test/stokes/stokes_quadrilateral.mini index 6954f227..cdaa55d5 100644 --- a/test/stokes/stokes_quadrilateral.mini +++ b/test/stokes/stokes_quadrilateral.mini @@ -12,7 +12,7 @@ extension = vtu [formcompiler] compare_l2errorsquared = 1e-10 -geometry_mixins = equidistant [formcompiler.r] +geometry_mixins = equidistant numerical_jacobian = 1, 0 | expand num -- GitLab