From 46ed438d5465409834dff0c36df350366ee2c80b Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 30 Apr 2015 11:02:38 -0400 Subject: [PATCH] extend test --- tests/multigrid/renumbering_04.cc | 30 +++-- tests/multigrid/renumbering_04.output | 160 +++++++++++++++++++++++++- 2 files changed, 182 insertions(+), 8 deletions(-) diff --git a/tests/multigrid/renumbering_04.cc b/tests/multigrid/renumbering_04.cc index 2bd6c0f430..e25deb1346 100644 --- a/tests/multigrid/renumbering_04.cc +++ b/tests/multigrid/renumbering_04.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -37,11 +38,9 @@ using namespace std; template -void check() +void check(FiniteElement &fe) { - FESystem fe(FE_Q(1), 1, FE_DGQ(0), 1); - - deallog << fe.get_name() << std::endl; + deallog << std::endl << "**** " << fe.get_name() << std::endl; Triangulation 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 f10b3dd1db..4a466941e6 100644 --- 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 -- 2.39.5