From 39e9e1e52bc1a6264d9d54e3596cfd6ead8eb6dd Mon Sep 17 00:00:00 2001 From: Markus Buerg Date: Mon, 13 Sep 2010 19:11:55 +0000 Subject: [PATCH] Test nedelec_3 adapted. git-svn-id: https://svn.dealii.org/trunk@21951 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/fe/nedelec_3.cc | 14 +++-- tests/fe/nedelec_3/cmp/generic | 108 +++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 6 deletions(-) diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc index 0b0fc9fc81..d386fedde0 100644 --- a/tests/fe/nedelec_3.cc +++ b/tests/fe/nedelec_3.cc @@ -29,7 +29,7 @@ template inline void -check () +check (const unsigned int p) { deallog << dim << "-D" << std::endl; @@ -39,7 +39,7 @@ check () // work on a once-refined grid tr.refine_global (1); - FE_Nedelec fe_ned(1); + FE_Nedelec fe_ned(p); DoFHandler dof(tr); dof.distribute_dofs(fe_ned); @@ -107,10 +107,12 @@ main() deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); - - check<2>(); - check<3>(); - + deallog << "Degree 0: " << std::endl; + check<2> (0); + check<3> (0); + deallog << "Degree 1: " << std::endl; + check<2> (1); + check<3> (1); return 0; } diff --git a/tests/fe/nedelec_3/cmp/generic b/tests/fe/nedelec_3/cmp/generic index 0ed43c5322..ac38af72a4 100644 --- a/tests/fe/nedelec_3/cmp/generic +++ b/tests/fe/nedelec_3/cmp/generic @@ -1,4 +1,5 @@ +DEAL::Degree 0: DEAL::2-D DEAL:: CELL 1.0 DEAL::, xq=0.00 0.00, f=[2.00 0] @@ -105,3 +106,110 @@ DEAL::, xq=1.00 0.50 1.00, f=[6.50 5.00 10.00] DEAL::, xq=0.50 1.00 1.00, f=[7.00 4.50 10.50] DEAL::, xq=1.00 1.00 1.00, f=[7.00 5.00 11.00] DEAL:: +DEAL::Degree 1: +DEAL::2-D +DEAL:: CELL 1.0 +DEAL::, xq=0.00 0.00, f=[-4.66 -1.73] +DEAL::, xq=0.50 0.00, f=[4.00 1.46] +DEAL::, xq=0.00 0.50, f=[-2.11 0] +DEAL::, xq=0.50 0.50, f=[1.54 -3.33] +DEAL:: +DEAL:: CELL 1.1 +DEAL::, xq=0.50 0.00, f=[4.00 1.46] +DEAL::, xq=1.00 0.00, f=[12.66 -3.20] +DEAL::, xq=0.50 0.50, f=[1.54 -3.33] +DEAL::, xq=1.00 0.50, f=[5.18 2.00] +DEAL:: +DEAL:: CELL 1.2 +DEAL::, xq=0.00 0.50, f=[-2.11 0] +DEAL::, xq=0.50 0.50, f=[1.54 -3.33] +DEAL::, xq=0.00 1.00, f=[-6.12 1.73] +DEAL::, xq=0.50 1.00, f=[6.00 -8.12] +DEAL:: +DEAL:: CELL 1.3 +DEAL::, xq=0.50 0.50, f=[1.54 -3.33] +DEAL::, xq=1.00 0.50, f=[5.18 2.00] +DEAL::, xq=0.50 1.00, f=[6.00 -8.12] +DEAL::, xq=1.00 1.00, f=[18.12 7.20] +DEAL:: +DEAL::3-D +DEAL:: CELL 1.0 +DEAL::, xq=0.00 0.00 0.00, f=[-4.66 -1.73 -13.44] +DEAL::, xq=0.50 0.00 0.00, f=[4.00 11.60 -2.65] +DEAL::, xq=0.00 0.50 0.00, f=[8.04 0 -5.92] +DEAL::, xq=0.50 0.50 0.00, f=[-12.32 -17.19 -1.32] +DEAL::, xq=0.00 0.00 0.50, f=[3.31 3.70 16.00] +DEAL::, xq=0.50 0.00 0.50, f=[-5.86 11.11 2.28] +DEAL::, xq=0.00 0.50 0.50, f=[10.36 -6.39 6.74] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL:: +DEAL:: CELL 1.1 +DEAL::, xq=0.50 0.00 0.00, f=[4.00 11.60 -2.65] +DEAL::, xq=1.00 0.00 0.00, f=[12.66 -3.20 -14.91] +DEAL::, xq=0.50 0.50 0.00, f=[-12.32 -17.19 -1.32] +DEAL::, xq=1.00 0.50 0.00, f=[-32.68 2.00 -6.11] +DEAL::, xq=0.50 0.00 0.50, f=[-5.86 11.11 2.28] +DEAL::, xq=1.00 0.00 0.50, f=[-15.02 3.50 18.00] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=1.00 0.50 0.50, f=[-40.18 -6.12 7.01] +DEAL:: +DEAL:: CELL 1.2 +DEAL::, xq=0.00 0.50 0.00, f=[8.04 0 -5.92] +DEAL::, xq=0.50 0.50 0.00, f=[-12.32 -17.19 -1.32] +DEAL::, xq=0.00 1.00 0.00, f=[-6.12 1.73 -16.37] +DEAL::, xq=0.50 1.00 0.00, f=[6.00 -45.97 -4.31] +DEAL::, xq=0.00 0.50 0.50, f=[10.36 -6.39 6.74] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=0.00 1.00 0.50, f=[3.11 -16.48 20.00] +DEAL::, xq=0.50 1.00 0.50, f=[-5.59 -42.98 4.55] +DEAL:: +DEAL:: CELL 1.3 +DEAL::, xq=0.50 0.50 0.00, f=[-12.32 -17.19 -1.32] +DEAL::, xq=1.00 0.50 0.00, f=[-32.68 2.00 -6.11] +DEAL::, xq=0.50 1.00 0.00, f=[6.00 -45.97 -4.31] +DEAL::, xq=1.00 1.00 0.00, f=[18.12 7.20 -17.84] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=1.00 0.50 0.50, f=[-40.18 -6.12 7.01] +DEAL::, xq=0.50 1.00 0.50, f=[-5.59 -42.98 4.55] +DEAL::, xq=1.00 1.00 0.50, f=[-14.29 -15.75 22.00] +DEAL:: +DEAL:: CELL 1.4 +DEAL::, xq=0.00 0.00 0.50, f=[3.31 3.70 16.00] +DEAL::, xq=0.50 0.00 0.50, f=[-5.86 11.11 2.28] +DEAL::, xq=0.00 0.50 0.50, f=[10.36 -6.39 6.74] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=0.00 0.00 1.00, f=[-10.52 -7.59 45.44] +DEAL::, xq=0.50 0.00 1.00, f=[12.00 7.01 7.20] +DEAL::, xq=0.00 0.50 1.00, f=[3.45 8.00 19.40] +DEAL::, xq=0.50 0.50 1.00, f=[-6.05 -10.92 3.39] +DEAL:: +DEAL:: CELL 1.5 +DEAL::, xq=0.50 0.00 0.50, f=[-5.86 11.11 2.28] +DEAL::, xq=1.00 0.00 0.50, f=[-15.02 3.50 18.00] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=1.00 0.50 0.50, f=[-40.18 -6.12 7.01] +DEAL::, xq=0.50 0.00 1.00, f=[12.00 7.01 7.20] +DEAL::, xq=1.00 0.00 1.00, f=[34.52 -9.05 50.91] +DEAL::, xq=0.50 0.50 1.00, f=[-6.05 -10.92 3.39] +DEAL::, xq=1.00 0.50 1.00, f=[-15.55 10.00 20.13] +DEAL:: +DEAL:: CELL 1.6 +DEAL::, xq=0.00 0.50 0.50, f=[10.36 -6.39 6.74] +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=0.00 1.00 0.50, f=[3.11 -16.48 20.00] +DEAL::, xq=0.50 1.00 0.50, f=[-5.59 -42.98 4.55] +DEAL::, xq=0.00 0.50 1.00, f=[3.45 8.00 19.40] +DEAL::, xq=0.50 0.50 1.00, f=[-6.05 -10.92 3.39] +DEAL::, xq=0.00 1.00 1.00, f=[-11.98 23.59 56.37] +DEAL::, xq=0.50 1.00 1.00, f=[14.00 -28.85 13.40] +DEAL:: +DEAL:: CELL 1.7 +DEAL::, xq=0.50 0.50 0.50, f=[-14.91 -15.94 1.04] +DEAL::, xq=1.00 0.50 0.50, f=[-40.18 -6.12 7.01] +DEAL::, xq=0.50 1.00 0.50, f=[-5.59 -42.98 4.55] +DEAL::, xq=1.00 1.00 0.50, f=[-14.29 -15.75 22.00] +DEAL::, xq=0.50 0.50 1.00, f=[-6.05 -10.92 3.39] +DEAL::, xq=1.00 0.50 1.00, f=[-15.55 10.00 20.13] +DEAL::, xq=0.50 1.00 1.00, f=[14.00 -28.85 13.40] +DEAL::, xq=1.00 1.00 1.00, f=[39.98 29.05 61.84] +DEAL:: -- 2.39.5