Simply matrix_free/parallel_multigrid_adaptive_03 test

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc
index 8ed5319e837d0d9e85eae27b0f399d0ddb3c9422..b3d2ae6033238717802c7bbbd270b6ba37959004 100644 (file)
--- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc
@@ -649,7 +649,7 @@ test()
       FE_Q<dim>       fe(fe_degree);
       DoFHandler<dim> dof(tria);
       dof.distribute_dofs(fe);
-      dof.distribute_mg_dofs(fe);
+      dof.distribute_mg_dofs();
 
       deallog.push("nothread");
       do_test<dim, fe_degree, fe_degree + 1, Number>(dof, false);
@@ -674,5 +674,4 @@ main(int argc, char **argv)
   test<2, 1, double>();
   test<2, 2, float>();
   test<3, 1, double>();
-  test<3, 1, float>();
 }

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output b/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output
index 877c9af81ae859b2c61737be196268a6b4003421..3959556cdc29baa3d8af5ef8bf7e89ef1b1ba285 100644 (file)
--- a/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output
+++ b/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=4.output
@@ -34,27 +34,27 @@ DEAL:threaded:cg::Convergence step 6 value 3.14118e-06
 DEAL:nothread::Testing FE_Q<2>(2)
 DEAL:nothread::Number of degrees of freedom: 1935
 DEAL:nothread:cg::Starting value 43.0929
-DEAL:nothread:cg::Convergence step 5 value 3.22495e-06
+DEAL:nothread:cg::Convergence step 5 value 3.22499e-06
 DEAL:threaded::Testing FE_Q<2>(2)
 DEAL:threaded::Number of degrees of freedom: 1935
 DEAL:threaded:cg::Starting value 43.0929
-DEAL:threaded:cg::Convergence step 5 value 3.22504e-06
+DEAL:threaded:cg::Convergence step 5 value 3.22490e-06
 DEAL:nothread::Testing FE_Q<2>(2)
 DEAL:nothread::Number of degrees of freedom: 3403
 DEAL:nothread:cg::Starting value 55.4346
-DEAL:nothread:cg::Convergence step 6 value 8.67853e-07
+DEAL:nothread:cg::Convergence step 6 value 8.67842e-07
 DEAL:threaded::Testing FE_Q<2>(2)
 DEAL:threaded::Number of degrees of freedom: 3403
 DEAL:threaded:cg::Starting value 55.4346
-DEAL:threaded:cg::Convergence step 6 value 8.67861e-07
+DEAL:threaded:cg::Convergence step 6 value 8.67877e-07
 DEAL:nothread::Testing FE_Q<2>(2)
 DEAL:nothread::Number of degrees of freedom: 8417
 DEAL:nothread:cg::Starting value 87.1149
-DEAL:nothread:cg::Convergence step 6 value 5.47715e-07
+DEAL:nothread:cg::Convergence step 6 value 5.47729e-07
 DEAL:threaded::Testing FE_Q<2>(2)
 DEAL:threaded::Number of degrees of freedom: 8417
 DEAL:threaded:cg::Starting value 87.1149
-DEAL:threaded:cg::Convergence step 6 value 5.47726e-07
+DEAL:threaded:cg::Convergence step 6 value 5.47731e-07
 DEAL:nothread::Testing FE_Q<3>(1)
 DEAL:nothread::Number of degrees of freedom: 186
 DEAL:nothread:cg::Starting value 12.3693
