add testing n_blocks

git-svn-id: https://svn.dealii.org/trunk@15266 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/fe/fe_data_test.cc b/tests/fe/fe_data_test.cc
index 769b4ec9889339f99c36b24a52500a91ecf02293..bad152aa24eb613aeb5d0d954603c194f164e7f5 100644 (file)
--- a/tests/fe/fe_data_test.cc
+++ b/tests/fe/fe_data_test.cc
@@ -142,6 +142,7 @@ void test_fe_datas()
       deallog << "dofs_per_face=" << fe_data->dofs_per_face << std::endl;
       deallog << "dofs_per_cell=" << fe_data->dofs_per_cell << std::endl;
       deallog << "components=" << fe_data->components << std::endl
+             << "blocks=" << fe_data->n_blocks() << std::endl
              << "degree=" << fe_data->tensor_degree() << std::endl
              << "conformity=";
       if (fe_data->conforms(FiniteElementData<dim>::L2)) deallog << " L2";

diff --git a/tests/fe/fe_data_test/cmp/generic b/tests/fe/fe_data_test/cmp/generic
index d8769892a005af4550c8ac89f9e999855f0d132a..ed3c0fd14b7f18d25ef4f9ce864cc01eef717cee 100644 (file)
--- a/tests/fe/fe_data_test/cmp/generic
+++ b/tests/fe/fe_data_test/cmp/generic
@@ -35,6 +35,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=2
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=2
@@ -60,6 +61,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=3
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=3
@@ -85,6 +87,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=5
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=5
@@ -110,6 +113,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=2
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=2
@@ -135,6 +139,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=3
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=3
@@ -160,6 +165,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=5
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=5
@@ -185,6 +191,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=2
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= L2
 DEAL::unit_support_points=2
@@ -210,6 +217,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=3
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= L2
 DEAL::unit_support_points=3
@@ -235,6 +243,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=5
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= L2
 DEAL::unit_support_points=5
@@ -260,6 +269,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=2
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -285,6 +295,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=3
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -310,6 +321,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=5
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -335,6 +347,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=6
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=6
@@ -360,6 +373,7 @@ DEAL::first_face_quad_index=6
 DEAL::dofs_per_face=3
 DEAL::dofs_per_cell=7
 DEAL::components=3
+DEAL::blocks=3
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=7
@@ -385,6 +399,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=8
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=3
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=8
@@ -410,6 +425,7 @@ DEAL::first_face_quad_index=6
 DEAL::dofs_per_face=3
 DEAL::dofs_per_cell=8
 DEAL::components=3
+DEAL::blocks=3
 DEAL::degree=3
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=8
@@ -435,6 +451,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=10
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=10
@@ -460,6 +477,7 @@ DEAL::first_face_quad_index=8
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=8
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=8
@@ -485,6 +503,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=8
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=1
 DEAL::conformity=
 DEAL::unit_support_points=8
@@ -510,6 +529,7 @@ DEAL::first_face_quad_index=8
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=17
 DEAL::components=6
+DEAL::blocks=3
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=17
@@ -535,6 +555,7 @@ DEAL::first_face_quad_index=36
 DEAL::dofs_per_face=18
 DEAL::dofs_per_cell=58
 DEAL::components=24
+DEAL::blocks=5
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=58
@@ -590,6 +611,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=4
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=4
@@ -619,6 +641,7 @@ DEAL::first_face_quad_index=5
 DEAL::dofs_per_face=3
 DEAL::dofs_per_cell=9
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=9
@@ -648,6 +671,7 @@ DEAL::first_face_quad_index=7
 DEAL::dofs_per_face=5
 DEAL::dofs_per_cell=25
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=25
@@ -677,6 +701,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=4
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=4
@@ -706,6 +731,7 @@ DEAL::first_face_quad_index=5
 DEAL::dofs_per_face=3
 DEAL::dofs_per_cell=9
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=9
@@ -735,6 +761,7 @@ DEAL::first_face_quad_index=7
 DEAL::dofs_per_face=5
 DEAL::dofs_per_cell=25
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=25
@@ -764,6 +791,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=4
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= L2
 DEAL::unit_support_points=4
@@ -793,6 +821,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=9
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= L2
 DEAL::unit_support_points=9
@@ -822,6 +851,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=25
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= L2
 DEAL::unit_support_points=25
@@ -851,6 +881,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=3
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -880,6 +911,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=6
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -909,6 +941,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=15
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -938,6 +971,7 @@ DEAL::first_face_quad_index=10
 DEAL::dofs_per_face=6
 DEAL::dofs_per_cell=18
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=18
@@ -967,6 +1001,7 @@ DEAL::first_face_quad_index=13
 DEAL::dofs_per_face=7
 DEAL::dofs_per_cell=17
 DEAL::components=3
+DEAL::blocks=3
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=17
@@ -996,6 +1031,7 @@ DEAL::first_face_quad_index=1
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=4
 DEAL::components=2
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1025,6 +1061,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=12
 DEAL::components=2
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1054,6 +1091,7 @@ DEAL::first_face_quad_index=3
 DEAL::dofs_per_face=3
 DEAL::dofs_per_cell=24
 DEAL::components=2
+DEAL::blocks=1
 DEAL::degree=3
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1083,6 +1121,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=16
 DEAL::components=3
