extend test

diff --git a/tests/multigrid/renumbering_04.cc b/tests/multigrid/renumbering_04.cc
index 2bd6c0f4306134b88fe1ea4eeb318463118494e7..e25deb134611c6ad97e14a1e878cb5f176d2abcd 100644 (file)
--- a/tests/multigrid/renumbering_04.cc
+++ b/tests/multigrid/renumbering_04.cc
@@ -23,6 +23,7 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/dofs/dof_renumbering.h>
+#include <deal.II/fe/fe_raviart_thomas.h>
 #include <deal.II/fe/fe_dgp.h>
 #include <deal.II/fe/fe_dgq.h>
 #include <deal.II/fe/fe_q.h>
@@ -37,11 +38,9 @@
 using namespace std;
 
 template <int dim>
-void check()
+void check(FiniteElement<dim> &fe)
 {
-  FESystem<dim> fe(FE_Q<dim>(1), 1, FE_DGQ<dim>(0), 1);
-
-  deallog << fe.get_name() << std::endl;
+  deallog << std::endl << "**** " << fe.get_name() << std::endl;
 
   Triangulation<dim> tria;
   GridGenerator::hyper_cube(tria);
@@ -100,9 +99,26 @@ void check()
 int main()
 {
   initlog(__FILE__);
-  //check<1> ();
-  check<2> ();
-  //check<3> ();
+
+  {
+      FESystem<1> fe(FE_Q<1>(1), 1, FE_DGQ<1>(0), 1);
+      check<1> (fe);
+  }
+
+
+  {
+      FESystem<2> fe(FE_RaviartThomas<2>(0),1, FE_DGQ<2>(0), 1);
+      check<2> (fe);
+  }
+  {
+      FESystem<2> fe(FE_Q<2>(1), 1, FE_DGQ<2>(0), 1);
+      check<2> (fe);
+  }
+
+  {
+      FESystem<3> fe(FE_Q<3>(1), 1, FE_DGQ<3>(0), 1);
+      check<3> (fe);
+  }
 
   deallog << "OK" << endl;
 }

diff --git a/tests/multigrid/renumbering_04.output b/tests/multigrid/renumbering_04.output
index f10b3dd1db678432055f10de2003c561fa3ee517..4a466941e606577692e8627fa3cffaa69fbbcf8f 100644 (file)
--- a/tests/multigrid/renumbering_04.output
+++ b/tests/multigrid/renumbering_04.output
@@ -1,5 +1,84 @@
 
-DEAL::FESystem<2>[FE_Q<2>(1)-FE_DGQ<2>(0)]
+DEAL::
+DEAL::**** FESystem<1>[FE_Q<1>(1)-FE_DGQ<1>(0)]
+DEAL::** before:
+DEAL::* level 0
+DEAL::cell 0_0::
+DEAL::0 1 2 
+DEAL::* level 1
+DEAL::cell 0_1:0:
+DEAL::0 1 2 
+DEAL::cell 0_1:1:
+DEAL::1 3 4 
+DEAL::* level 2
+DEAL::cell 0_2:00:
+DEAL::0 1 2 
+DEAL::cell 0_2:01:
+DEAL::1 3 4 
+DEAL::
+DEAL::** after:
+DEAL::* level 0
+DEAL::cell 0_0::
+DEAL::0 1 2 
+DEAL::* level 1
+DEAL::cell 0_1:0:
+DEAL::0 1 3 
+DEAL::cell 0_1:1:
+DEAL::1 2 4 
+DEAL::* level 2
+DEAL::cell 0_2:00:
+DEAL::0 1 3 
+DEAL::cell 0_2:01:
+DEAL::1 2 4 
+DEAL::
+DEAL::**** FESystem<2>[FE_RaviartThomas<2>(0)-FE_DGQ<2>(0)]
+DEAL::** before:
+DEAL::* level 0
+DEAL::cell 0_0::
+DEAL::0 1 2 3 4 
+DEAL::* level 1
+DEAL::cell 0_1:0:
+DEAL::0 1 2 3 4 
+DEAL::cell 0_1:1:
+DEAL::1 5 6 7 8 
+DEAL::cell 0_1:2:
+DEAL::9 10 3 11 12 
+DEAL::cell 0_1:3:
+DEAL::10 13 7 14 15 
+DEAL::* level 2
+DEAL::cell 0_2:00:
+DEAL::0 1 2 3 4 
+DEAL::cell 0_2:01:
+DEAL::1 5 6 7 8 
+DEAL::cell 0_2:02:
+DEAL::9 10 3 11 12 
+DEAL::cell 0_2:03:
+DEAL::10 13 7 14 15 
+DEAL::
+DEAL::** after:
+DEAL::* level 0
+DEAL::cell 0_0::
+DEAL::0 1 2 3 4 
+DEAL::* level 1
+DEAL::cell 0_1:0:
+DEAL::0 1 2 3 12 
+DEAL::cell 0_1:1:
+DEAL::1 4 5 6 13 
+DEAL::cell 0_1:2:
+DEAL::7 8 3 9 14 
+DEAL::cell 0_1:3:
+DEAL::8 10 6 11 15 
+DEAL::* level 2
+DEAL::cell 0_2:00:
+DEAL::0 1 2 3 12 
+DEAL::cell 0_2:01:
+DEAL::1 4 5 6 13 
+DEAL::cell 0_2:02:
+DEAL::7 8 3 9 14 
+DEAL::cell 0_2:03:
+DEAL::8 10 6 11 15 
+DEAL::
+DEAL::**** FESystem<2>[FE_Q<2>(1)-FE_DGQ<2>(0)]
 DEAL::** before:
 DEAL::* level 0
 DEAL::cell 0_0::
@@ -45,4 +124,83 @@ DEAL::cell 0_2:02:
 DEAL::2 3 6 7 11 
 DEAL::cell 0_2:03:
 DEAL::3 5 7 8 12 
+DEAL::
+DEAL::**** FESystem<3>[FE_Q<3>(1)-FE_DGQ<3>(0)]
+DEAL::** before:
+DEAL::* level 0
+DEAL::cell 0_0::
+DEAL::0 1 2 3 4 5 6 7 8 
+DEAL::* level 1
+DEAL::cell 0_1:0:
+DEAL::0 1 2 3 4 5 6 7 8 
+DEAL::cell 0_1:1:
+DEAL::1 9 3 10 5 11 7 12 13 
+DEAL::cell 0_1:2:
+DEAL::2 3 14 15 6 7 16 17 18 
+DEAL::cell 0_1:3:
+DEAL::3 10 15 19 7 12 17 20 21 
+DEAL::cell 0_1:4:
+DEAL::4 5 6 7 22 23 24 25 26 
+DEAL::cell 0_1:5:
+DEAL::5 11 7 12 23 27 25 28 29 
+DEAL::cell 0_1:6:
+DEAL::6 7 16 17 24 25 30 31 32 
+DEAL::cell 0_1:7:
+DEAL::7 12 17 20 25 28 31 33 34 
+DEAL::* level 2
+DEAL::cell 0_2:00:
+DEAL::0 1 2 3 4 5 6 7 8 
+DEAL::cell 0_2:01:
+DEAL::1 9 3 10 5 11 7 12 13 
+DEAL::cell 0_2:02:
+DEAL::2 3 14 15 6 7 16 17 18 
+DEAL::cell 0_2:03:
+DEAL::3 10 15 19 7 12 17 20 21 
+DEAL::cell 0_2:04:
+DEAL::4 5 6 7 22 23 24 25 26 
+DEAL::cell 0_2:05:
+DEAL::5 11 7 12 23 27 25 28 29 
+DEAL::cell 0_2:06:
+DEAL::6 7 16 17 24 25 30 31 32 
+DEAL::cell 0_2:07:
+DEAL::7 12 17 20 25 28 31 33 34 
+DEAL::
+DEAL::** after:
+DEAL::* level 0
+DEAL::cell 0_0::
+DEAL::0 1 2 3 4 5 6 7 8 
+DEAL::* level 1
+DEAL::cell 0_1:0:
+DEAL::0 1 2 3 4 5 6 7 27 
+DEAL::cell 0_1:1:
+DEAL::1 8 3 9 5 10 7 11 28 
+DEAL::cell 0_1:2:
+DEAL::2 3 12 13 6 7 14 15 29 
+DEAL::cell 0_1:3:
+DEAL::3 9 13 16 7 11 15 17 30 
+DEAL::cell 0_1:4:
+DEAL::4 5 6 7 18 19 20 21 31 
+DEAL::cell 0_1:5:
+DEAL::5 10 7 11 19 22 21 23 32 
+DEAL::cell 0_1:6:
+DEAL::6 7 14 15 20 21 24 25 33 
+DEAL::cell 0_1:7:
+DEAL::7 11 15 17 21 23 25 26 34 
+DEAL::* level 2
+DEAL::cell 0_2:00:
+DEAL::0 1 2 3 4 5 6 7 27 
+DEAL::cell 0_2:01:
+DEAL::1 8 3 9 5 10 7 11 28 
+DEAL::cell 0_2:02:
+DEAL::2 3 12 13 6 7 14 15 29 
+DEAL::cell 0_2:03:
+DEAL::3 9 13 16 7 11 15 17 30 
+DEAL::cell 0_2:04:
+DEAL::4 5 6 7 18 19 20 21 31 
+DEAL::cell 0_2:05:
+DEAL::5 10 7 11 19 22 21 23 32 
+DEAL::cell 0_2:06:
+DEAL::6 7 14 15 20 21 24 25 33 
+DEAL::cell 0_2:07:
+DEAL::7 11 15 17 21 23 25 26 34 
 DEAL::OK