Skip to content

Commit

Permalink
Merge pull request #13550 from peterrum/gc_fe_dgq_0
Browse files Browse the repository at this point in the history 
GC: test FE_DGQ(0)
  • Loading branch information
@tjhei
tjhei committed Mar 20, 2022
2 parents a7f37f5 + 3025fec commit ec0776b
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 24 deletions.
26 changes: 14 additions & 12 deletions tests/multigrid-global-coarsening/mg_transfer_a_01.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}

{
deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}
if (fe_degree > 0)
{
deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
do_test<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}

if (fe_degree > 0)
{
deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}

{
deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
Expand All @@ -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);
}
6 changes: 6 additions & 0 deletions tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 12 additions & 0 deletions tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
26 changes: 14 additions & 12 deletions tests/multigrid-global-coarsening/mg_transfer_a_03.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}

{
deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}
if (fe_degree > 0)
{
deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
do_test<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}

if (fe_degree > 0)
{
deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
deallog.pop();
}

{
deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
Expand All @@ -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);
}
12 changes: 12 additions & 0 deletions tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ec0776b

Please sign in to comment.