+DEAL::blocks=2
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=0
@@ -1112,6 +1151,7 @@ DEAL::first_face_quad_index=1
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=4
 DEAL::components=2
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1141,6 +1181,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=12
 DEAL::components=2
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1170,6 +1211,7 @@ DEAL::first_face_quad_index=2
 DEAL::dofs_per_face=2
 DEAL::dofs_per_cell=16
 DEAL::components=3
+DEAL::blocks=2
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=0
@@ -1199,6 +1241,7 @@ DEAL::first_face_quad_index=12
 DEAL::dofs_per_face=8
 DEAL::dofs_per_cell=32
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=3
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=32
@@ -1228,6 +1271,7 @@ DEAL::first_face_quad_index=14
 DEAL::dofs_per_face=8
 DEAL::dofs_per_cell=24
 DEAL::components=3
+DEAL::blocks=3
 DEAL::degree=3
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=24
@@ -1257,6 +1301,7 @@ DEAL::first_face_quad_index=14
 DEAL::dofs_per_face=10
 DEAL::dofs_per_cell=50
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=50
@@ -1286,6 +1331,7 @@ DEAL::first_face_quad_index=16
 DEAL::dofs_per_face=8
 DEAL::dofs_per_cell=16
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=16
@@ -1315,6 +1361,7 @@ DEAL::first_face_quad_index=8
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=16
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=1
 DEAL::conformity=
 DEAL::unit_support_points=16
@@ -1344,6 +1391,7 @@ DEAL::first_face_quad_index=19
 DEAL::dofs_per_face=11
 DEAL::dofs_per_cell=49
 DEAL::components=6
+DEAL::blocks=3
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=49
@@ -1373,6 +1421,7 @@ DEAL::first_face_quad_index=78
 DEAL::dofs_per_face=42
 DEAL::dofs_per_cell=146
 DEAL::components=24
+DEAL::blocks=5
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=146
@@ -1425,6 +1474,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=8
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=8
@@ -1458,6 +1508,7 @@ DEAL::first_face_quad_index=8
 DEAL::dofs_per_face=9
 DEAL::dofs_per_cell=27
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=27
@@ -1491,6 +1542,7 @@ DEAL::first_face_quad_index=16
 DEAL::dofs_per_face=25
 DEAL::dofs_per_cell=125
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=125
@@ -1524,6 +1576,7 @@ DEAL::first_face_quad_index=4
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=8
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=8
@@ -1557,6 +1610,7 @@ DEAL::first_face_quad_index=8
 DEAL::dofs_per_face=9
 DEAL::dofs_per_cell=27
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=27
@@ -1590,6 +1644,7 @@ DEAL::first_face_quad_index=16
 DEAL::dofs_per_face=25
 DEAL::dofs_per_cell=125
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=125
@@ -1623,6 +1678,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=8
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= L2
 DEAL::unit_support_points=8
@@ -1656,6 +1712,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=27
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= L2
 DEAL::unit_support_points=27
@@ -1689,6 +1746,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=125
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= L2
 DEAL::unit_support_points=125
@@ -1722,6 +1780,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=4
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -1755,6 +1814,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=10
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -1788,6 +1848,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=0
 DEAL::dofs_per_cell=35
 DEAL::components=1
+DEAL::blocks=1
 DEAL::degree=4
 DEAL::conformity= L2
 DEAL::unit_support_points=0
@@ -1821,6 +1882,7 @@ DEAL::first_face_quad_index=16
 DEAL::dofs_per_face=18
 DEAL::dofs_per_cell=54
 DEAL::components=2
+DEAL::blocks=2
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=54
@@ -1854,6 +1916,7 @@ DEAL::first_face_quad_index=16
 DEAL::dofs_per_face=17
 DEAL::dofs_per_cell=43
 DEAL::components=3
+DEAL::blocks=3
 DEAL::degree=2
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=43
@@ -1887,6 +1950,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=1
 DEAL::dofs_per_cell=6
 DEAL::components=3
+DEAL::blocks=1
 DEAL::degree=1
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1920,6 +1984,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=36
 DEAL::components=3
+DEAL::blocks=1
 DEAL::degree=2
 DEAL::conformity= Hdiv
 DEAL::unit_support_points=0
@@ -1953,6 +2018,7 @@ DEAL::first_face_quad_index=0
 DEAL::dofs_per_face=4
 DEAL::dofs_per_cell=44
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=0
@@ -1986,6 +2052,7 @@ DEAL::first_face_quad_index=16
 DEAL::dofs_per_face=16
 DEAL::dofs_per_cell=32
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=1
 DEAL::conformity= Hcurl Hdiv H1
 DEAL::unit_support_points=32
@@ -2019,6 +2086,7 @@ DEAL::first_face_quad_index=8
 DEAL::dofs_per_face=8
 DEAL::dofs_per_cell=32
 DEAL::components=4
+DEAL::blocks=2
 DEAL::degree=1
 DEAL::conformity=
 DEAL::unit_support_points=32
@@ -2052,6 +2120,7 @@ DEAL::first_face_quad_index=28
 DEAL::dofs_per_face=31
 DEAL::dofs_per_cell=143
 DEAL::components=6
+DEAL::blocks=3
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=143
@@ -2085,6 +2154,7 @@ DEAL::first_face_quad_index=96
 DEAL::dofs_per_face=102
 DEAL::dofs_per_cell=382
 DEAL::components=24
+DEAL::blocks=5
 DEAL::degree=2
 DEAL::conformity=
 DEAL::unit_support_points=382