@@ -79,27 +79,3 @@ DEAL:threaded::Testing FE_Q<3>(1)
 DEAL:threaded::Number of degrees of freedom: 2930
 DEAL:threaded:cg::Starting value 47.1699
 DEAL:threaded:cg::Convergence step 7 value 2.56010e-06
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 186
-DEAL:nothread:cg::Starting value 12.3693
-DEAL:nothread:cg::Convergence step 4 value 2.88983e-08
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 186
-DEAL:threaded:cg::Starting value 12.3693
-DEAL:threaded:cg::Convergence step 4 value 2.88980e-08
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 648
-DEAL:nothread:cg::Starting value 21.1424
-DEAL:nothread:cg::Convergence step 6 value 6.40524e-07
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 648
-DEAL:threaded:cg::Starting value 21.1424
-DEAL:threaded:cg::Convergence step 6 value 6.40523e-07
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 2930
-DEAL:nothread:cg::Starting value 47.1699
-DEAL:nothread:cg::Convergence step 7 value 2.56010e-06
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 2930
-DEAL:threaded:cg::Starting value 47.1699
-DEAL:threaded:cg::Convergence step 7 value 2.56010e-06

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output b/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output
deleted file mode 100644 (file)
index d176be1..0000000
--- a/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.with_lapack=true.mpirun=7.output
+++ /dev/null
@@ -1,105 +0,0 @@
-
-DEAL:nothread::Testing FE_Q<2>(1)
-DEAL:nothread::Number of degrees of freedom: 507
-DEAL:nothread:cg::Starting value 21.9317
-DEAL:nothread:cg::Convergence step 5 value 1.14539e-06
-DEAL:threaded::Testing FE_Q<2>(1)
-DEAL:threaded::Number of degrees of freedom: 507
-DEAL:threaded:cg::Starting value 21.9317
-DEAL:threaded:cg::Convergence step 5 value 1.14539e-06
-DEAL:nothread::Testing FE_Q<2>(1)
-DEAL:nothread::Number of degrees of freedom: 881
-DEAL:nothread:cg::Starting value 27.7669
-DEAL:nothread:cg::Convergence step 6 value 1.17649e-06
-DEAL:threaded::Testing FE_Q<2>(1)
-DEAL:threaded::Number of degrees of freedom: 881
-DEAL:threaded:cg::Starting value 27.7669
-DEAL:threaded:cg::Convergence step 6 value 1.17649e-06
-DEAL:nothread::Testing FE_Q<2>(1)
-DEAL:nothread::Number of degrees of freedom: 2147
-DEAL:nothread:cg::Starting value 43.2551
-DEAL:nothread:cg::Convergence step 6 value 1.88354e-06
-DEAL:threaded::Testing FE_Q<2>(1)
-DEAL:threaded::Number of degrees of freedom: 2147
-DEAL:threaded:cg::Starting value 43.2551
-DEAL:threaded:cg::Convergence step 6 value 1.88354e-06
-DEAL:nothread::Testing FE_Q<2>(1)
-DEAL:nothread::Number of degrees of freedom: 6517
-DEAL:nothread:cg::Starting value 76.9220
-DEAL:nothread:cg::Convergence step 6 value 3.08982e-06
-DEAL:threaded::Testing FE_Q<2>(1)
-DEAL:threaded::Number of degrees of freedom: 6517
-DEAL:threaded:cg::Starting value 76.9220
-DEAL:threaded:cg::Convergence step 6 value 3.08982e-06
-DEAL:nothread::Testing FE_Q<2>(2)
-DEAL:nothread::Number of degrees of freedom: 1935
-DEAL:nothread:cg::Starting value 43.0929
-DEAL:nothread:cg::Convergence step 5 value 3.19333e-06
-DEAL:threaded::Testing FE_Q<2>(2)
-DEAL:threaded::Number of degrees of freedom: 1935
-DEAL:threaded:cg::Starting value 43.0929
-DEAL:threaded:cg::Convergence step 5 value 3.19334e-06
-DEAL:nothread::Testing FE_Q<2>(2)
-DEAL:nothread::Number of degrees of freedom: 3403
-DEAL:nothread:cg::Starting value 55.4346
-DEAL:nothread:cg::Convergence step 6 value 8.71780e-07
-DEAL:threaded::Testing FE_Q<2>(2)
-DEAL:threaded::Number of degrees of freedom: 3403
-DEAL:threaded:cg::Starting value 55.4346
-DEAL:threaded:cg::Convergence step 6 value 8.71685e-07
-DEAL:nothread::Testing FE_Q<2>(2)
-DEAL:nothread::Number of degrees of freedom: 8417
-DEAL:nothread:cg::Starting value 87.1149
-DEAL:nothread:cg::Convergence step 6 value 5.47238e-07
-DEAL:threaded::Testing FE_Q<2>(2)
-DEAL:threaded::Number of degrees of freedom: 8417
-DEAL:threaded:cg::Starting value 87.1149
-DEAL:threaded:cg::Convergence step 6 value 5.47227e-07
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 186
-DEAL:nothread:cg::Starting value 12.3693
-DEAL:nothread:cg::Convergence step 4 value 2.87808e-08
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 186
-DEAL:threaded:cg::Starting value 12.3693
-DEAL:threaded:cg::Convergence step 4 value 2.87808e-08
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 648
-DEAL:nothread:cg::Starting value 21.1424
-DEAL:nothread:cg::Convergence step 6 value 6.44905e-07
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 648
-DEAL:threaded:cg::Starting value 21.1424
-DEAL:threaded:cg::Convergence step 6 value 6.44905e-07
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 2930
-DEAL:nothread:cg::Starting value 47.1699
-DEAL:nothread:cg::Convergence step 7 value 2.56063e-06
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 2930
-DEAL:threaded:cg::Starting value 47.1699
-DEAL:threaded:cg::Convergence step 7 value 2.56063e-06
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 186
-DEAL:nothread:cg::Starting value 12.3693
-DEAL:nothread:cg::Convergence step 4 value 2.88986e-08
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 186
-DEAL:threaded:cg::Starting value 12.3693
-DEAL:threaded:cg::Convergence step 4 value 2.88984e-08
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 648
-DEAL:nothread:cg::Starting value 21.1424
-DEAL:nothread:cg::Convergence step 6 value 6.39127e-07
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 648
-DEAL:threaded:cg::Starting value 21.1424
-DEAL:threaded:cg::Convergence step 6 value 6.39130e-07
-DEAL:nothread::Testing FE_Q<3>(1)
-DEAL:nothread::Number of degrees of freedom: 2930
-DEAL:nothread:cg::Starting value 47.1699
-DEAL:nothread:cg::Convergence step 7 value 2.55900e-06
-DEAL:threaded::Testing FE_Q<3>(1)
-DEAL:threaded::Number of degrees of freedom: 2930
-DEAL:threaded:cg::Starting value 47.1699
-DEAL:threaded:cg::Convergence step 7 value 2.55899e-06