From: Peter Munch Date: Sat, 19 Mar 2022 17:43:06 +0000 (+0100) Subject: GC: test FE_DGQ(0) X-Git-Tag: v9.4.0-rc1~359^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3025fec176a88c721801bd2c69097b6c57f5be8e;p=dealii.git GC: test FE_DGQ(0) --- diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.cc b/tests/multigrid-global-coarsening/mg_transfer_a_01.cc index 940025b38c..b3fa63a2df 100644 --- a/tests/multigrid-global-coarsening/mg_transfer_a_01.cc +++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.cc @@ -122,17 +122,19 @@ test(int fe_degree) const auto str_fine = std::to_string(fe_degree); const auto str_coarse = std::to_string(fe_degree); - { - deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); - do_test(FE_Q(fe_degree), FE_Q(fe_degree)); - deallog.pop(); - } - - { - deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); - do_test(FE_DGQ(fe_degree), FE_Q(fe_degree)); - deallog.pop(); - } + if (fe_degree > 0) + { + deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); + do_test(FE_Q(fe_degree), FE_Q(fe_degree)); + deallog.pop(); + } + + if (fe_degree > 0) + { + deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); + do_test(FE_DGQ(fe_degree), FE_Q(fe_degree)); + deallog.pop(); + } { deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")"); @@ -149,6 +151,6 @@ main(int argc, char **argv) deallog.precision(8); - for (unsigned int i = 1; i < 5; ++i) + for (unsigned int i = 0; i < 5; ++i) test<2, double>(i); } diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output index 00bca4d7c8..66aab13cc0 100644 --- a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output +++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output @@ -1,4 +1,10 @@ +DEAL:0:DG<2>(0)<->DG<2>(0)::3.1622777 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::5.8309519 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::4.0000000 1.0000000 4.0000000 1.0000000 DEAL:0:CG<2>(1)<->CG<2>(1)::4.2426407 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output index ca8ee32ae1..e40bc0269f 100644 --- a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output +++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output @@ -1,4 +1,10 @@ +DEAL:0:DG<2>(0)<->DG<2>(0)::3.1622777 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::5.8309519 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::4.0000000 1.0000000 4.0000000 1.0000000 DEAL:0:CG<2>(1)<->CG<2>(1)::4.2426407 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 @@ -72,6 +78,12 @@ DEAL:0:DG<2>(4)<->DG<2>(4)::36.864132 DEAL:0:DG<2>(4)<->DG<2>(4)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 DEAL:0:DG<2>(4)<->DG<2>(4)::1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:1:DG<2>(0)<->DG<2>(0)::3.1622777 +DEAL:1:DG<2>(0)<->DG<2>(0):: +DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:1:DG<2>(0)<->DG<2>(0)::5.8309519 +DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:1:DG<2>(0)<->DG<2>(0):: DEAL:1:CG<2>(1)<->CG<2>(1)::4.2426407 DEAL:1:CG<2>(1)<->CG<2>(1):: DEAL:1:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_03.cc b/tests/multigrid-global-coarsening/mg_transfer_a_03.cc index 78e0464561..541647833d 100644 --- a/tests/multigrid-global-coarsening/mg_transfer_a_03.cc +++ b/tests/multigrid-global-coarsening/mg_transfer_a_03.cc @@ -118,17 +118,19 @@ test(int fe_degree) const auto str_fine = std::to_string(fe_degree); const auto str_coarse = std::to_string(fe_degree); - { - deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); - do_test(FE_Q(fe_degree), FE_Q(fe_degree)); - deallog.pop(); - } - - { - deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); - do_test(FE_DGQ(fe_degree), FE_Q(fe_degree)); - deallog.pop(); - } + if (fe_degree > 0) + { + deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); + do_test(FE_Q(fe_degree), FE_Q(fe_degree)); + deallog.pop(); + } + + if (fe_degree > 0) + { + deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")"); + do_test(FE_DGQ(fe_degree), FE_Q(fe_degree)); + deallog.pop(); + } { deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")"); @@ -145,6 +147,6 @@ main(int argc, char **argv) deallog.precision(8); - for (unsigned int i = 1; i < 5; ++i) + for (unsigned int i = 0; i < 5; ++i) test<2, double>(i); } diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output index ca8ee32ae1..e40bc0269f 100644 --- a/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output +++ b/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output @@ -1,4 +1,10 @@ +DEAL:0:DG<2>(0)<->DG<2>(0)::3.1622777 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::5.8309519 +DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:0:DG<2>(0)<->DG<2>(0)::4.0000000 1.0000000 4.0000000 1.0000000 DEAL:0:CG<2>(1)<->CG<2>(1)::4.2426407 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 @@ -72,6 +78,12 @@ DEAL:0:DG<2>(4)<->DG<2>(4)::36.864132 DEAL:0:DG<2>(4)<->DG<2>(4)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 DEAL:0:DG<2>(4)<->DG<2>(4)::1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:1:DG<2>(0)<->DG<2>(0)::3.1622777 +DEAL:1:DG<2>(0)<->DG<2>(0):: +DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:1:DG<2>(0)<->DG<2>(0)::5.8309519 +DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 +DEAL:1:DG<2>(0)<->DG<2>(0):: DEAL:1:CG<2>(1)<->CG<2>(1)::4.2426407 DEAL:1:CG<2>(1)<->CG<2>(1):: DEAL:1:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000