enable threads in MF GMG test, add additional output

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc
index b02ba242acdfdda073f41d40290ff54f0ef2b9ec..141051e3b7bfb8dc6b19fa605a21d554a70d6fb1 100644 (file)
--- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc
+++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc
@@ -576,7 +576,8 @@ void test ()
 
 int main (int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv, 1);
+  Utilities::MPI::MPI_InitFinalize mpi_init(argc, argv,
+                                            testing_max_num_threads());
 
   mpi_initlog();
   deallog.threshold_double(1e-9);

diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.mpirun=4.output b/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.mpirun=4.output
new file mode 100644 (file)
index 0000000..b984bc4
--- /dev/null
+++ b/tests/matrix_free/parallel_multigrid_adaptive_03.with_mpi=true.with_p4est=true.mpirun=4.output
@@ -0,0 +1,97 @@
+
+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 7.81205e-07
+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 7.81205e-07
+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 9.24482e-07
+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 9.24482e-07
+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.14520e-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.14520e-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 1.55925e-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 1.55925e-06
+DEAL:nothread::Testing FE_Q<2>(3)
+DEAL:nothread::Number of degrees of freedom: 4259
+DEAL:nothread:cg::Starting value 64.2573
+DEAL:nothread:cg::Convergence step 5 value 1.63125e-06
+DEAL:threaded::Testing FE_Q<2>(3)
+DEAL:threaded::Number of degrees of freedom: 4259
+DEAL:threaded:cg::Starting value 64.2573
+DEAL:threaded:cg::Convergence step 5 value 1.63120e-06
+DEAL:nothread::Testing FE_Q<2>(3)
+DEAL:nothread::Number of degrees of freedom: 7457
+DEAL:nothread:cg::Starting value 83.1084
+DEAL:nothread:cg::Convergence step 5 value 7.69258e-06
+DEAL:threaded::Testing FE_Q<2>(3)
+DEAL:threaded::Number of degrees of freedom: 7457
+DEAL:threaded:cg::Starting value 83.1084
+DEAL:threaded:cg::Convergence step 5 value 7.69315e-06
+DEAL:nothread::Testing FE_Q<2>(3)
+DEAL:nothread::Number of degrees of freedom: 18535
+DEAL:nothread:cg::Starting value 130.977
+DEAL:nothread:cg::Convergence step 5 value 6.04397e-06
+DEAL:threaded::Testing FE_Q<2>(3)
+DEAL:threaded::Number of degrees of freedom: 18535
+DEAL:threaded:cg::Starting value 130.977
+DEAL:threaded:cg::Convergence step 5 value 6.04357e-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 3 value 8.40297e-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 3 value 8.40297e-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 1.05183e-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 1.05183e-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 1.64836e-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 1.64836e-06
+DEAL:nothread::Testing FE_Q<3>(2)
+DEAL:nothread::Number of degrees of freedom: 1106
+DEAL:nothread:cg::Starting value 30.8707
+DEAL:nothread:cg::Convergence step 5 value 5.33407e-08
+DEAL:threaded::Testing FE_Q<3>(2)
+DEAL:threaded::Number of degrees of freedom: 1106
+DEAL:threaded:cg::Starting value 30.8707
+DEAL:threaded:cg::Convergence step 5 value 5.33448e-08
+DEAL:nothread::Testing FE_Q<3>(2)
+DEAL:nothread::Number of degrees of freedom: 4268
+DEAL:nothread:cg::Starting value 57.4891
+DEAL:nothread:cg::Convergence step 7 value 1.03521e-06
+DEAL:threaded::Testing FE_Q<3>(2)
+DEAL:threaded::Number of degrees of freedom: 4268
+DEAL:threaded:cg::Starting value 57.4891
+DEAL:threaded:cg::Convergence step 7 value 1.03521e-06