From 1d33180f3ad79f2ed96e5644f13f7f5b82a02c3e Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 5 Nov 2015 09:02:50 -0500
Subject: [PATCH] fix tests

- use std_cxx11::bind instead of std::bind
- require Trilinos if we use it
- fe/bdm_*: do not set matrix entries <1e-14 to zero (different on
different machines) and always print 0 entries
- use check_solver_within_range where needed
---
 tests/fe/bdm_8.cc                             |  19 +-
 tests/fe/bdm_8.output                         | 211 +++++++++---------
 tests/fe/bdm_9.cc                             |  14 +-
 tests/fe/bdm_9.output                         |  25 +--
 .../mpi/cell_weights_01_back_and_forth_01.cc  |  12 +-
 .../mpi/cell_weights_01_back_and_forth_02.cc  |   6 +-
 tests/mpi/cell_weights_02.cc                  |   6 +-
 tests/mpi/cell_weights_03.cc                  |   6 +-
 tests/mpi/cell_weights_04.cc                  |   6 +-
 tests/mpi/cell_weights_05.cc                  |   6 +-
 tests/mpi/cell_weights_06.cc                  |   6 +-
 ...fer_04.with_trilinos=true.mpirun=1.output} |   0
 ...fer_04.with_trilinos=true.mpirun=2.output} |   0
 ....with_trilinos=true.mpirun=1.debug.output} |   0
 ....with_trilinos=true.mpirun=2.debug.output} |   0
 15 files changed, 152 insertions(+), 165 deletions(-)
 rename tests/multigrid/{transfer_04.mpirun=1.output => transfer_04.with_trilinos=true.mpirun=1.output} (100%)
 rename tests/multigrid/{transfer_04.mpirun=2.output => transfer_04.with_trilinos=true.mpirun=2.output} (100%)
 rename tests/multigrid/{transfer_04a.mpirun=1.debug.output => transfer_04a.with_trilinos=true.mpirun=1.debug.output} (100%)
 rename tests/multigrid/{transfer_04a.mpirun=2.debug.output => transfer_04a.with_trilinos=true.mpirun=2.debug.output} (100%)

diff --git a/tests/fe/bdm_8.cc b/tests/fe/bdm_8.cc
index de8f98129d..7ba8dfabcf 100644
--- a/tests/fe/bdm_8.cc
+++ b/tests/fe/bdm_8.cc
@@ -73,26 +73,23 @@ test (const unsigned int degree)
           += (fe.shape_value_component(i,q_point,d) *
               fe.shape_value_component(j,q_point,d) *
               fe.JxW(q_point));
-  for (unsigned int i=0; i<dofs_per_cell; ++i)
-    for (unsigned int j=0; j<dofs_per_cell; ++j)
-      if (std::fabs(mass_matrix(i,j)) < 1e-14)
-        mass_matrix(i,j) = 0;
-  mass_matrix.print_formatted (logfile, 3, false, 0, " ", 1);
+
+  mass_matrix.print_formatted (logfile, 3, false, 0, "0", 1);
 
   SolverControl           solver_control (2*dofs_per_cell,
                                           1e-8);
   PrimitiveVectorMemory<> vector_memory;
-  SolverCG<>              cg (solver_control, vector_memory);
+  SolverCG<>              solver (solver_control, vector_memory);
 
   Vector<double> tmp1(dofs_per_cell), tmp2(dofs_per_cell);
   for (unsigned int i=0; i<dofs_per_cell; ++i)
     tmp1(i) = 1.*Testing::rand()/RAND_MAX;
-  cg.solve (mass_matrix, tmp2, tmp1, PreconditionIdentity());
 
-  deallog << "Degree=" << degree
-          << ": " << solver_control.last_step()
-          << " iterations to obtain convergence."
-          << std::endl;
+  deallog << "solving degree = " << degree << std::endl;
+  check_solver_within_range(
+    solver.solve (mass_matrix, tmp2, tmp1,
+                  PreconditionIdentity()),
+    solver_control.last_step(), 3, 45);
 }
 
 
diff --git a/tests/fe/bdm_8.output b/tests/fe/bdm_8.output
index 0409547b66..42a90f21ab 100644
--- a/tests/fe/bdm_8.output
+++ b/tests/fe/bdm_8.output
@@ -1,117 +1,112 @@
 
-0.208 -0.036 0.058 0.020 0.068             0.068 
--0.036 0.208 0.020 0.058       -0.068 -0.068       
-0.058 0.020 0.208 -0.036       -0.068 -0.068       
-0.020 0.058 -0.036 0.208 0.068             0.068 
-0.068             0.068 0.208 -0.036 0.058 0.020 
-      -0.068 -0.068       -0.036 0.208 0.020 0.058 
-      -0.068 -0.068       0.058 0.020 0.208 -0.036 
-0.068             0.068 0.020 0.058 -0.036 0.208 
-DEAL:cg::Starting value 1.91960
-DEAL:cg::Convergence step 4 value 0
-DEAL::Degree=1: 4 iterations to obtain convergence.
+0.208 -0.036 0.058 0.020 0.068 0.000 0.000 0.068 
+-0.036 0.208 0.020 0.058 0.000 -0.068 -0.068 0.000 
+0.058 0.020 0.208 -0.036 0.000 -0.068 -0.068 0.000 
+0.020 0.058 -0.036 0.208 0.068 0.000 0.000 0.068 
+0.068 0.000 0.000 0.068 0.208 -0.036 0.058 0.020 
+0.000 -0.068 -0.068 0.000 -0.036 0.208 0.020 0.058 
+0.000 -0.068 -0.068 0.000 0.058 0.020 0.208 -0.036 
+0.068 0.000 0.000 0.068 0.020 0.058 -0.036 0.208 
+DEAL::solving degree = 1
+DEAL::Solver stopped within 3 - 45 iterations
 3.262 -2.918 -2.918 0.613 -0.457 -0.457 0.768 -0.598 -0.469 -0.299 0.598 0.469 0.768 -0.469 -0.598 -0.299 0.469 0.598 
--2.918 5.836       -0.457 0.914       -0.469             -0.469             -0.598       1.195 0.598       -1.195 
--2.918       5.836 -0.457       0.914 -0.598 1.195       0.598 -1.195       -0.469             -0.469             
+-2.918 5.836 0.000 -0.457 0.914 0.000 -0.469 0.000 0.000 -0.469 0.000 0.000 -0.598 0.000 1.195 0.598 0.000 -1.195 
+-2.918 0.000 5.836 -0.457 0.000 0.914 -0.598 1.195 0.000 0.598 -1.195 0.000 -0.469 0.000 0.000 -0.469 0.000 0.000 
 0.613 -0.457 -0.457 3.262 -2.918 -2.918 -0.299 0.598 -0.469 -0.170 -0.598 0.469 -0.299 -0.469 0.598 -0.170 0.469 -0.598 
--0.457 0.914       -2.918 5.836       0.469             0.469             0.598       -1.195 -0.598       1.195 
--0.457       0.914 -2.918       5.836 0.598 -1.195       -0.598 1.195       0.469             0.469             
+-0.457 0.914 0.000 -2.918 5.836 0.000 0.469 0.000 0.000 0.469 0.000 0.000 0.598 0.000 -1.195 -0.598 0.000 1.195 
+-0.457 0.000 0.914 -2.918 0.000 5.836 0.598 -1.195 0.000 -0.598 1.195 0.000 0.469 0.000 0.000 0.469 0.000 0.000 
 0.768 -0.469 -0.598 -0.299 0.469 0.598 3.262 -2.918 -2.918 0.613 -0.457 -0.457 0.768 -0.598 -0.469 -0.299 0.598 0.469 
--0.598       1.195 0.598       -1.195 -2.918 5.836       -0.457 0.914       -0.469             -0.469             
--0.469             -0.469             -2.918       5.836 -0.457       0.914 -0.598 1.195       0.598 -1.195       
+-0.598 0.000 1.195 0.598 0.000 -1.195 -2.918 5.836 0.000 -0.457 0.914 0.000 -0.469 0.000 0.000 -0.469 0     0.000 
+-0.469 0.000 0.000 -0.469 0.000 0.000 -2.918 0.000 5.836 -0.457 0.000 0.914 -0.598 1.195 0.000 0.598 -1.195 0.000 
 -0.299 -0.469 0.598 -0.170 0.469 -0.598 0.613 -0.457 -0.457 3.262 -2.918 -2.918 -0.299 0.598 -0.469 -0.170 -0.598 0.469 
-0.598       -1.195 -0.598       1.195 -0.457 0.914       -2.918 5.836       0.469             0.469             
-0.469             0.469             -0.457       0.914 -2.918       5.836 0.598 -1.195       -0.598 1.195       
+0.598 0.000 -1.195 -0.598 0.000 1.195 -0.457 0.914 0.000 -2.918 5.836 0     0.469 0.000 0.000 0.469 0     0.000 
+0.469 0.000 0.000 0.469 0.000 0.000 -0.457 0.000 0.914 -2.918 0     5.836 0.598 -1.195 0     -0.598 1.195 0     
 0.768 -0.598 -0.469 -0.299 0.598 0.469 0.768 -0.469 -0.598 -0.299 0.469 0.598 3.262 -2.918 -2.918 0.613 -0.457 -0.457 
--0.469             -0.469             -0.598       1.195 0.598       -1.195 -2.918 5.836       -0.457 0.914       
--0.598 1.195       0.598 -1.195       -0.469             -0.469             -2.918       5.836 -0.457       0.914 
+-0.469 0.000 0.000 -0.469 0.000 0.000 -0.598 0.000 1.195 0.598 0.000 -1.195 -2.918 5.836 0.000 -0.457 0.914 0.000 
+-0.598 1.195 0.000 0.598 -1.195 0.000 -0.469 0.000 0.000 -0.469 0.000 0     -2.918 0.000 5.836 -0.457 0.000 0.914 
 -0.299 0.598 -0.469 -0.170 -0.598 0.469 -0.299 -0.469 0.598 -0.170 0.469 -0.598 0.613 -0.457 -0.457 3.262 -2.918 -2.918 
-0.469             0.469             0.598       -1.195 -0.598       1.195 -0.457 0.914       -2.918 5.836       
-0.598 -1.195       -0.598 1.195       0.469             0.469             -0.457       0.914 -2.918       5.836 
-DEAL:cg::Starting value 2.31677
-DEAL:cg::Convergence step 11 value 0
-DEAL::Degree=1: 11 iterations to obtain convergence.
-0.105 -0.050 -0.003 0.036 -0.030 -0.013 0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.020       
--0.050 0.169 -0.050 -0.030 0.058 -0.030 -0.002 -0.010 -0.002 0.002 0.010 0.002 -0.090       
--0.003 -0.050 0.105 -0.013 -0.030 0.036 0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.020       
-0.036 -0.030 -0.013 0.105 -0.050 -0.003 -0.004 0.002 -0.004 0.004 -0.002 0.004 -0.020       
--0.030 0.058 -0.030 -0.050 0.169 -0.050 0.002 0.010 0.002 -0.002 -0.010 -0.002 -0.090       
--0.013 -0.030 0.036 -0.003 -0.050 0.105 -0.004 0.002 -0.004 0.004 -0.002 0.004 -0.020       
-0.004 -0.002 0.004 -0.004 0.002 -0.004 0.105 -0.050 -0.003 0.036 -0.030 -0.013       -0.020 
--0.002 -0.010 -0.002 0.002 0.010 0.002 -0.050 0.169 -0.050 -0.030 0.058 -0.030       -0.090 
-0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.003 -0.050 0.105 -0.013 -0.030 0.036       -0.020 
--0.004 0.002 -0.004 0.004 -0.002 0.004 0.036 -0.030 -0.013 0.105 -0.050 -0.003       -0.020 
-0.002 0.010 0.002 -0.002 -0.010 -0.002 -0.030 0.058 -0.030 -0.050 0.169 -0.050       -0.090 
--0.004 0.002 -0.004 0.004 -0.002 0.004 -0.013 -0.030 0.036 -0.003 -0.050 0.105       -0.020 
--0.020 -0.090 -0.020 -0.020 -0.090 -0.020                                     1.195       
-                                    -0.020 -0.090 -0.020 -0.020 -0.090 -0.020       1.195 
-DEAL:cg::Starting value 2.24859
-DEAL:cg::Convergence step 9 value 0.00000
-DEAL::Degree=2: 9 iterations to obtain convergence.
-13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793 1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681 1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 0.164 0.000       
--29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318 -2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -0.879       0.000 
--29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.879 0.000       
-19.696 -39.393 -39.393 78.785 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000       0.000       
+0.469 0.000 0.000 0.469 0.000 0.000 0.598 0     -1.195 -0.598 0     1.195 -0.457 0.914 0.000 -2.918 5.836 0     
+0.598 -1.195 0.000 -0.598 1.195 0.000 0.469 0.000 0.000 0.469 0.000 0     -0.457 0.000 0.914 -2.918 0     5.836 
+DEAL::solving degree = 1
+DEAL::Solver stopped within 3 - 45 iterations
+0.105 -0.050 -0.003 0.036 -0.030 -0.013 0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.020 0.000 
+-0.050 0.169 -0.050 -0.030 0.058 -0.030 -0.002 -0.010 -0.002 0.002 0.010 0.002 -0.090 0.000 
+-0.003 -0.050 0.105 -0.013 -0.030 0.036 0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.020 0.000 
+0.036 -0.030 -0.013 0.105 -0.050 -0.003 -0.004 0.002 -0.004 0.004 -0.002 0.004 -0.020 0.000 
+-0.030 0.058 -0.030 -0.050 0.169 -0.050 0.002 0.010 0.002 -0.002 -0.010 -0.002 -0.090 0.000 
+-0.013 -0.030 0.036 -0.003 -0.050 0.105 -0.004 0.002 -0.004 0.004 -0.002 0.004 -0.020 0.000 
+0.004 -0.002 0.004 -0.004 0.002 -0.004 0.105 -0.050 -0.003 0.036 -0.030 -0.013 0.000 -0.020 
+-0.002 -0.010 -0.002 0.002 0.010 0.002 -0.050 0.169 -0.050 -0.030 0.058 -0.030 0.000 -0.090 
+0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.003 -0.050 0.105 -0.013 -0.030 0.036 0.000 -0.020 
+-0.004 0.002 -0.004 0.004 -0.002 0.004 0.036 -0.030 -0.013 0.105 -0.050 -0.003 0.000 -0.020 
+0.002 0.010 0.002 -0.002 -0.010 -0.002 -0.030 0.058 -0.030 -0.050 0.169 -0.050 0.000 -0.090 
+-0.004 0.002 -0.004 0.004 -0.002 0.004 -0.013 -0.030 0.036 -0.003 -0.050 0.105 0.000 -0.020 
+-0.020 -0.090 -0.020 -0.020 -0.090 -0.020 0.000 0.000 0.000 0.000 0.000 0.000 1.195 0     
+0.000 0.000 0.000 0.000 0.000 0.000 -0.020 -0.090 -0.020 -0.020 -0.090 -0.020 0     1.195 
+DEAL::solving degree = 2
+DEAL::Solver stopped within 3 - 45 iterations
+13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793 1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681 1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 0.164 0.000 0.000 
+-29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318 -2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -0.879 0.000 0.000 
+-29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.879 0.000 0.000 
+19.696 -39.393 -39.393 78.785 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 
 17.582 -103.052 -1.208 0.000 103.052 1.208 6.793 -41.089 -0.549 0.000 41.089 0.549 0.681 -0.659 -1.318 0.000 0.659 1.318 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.769 -0.659 -3.955 0.000 0.659 3.955 -0.769 0.659 3.955 0.000 -0.659 -3.955 0.879 0.000 0.000 
-17.582 -1.208 -103.052 0.000 1.208 103.052 6.793 -0.549 -41.089 0.000 0.549 41.089 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.879 0.000       
-4.028 -9.390 -9.390 3.085 6.793 6.793 13.347 -29.750 -29.750 19.696 17.582 17.582 -1.091 2.351 0.681 0.000 -0.769 -0.681 -0.491 0.813 -0.681 0.000 0.769 0.681 0.491 -0.901 -0.813 3.164 -0.681 -0.769 -0.491 0.901 0.813 -3.164 0.681 0.769 0.164 0.000       
--9.390 46.283 3.634 -6.170 -41.089 -0.549 -29.750 127.389 20.905 -39.393 -103.052 -1.208 2.263 -3.823 -1.318 0.000 0.659 1.318 0.901 -2.505 1.318 0.000 -0.659 -1.318 -0.813 2.505 -0.791 -6.328 0.659 3.955 0.813 -2.505 0.791 6.328 -0.659 -3.955 -0.879       0.000 
--9.390 3.634 46.283 -6.170 -0.549 -41.089 -29.750 20.905 127.389 -39.393 -1.208 -103.052 2.351 -7.119 -0.659 0.000 3.955 0.659 0.813 0.791 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 -0.879 0.000       
-3.085 -6.170 -6.170 12.340 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 -3.164 6.328 0.000 0.000 0.000       0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000       
+17.582 -1.208 -103.052 0.000 1.208 103.052 6.793 -0.549 -41.089 0.000 0.549 41.089 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.879 0.000 0.000 
+4.028 -9.390 -9.390 3.085 6.793 6.793 13.347 -29.750 -29.750 19.696 17.582 17.582 -1.091 2.351 0.681 0.000 -0.769 -0.681 -0.491 0.813 -0.681 0.000 0.769 0.681 0.491 -0.901 -0.813 3.164 -0.681 -0.769 -0.491 0.901 0.813 -3.164 0.681 0.769 0.164 0.000 0.000 
+-9.390 46.283 3.634 -6.170 -41.089 -0.549 -29.750 127.389 20.905 -39.393 -103.052 -1.208 2.263 -3.823 -1.318 0.000 0.659 1.318 0.901 -2.505 1.318 0.000 -0.659 -1.318 -0.813 2.505 -0.791 -6.328 0.659 3.955 0.813 -2.505 0.791 6.328 -0.659 -3.955 -0.879 0.000 0.000 
+-9.390 3.634 46.283 -6.170 -0.549 -41.089 -29.750 20.905 127.389 -39.393 -1.208 -103.052 2.351 -7.119 -0.659 0.000 3.955 0.659 0.813 0.791 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 -0.879 0.000 0.000 
+3.085 -6.170 -6.170 12.340 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 
 6.793 -41.089 -0.549 0.000 41.089 0.549 17.582 -103.052 -1.208 0.000 103.052 1.208 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.681 -0.659 -1.318 0.000 0.659 1.318 -0.769 0.659 3.955 0.000 -0.659 -3.955 0.769 -0.659 -3.955 0.000 0.659 3.955 0.879 0.000 0.000 
-6.793 -0.549 -41.089 0.000 0.549 41.089 17.582 -1.208 -103.052 0.000 1.208 103.052 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 0.879 0.000       
-1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793 1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681       0.164       
--2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318       -0.879 0.000 
--0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659       -0.879 0.000 
-0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 3.164 -6.328 0.000 0.000       0.000                   
-0.769 -0.659 -3.955 0.000 0.659 3.955 -0.769 0.659 3.955 0.000 -0.659 -3.955 17.582 -103.052 -1.208 0.000 103.052 1.208 6.793 -41.089 -0.549 0.000 41.089 0.549 0.681 -0.659 -1.318 0.000 0.659 1.318 -0.681 0.659 1.318 0.000 -0.659 -1.318       0.879       
-0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 17.582 -1.208 -103.052 0.000 1.208 103.052 6.793 -0.549 -41.089 0.000 0.549 41.089 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.769 3.955 0.659 0.000 -3.955 -0.659       0.879 0.000 
-0.491 -0.901 -0.813 3.164 -0.681 -0.769 -0.491 0.901 0.813 -3.164 0.681 0.769 4.028 -9.390 -9.390 3.085 6.793 6.793 13.347 -29.750 -29.750 19.696 17.582 17.582 -1.091 2.351 0.681 0.000 -0.769 -0.681 -0.491 0.813 -0.681 0.000 0.769 0.681       0.164       
--0.813 2.505 -0.791 -6.328 0.659 3.955 0.813 -2.505 0.791 6.328 -0.659 -3.955 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -29.750 127.389 20.905 -39.393 -103.052 -1.208 2.263 -3.823 -1.318 0.000 0.659 1.318 0.901 -2.505 1.318 0.000 -0.659 -1.318       -0.879       
-0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -29.750 20.905 127.389 -39.393 -1.208 -103.052 2.351 -7.119 -0.659 0.000 3.955 0.659 0.813 0.791 0.659 0.000 -3.955 -0.659       -0.879 0.000 
-0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000                   
--0.769 0.659 3.955 0.000 -0.659 -3.955 0.769 -0.659 -3.955 0.000 0.659 3.955 6.793 -41.089 -0.549 0.000 41.089 0.549 17.582 -103.052 -1.208 0.000 103.052 1.208 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.681 -0.659 -1.318 0.000 0.659 1.318       0.879       
--0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659       1.318 0.659 6.793 -0.549 -41.089 0.000 0.549 41.089 17.582 -1.208 -103.052 0.000 1.208 103.052 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.769 -3.955 -0.659 0.000 3.955 0.659       0.879 0.000 
-1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681 1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793             0.164 
--2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318 -2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 0.000       -0.879 
--2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089             -0.879 
-3.164 -6.328 0.000 0.000 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000                   
-0.681 -0.659 -1.318 0.000 0.659 1.318 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.769 -0.659 -3.955 0.000 0.659 3.955 -0.769 0.659 3.955 0.000 -0.659 -3.955 17.582 -103.052 -1.208 0.000 103.052 1.208 6.793 -41.089 -0.549 0.000 41.089 0.549             0.879 
-0.769 -3.955 -0.659 0.000 3.955 0.659 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 17.582 -1.208 -103.052 0.000 1.208 103.052 6.793 -0.549 -41.089 0.000 0.549 41.089             0.879 
--1.091 2.351 0.681 0.000 -0.769 -0.681 -0.491 0.813 -0.681 0.000 0.769 0.681 0.491 -0.901 -0.813 3.164 -0.681 -0.769 -0.491 0.901 0.813 -3.164 0.681 0.769 4.028 -9.390 -9.390 3.085 6.793 6.793 13.347 -29.750 -29.750 19.696 17.582 17.582             0.164 
-2.263 -3.823 -1.318 0.000 0.659 1.318 0.901 -2.505 1.318 0.000 -0.659 -1.318 -0.813 2.505 -0.791 -6.328 0.659 3.955 0.813 -2.505 0.791 6.328 -0.659 -3.955 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -29.750 127.389 20.905 -39.393 -103.052 -1.208             -0.879 
-2.351 -7.119 -0.659 0.000 3.955 0.659 0.813 0.791 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -29.750 20.905 127.389 -39.393 -1.208 -103.052             -0.879 
--3.164 6.328 0.000 0.000 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000                   
--0.681 0.659 1.318 0.000 -0.659 -1.318 0.681 -0.659 -1.318 0.000 0.659 1.318 -0.769 0.659 3.955       -0.659 -3.955 0.769 -0.659 -3.955 0.000 0.659 3.955 6.793 -41.089 -0.549 0.000 41.089 0.549 17.582 -103.052 -1.208 0.000 103.052 1.208             0.879 
--0.769 3.955 0.659 0.000 -3.955 -0.659 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 6.793 -0.549 -41.089 0.000 0.549 41.089 17.582 -1.208 -103.052 0.000 1.208 103.052             0.879 
-0.164 -0.879 -0.879       0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879                                                                               0.000                                                             1.195             
-0.000       0.000 0.000 0.000 0.000 0.000       0.000 0.000 0.000 0.000 0.164 -0.879 -0.879       0.879 0.879 0.164 -0.879 -0.879       0.879 0.879                                                                               1.195       
-      0.000             0.000             0.000             0.000             0.000 0.000             0.000             0.000             0.000 0.164 -0.879 -0.879       0.879 0.879 0.164 -0.879 -0.879       0.879 0.879             1.195 
-DEAL:cg::Starting value 3.79719
-DEAL:cg::Convergence step 40 value 0.00000
-DEAL::Degree=2: 40 iterations to obtain convergence.
-0.072 -0.058 0.015 0.002 0.016 -0.031 0.001 0.011 0.000 0.000 0.001             0.001 0.000 0.000 -0.040 0.084 -0.016 -0.006             
--0.058 0.151 -0.056 0.015 -0.031 0.067 -0.039 0.001 0.000 -0.002       -0.001 -0.001       -0.002 0.000 -0.404 0.224 0.468 0.016             
-0.015 -0.056 0.151 -0.058 0.001 -0.039 0.067 -0.031 0.001       0.002 0.000 0.000 0.002       0.001 0.064 0.224 -0.468 -0.016             
-0.002 0.015 -0.058 0.072 0.011 0.001 -0.031 0.016       -0.001 0.000 0.000 0.000 0.000 -0.001       -0.057 0.084 0.016 0.006             
-0.016 -0.031 0.001 0.011 0.072 -0.058 0.015 0.002       -0.001 0.000 0.000 0.000 0.000 -0.001       0.043 -0.084 -0.016 0.006             
--0.031 0.067 -0.039 0.001 -0.058 0.151 -0.056 0.015 0.001       0.002 0.000 0.000 0.002       0.001 -0.180 -0.224 0.468 -0.016             
-0.001 -0.039 0.067 -0.031 0.015 -0.056 0.151 -0.058 0.000 -0.002       -0.001 -0.001       -0.002 0.000 0.288 -0.224 -0.468 0.016             
-0.011 0.001 -0.031 0.016 0.002 0.015 -0.058 0.072 0.000 0.000 0.001             0.001 0.000 0.000 0.027 -0.084 0.016 -0.006             
-0.000 0.000 0.001             0.001 0.000 0.000 0.072 -0.058 0.015 0.002 0.016 -0.031 0.001 0.011 -0.006             -0.040 -0.016 0.084 
-0.000 -0.002       -0.001 -0.001       -0.002 0.000 -0.058 0.151 -0.056 0.015 -0.031 0.067 -0.039 0.001 0.016             -0.404 0.468 0.224 
-0.001       0.002 0.000 0.000 0.002       0.001 0.015 -0.056 0.151 -0.058 0.001 -0.039 0.067 -0.031 -0.016             0.064 -0.468 0.224 
-      -0.001 0.000 0.000 0.000 0.000 -0.001       0.002 0.015 -0.058 0.072 0.011 0.001 -0.031 0.016 0.006             -0.057 0.016 0.084 
-      -0.001 0.000 0.000 0.000 0.000 -0.001       0.016 -0.031 0.001 0.011 0.072 -0.058 0.015 0.002 0.006             0.043 -0.016 -0.084 
-0.001       0.002 0.000 0.000 0.002       0.001 -0.031 0.067 -0.039 0.001 -0.058 0.151 -0.056 0.015 -0.016             -0.180 0.468 -0.224 
-0.000 -0.002       -0.001 -0.001       -0.002 0.000 0.001 -0.039 0.067 -0.031 0.015 -0.056 0.151 -0.058 0.016             0.288 -0.468 -0.224 
-0.000 0.000 0.001             0.001 0.000 0.000 0.011 0.001 -0.031 0.016 0.002 0.015 -0.058 0.072 -0.006             0.027 0.016 -0.084 
--0.040 -0.404 0.064 -0.057 0.043 -0.180 0.288 0.027 -0.006 0.016 -0.016 0.006 0.006 -0.016 0.016 -0.006 9.185 -7.910 -8.068                   
-0.084 0.224 0.224 0.084 -0.084 -0.224 -0.224 -0.084                                                 -7.910 15.820                         
--0.016 0.468 -0.468 0.016 -0.016 0.468 -0.468 0.016                                                 -8.068       16.137                   
--0.006 0.016 -0.016 0.006 0.006 -0.016 0.016 -0.006 -0.040 -0.404 0.064 -0.057 0.043 -0.180 0.288 0.027                   9.185 -8.068 -7.910 
-                                                -0.016 0.468 -0.468 0.016 -0.016 0.468 -0.468 0.016                   -8.068 16.137       
-                                                0.084 0.224 0.224 0.084 -0.084 -0.224 -0.224 -0.084                   -7.910       15.820 
-DEAL:cg::Starting value 3.10915
-DEAL:cg::Convergence step 14 value 0.00000
-DEAL::Degree=3: 14 iterations to obtain convergence.
+6.793 -0.549 -41.089 0.000 0.549 41.089 17.582 -1.208 -103.052 0.000 1.208 103.052 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 0.879 0.000 0.000 
+1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793 1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681 0.000 0.164 0.000 
+-2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318 0.000 -0.879 0.000 
+-0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659 0.000 -0.879 0.000 
+0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 
+0.769 -0.659 -3.955 0.000 0.659 3.955 -0.769 0.659 3.955 0.000 -0.659 -3.955 17.582 -103.052 -1.208 0.000 103.052 1.208 6.793 -41.089 -0.549 0.000 41.089 0.549 0.681 -0.659 -1.318 0.000 0.659 1.318 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.000 0.879 0.000 
+0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 17.582 -1.208 -103.052 0.000 1.208 103.052 6.793 -0.549 -41.089 0.000 0.549 41.089 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.000 0.879 0.000 
+0.491 -0.901 -0.813 3.164 -0.681 -0.769 -0.491 0.901 0.813 -3.164 0.681 0.769 4.028 -9.390 -9.390 3.085 6.793 6.793 13.347 -29.750 -29.750 19.696 17.582 17.582 -1.091 2.351 0.681 0.000 -0.769 -0.681 -0.491 0.813 -0.681 0.000 0.769 0.681 0.000 0.164 0.000 
+-0.813 2.505 -0.791 -6.328 0.659 3.955 0.813 -2.505 0.791 6.328 -0.659 -3.955 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -29.750 127.389 20.905 -39.393 -103.052 -1.208 2.263 -3.823 -1.318 0.000 0.659 1.318 0.901 -2.505 1.318 0.000 -0.659 -1.318 0.000 -0.879 0.000 
+0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -29.750 20.905 127.389 -39.393 -1.208 -103.052 2.351 -7.119 -0.659 0.000 3.955 0.659 0.813 0.791 0.659 0.000 -3.955 -0.659 0.000 -0.879 0.000 
+0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 
+-0.769 0.659 3.955 0.000 -0.659 -3.955 0.769 -0.659 -3.955 0.000 0.659 3.955 6.793 -41.089 -0.549 0.000 41.089 0.549 17.582 -103.052 -1.208 0.000 103.052 1.208 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.681 -0.659 -1.318 0.000 0.659 1.318 0.000 0.879 0.000 
+-0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 6.793 -0.549 -41.089 0.000 0.549 41.089 17.582 -1.208 -103.052 0.000 1.208 103.052 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.769 -3.955 -0.659 0.000 3.955 0.659 0.000 0.879 0.000 
+1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681 1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793 0.000 0.000 0.164 
+-2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318 -2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 0.000 0.000 -0.879 
+-2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089 0.000 0.000 -0.879 
+3.164 -6.328 0.000 0.000 0.000 0.000 3.164 -6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 0.000 0.000 0.000 
+0.681 -0.659 -1.318 0.000 0.659 1.318 -0.681 0.659 1.318 0.000 -0.659 -1.318 0.769 -0.659 -3.955 0.000 0.659 3.955 -0.769 0.659 3.955 0.000 -0.659 -3.955 17.582 -103.052 -1.208 0.000 103.052 1.208 6.793 -41.089 -0.549 0.000 41.089 0.549 0.000 0.000 0.879 
+0.769 -3.955 -0.659 0.000 3.955 0.659 -0.769 3.955 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 17.582 -1.208 -103.052 0.000 1.208 103.052 6.793 -0.549 -41.089 0.000 0.549 41.089 0.000 0.000 0.879 
+-1.091 2.351 0.681 0.000 -0.769 -0.681 -0.491 0.813 -0.681 0.000 0.769 0.681 0.491 -0.901 -0.813 3.164 -0.681 -0.769 -0.491 0.901 0.813 -3.164 0.681 0.769 4.028 -9.390 -9.390 3.085 6.793 6.793 13.347 -29.750 -29.750 19.696 17.582 17.582 0.000 0.000 0.164 
+2.263 -3.823 -1.318 0.000 0.659 1.318 0.901 -2.505 1.318 0.000 -0.659 -1.318 -0.813 2.505 -0.791 -6.328 0.659 3.955 0.813 -2.505 0.791 6.328 -0.659 -3.955 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -29.750 127.389 20.905 -39.393 -103.052 -1.208 0.000 0.000 -0.879 
+2.351 -7.119 -0.659 0.000 3.955 0.659 0.813 0.791 0.659 0.000 -3.955 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -29.750 20.905 127.389 -39.393 -1.208 -103.052 0.000 0.000 -0.879 
+-3.164 6.328 0.000 0.000 0.000 0.000 -3.164 6.328 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 3.085 -6.170 -6.170 12.340 0.000 0.000 19.696 -39.393 -39.393 78.785 0.000 0.000 0.000 0.000 0.000 
+-0.681 0.659 1.318 0.000 -0.659 -1.318 0.681 -0.659 -1.318 0.000 0.659 1.318 -0.769 0.659 3.955 0.000 -0.659 -3.955 0.769 -0.659 -3.955 0.000 0.659 3.955 6.793 -41.089 -0.549 0.000 41.089 0.549 17.582 -103.052 -1.208 0.000 103.052 1.208 0.000 0.000 0.879 
+-0.769 3.955 0.659 0.000 -3.955 -0.659 0.769 -3.955 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 6.793 -0.549 -41.089 0.000 0.549 41.089 17.582 -1.208 -103.052 0.000 1.208 103.052 0.000 0.000 0.879 
+0.164 -0.879 -0.879 0.000 0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.195 0.000 0.000 
+0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.164 -0.879 -0.879 0.000 0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.195 0.000 
+0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.164 -0.879 -0.879 0.000 0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879 0.000 0.000 1.195 
+DEAL::solving degree = 2
+DEAL::Solver stopped within 3 - 45 iterations
+0.072 -0.058 0.015 0.002 0.016 -0.031 0.001 0.011 0.000 0.000 0.001 0.000 0.000 0.001 0.000 0.000 -0.040 0.084 -0.016 -0.006 0.000 0.000 
+-0.058 0.151 -0.056 0.015 -0.031 0.067 -0.039 0.001 0.000 -0.002 0.000 -0.001 -0.001 0.000 -0.002 0.000 -0.404 0.224 0.468 0.016 0.000 0.000 
+0.015 -0.056 0.151 -0.058 0.001 -0.039 0.067 -0.031 0.001 0.000 0.002 0.000 0.000 0.002 0.000 0.001 0.064 0.224 -0.468 -0.016 0.000 0.000 
+0.002 0.015 -0.058 0.072 0.011 0.001 -0.031 0.016 0.000 -0.001 0.000 0.000 0.000 0.000 -0.001 0.000 -0.057 0.084 0.016 0.006 0.000 0.000 
+0.016 -0.031 0.001 0.011 0.072 -0.058 0.015 0.002 0.000 -0.001 0.000 0.000 0.000 0.000 -0.001 0.000 0.043 -0.084 -0.016 0.006 0.000 0.000 
+-0.031 0.067 -0.039 0.001 -0.058 0.151 -0.056 0.015 0.001 0.000 0.002 0.000 0.000 0.002 0.000 0.001 -0.180 -0.224 0.468 -0.016 0.000 0.000 
+0.001 -0.039 0.067 -0.031 0.015 -0.056 0.151 -0.058 0.000 -0.002 0.000 -0.001 -0.001 0.000 -0.002 0.000 0.288 -0.224 -0.468 0.016 0.000 0.000 
+0.011 0.001 -0.031 0.016 0.002 0.015 -0.058 0.072 0.000 0.000 0.001 0.000 0.000 0.001 0.000 0.000 0.027 -0.084 0.016 -0.006 0.000 0.000 
+0.000 0.000 0.001 0.000 0.000 0.001 0.000 0.000 0.072 -0.058 0.015 0.002 0.016 -0.031 0.001 0.011 -0.006 0.000 0.000 -0.040 -0.016 0.084 
+0.000 -0.002 0.000 -0.001 -0.001 0.000 -0.002 0.000 -0.058 0.151 -0.056 0.015 -0.031 0.067 -0.039 0.001 0.016 0.000 0.000 -0.404 0.468 0.224 
+0.001 0.000 0.002 0.000 0.000 0.002 0.000 0.001 0.015 -0.056 0.151 -0.058 0.001 -0.039 0.067 -0.031 -0.016 0.000 0.000 0.064 -0.468 0.224 
+0.000 -0.001 0.000 0.000 0.000 0.000 -0.001 0.000 0.002 0.015 -0.058 0.072 0.011 0.001 -0.031 0.016 0.006 0.000 0.000 -0.057 0.016 0.084 
+0.000 -0.001 0.000 0.000 0.000 0.000 -0.001 0.000 0.016 -0.031 0.001 0.011 0.072 -0.058 0.015 0.002 0.006 0.000 0.000 0.043 -0.016 -0.084 
+0.001 0.000 0.002 0.000 0.000 0.002 0.000 0.001 -0.031 0.067 -0.039 0.001 -0.058 0.151 -0.056 0.015 -0.016 0.000 0.000 -0.180 0.468 -0.224 
+0.000 -0.002 0.000 -0.001 -0.001 0.000 -0.002 0.000 0.001 -0.039 0.067 -0.031 0.015 -0.056 0.151 -0.058 0.016 0.000 0.000 0.288 -0.468 -0.224 
+0.000 0.000 0.001 0.000 0.000 0.001 0.000 0.000 0.011 0.001 -0.031 0.016 0.002 0.015 -0.058 0.072 -0.006 0.000 0.000 0.027 0.016 -0.084 
+-0.040 -0.404 0.064 -0.057 0.043 -0.180 0.288 0.027 -0.006 0.016 -0.016 0.006 0.006 -0.016 0.016 -0.006 9.185 -7.910 -8.068 0.000 0.000 0.000 
+0.084 0.224 0.224 0.084 -0.084 -0.224 -0.224 -0.084 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 -7.910 15.820 0.000 0.000 0.000 0.000 
+-0.016 0.468 -0.468 0.016 -0.016 0.468 -0.468 0.016 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 -8.068 0.000 16.137 0.000 0     0.000 
+-0.006 0.016 -0.016 0.006 0.006 -0.016 0.016 -0.006 -0.040 -0.404 0.064 -0.057 0.043 -0.180 0.288 0.027 0.000 0.000 0.000 9.185 -8.068 -7.910 
+0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 -0.016 0.468 -0.468 0.016 -0.016 0.468 -0.468 0.016 0.000 0.000 0     -8.068 16.137 0.000 
+0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.084 0.224 0.224 0.084 -0.084 -0.224 -0.224 -0.084 0.000 0.000 0.000 -7.910 0.000 15.820 
+DEAL::solving degree = 3
+DEAL::Solver stopped within 3 - 45 iterations
diff --git a/tests/fe/bdm_9.cc b/tests/fe/bdm_9.cc
index 8a606c6f6a..3d38b31a06 100644
--- a/tests/fe/bdm_9.cc
+++ b/tests/fe/bdm_9.cc
@@ -68,22 +68,22 @@ test (const unsigned int degree)
 
   MatrixTools::create_mass_matrix (dof, q, mass_matrix);
 
-  mass_matrix.print_formatted (logfile, 3, false, 0, " ", 1);
+  mass_matrix.print_formatted (logfile, 3, false, 0, "0", 1);
 
   SolverControl           solver_control (3*dofs_per_cell,
                                           1e-8);
   PrimitiveVectorMemory<> vector_memory;
-  SolverCG<>              cg (solver_control, vector_memory);
+  SolverCG<>              solver (solver_control, vector_memory);
 
   Vector<double> tmp1(dofs_per_cell), tmp2(dofs_per_cell);
   for (unsigned int i=0; i<dofs_per_cell; ++i)
     tmp1(i) = 1.*Testing::rand()/RAND_MAX;
-  cg.solve (mass_matrix, tmp2, tmp1, PreconditionIdentity());
 
-  deallog << "Degree=" << degree
-          << ": " << solver_control.last_step()
-          << " iterations to obtain convergence."
-          << std::endl;
+  deallog << "solving degree = " << degree << std::endl;
+  check_solver_within_range(
+    solver.solve (mass_matrix, tmp2, tmp1,
+                  PreconditionIdentity()),
+    solver_control.last_step(), 3, 45);
 }
 
 
diff --git a/tests/fe/bdm_9.output b/tests/fe/bdm_9.output
index 3db37251ab..c7d97f8d0d 100644
--- a/tests/fe/bdm_9.output
+++ b/tests/fe/bdm_9.output
@@ -7,9 +7,8 @@
 0.000 -0.068 -0.068 0.000 -0.036 0.208 0.020 0.058 
 0.000 -0.068 -0.068 0.000 0.058 0.020 0.208 -0.036 
 0.068 0.000 0.000 0.068 0.020 0.058 -0.036 0.208 
-DEAL:cg::Starting value 1.92
-DEAL:cg::Convergence step 4 value 0
-DEAL::Degree=1: 4 iterations to obtain convergence.
+DEAL::solving degree = 1
+DEAL::Solver stopped within 3 - 45 iterations
 3.262 -2.918 -2.918 0.613 -0.457 -0.457 0.768 -0.598 -0.469 -0.299 0.598 0.469 0.768 -0.469 -0.598 -0.299 0.469 0.598 
 -2.918 5.836 0.000 -0.457 0.914 0.000 -0.469 0.000 0.000 -0.469 0.000 0.000 -0.598 0.000 1.195 0.598 0.000 -1.195 
 -2.918 0.000 5.836 -0.457 0.000 0.914 -0.598 1.195 0.000 0.598 -1.195 0.000 -0.469 0.000 0.000 -0.469 0.000 0.000 
@@ -28,9 +27,8 @@ DEAL::Degree=1: 4 iterations to obtain convergence.
 -0.299 0.598 -0.469 -0.170 -0.598 0.469 -0.299 -0.469 0.598 -0.170 0.469 -0.598 0.613 -0.457 -0.457 3.262 -2.918 -2.918 
 0.469 0.000 0.000 0.469 0.000 0.000 0.598 0.000 -1.195 -0.598 0.000 1.195 -0.457 0.914 0.000 -2.918 5.836 0.000 
 0.598 -1.195 0.000 -0.598 1.195 0.000 0.469 0.000 0.000 0.469 0.000 0.000 -0.457 0.000 0.914 -2.918 0.000 5.836 
-DEAL:cg::Starting value 2.32
-DEAL:cg::Convergence step 11 value 0
-DEAL::Degree=1: 11 iterations to obtain convergence.
+DEAL::solving degree = 1
+DEAL::Solver stopped within 3 - 45 iterations
 0.105 -0.050 -0.003 0.036 -0.030 -0.013 0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.020 0.000 
 -0.050 0.169 -0.050 -0.030 0.058 -0.030 -0.002 -0.010 -0.002 0.002 0.010 0.002 -0.090 0.000 
 -0.003 -0.050 0.105 -0.013 -0.030 0.036 0.004 -0.002 0.004 -0.004 0.002 -0.004 -0.020 0.000 
@@ -45,9 +43,8 @@ DEAL::Degree=1: 11 iterations to obtain convergence.
 -0.004 0.002 -0.004 0.004 -0.002 0.004 -0.013 -0.030 0.036 -0.003 -0.050 0.105 0.000 -0.020 
 -0.020 -0.090 -0.020 -0.020 -0.090 -0.020 0.000 0.000 0.000 0.000 0.000 0.000 1.195 0.000 
 0.000 0.000 0.000 0.000 0.000 0.000 -0.020 -0.090 -0.020 -0.020 -0.090 -0.020 0.000 1.195 
-DEAL:cg::Starting value 2.25
-DEAL:cg::Convergence step 10 value 0
-DEAL::Degree=2: 10 iterations to obtain convergence.
+DEAL::solving degree = 2
+DEAL::Solver stopped within 3 - 45 iterations
 13.347 -29.750 -29.750 19.696 17.582 17.582 4.028 -9.390 -9.390 3.085 6.793 6.793 1.091 -2.351 -0.681 0.000 0.769 0.681 0.491 -0.813 0.681 0.000 -0.769 -0.681 1.091 -2.263 -2.351 3.164 0.681 0.769 -1.091 2.263 2.351 -3.164 -0.681 -0.769 0.164 0.000 0.000 
 -29.750 127.389 20.905 -39.393 -103.052 -1.208 -9.390 46.283 3.634 -6.170 -41.089 -0.549 -2.263 3.823 1.318 0.000 -0.659 -1.318 -0.901 2.505 -1.318 0.000 0.659 1.318 -2.351 3.823 7.119 -6.328 -0.659 -3.955 2.351 -3.823 -7.119 6.328 0.659 3.955 -0.879 0.000 0.000 
 -29.750 20.905 127.389 -39.393 -1.208 -103.052 -9.390 3.634 46.283 -6.170 -0.549 -41.089 -2.351 7.119 0.659 0.000 -3.955 -0.659 -0.813 -0.791 -0.659 0.000 3.955 0.659 -0.681 1.318 0.659 0.000 -1.318 -0.659 0.681 -1.318 -0.659 0.000 1.318 0.659 -0.879 0.000 0.000 
@@ -87,9 +84,8 @@ DEAL::Degree=2: 10 iterations to obtain convergence.
 0.164 -0.879 -0.879 0.000 0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.195 0.000 0.000 
 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.164 -0.879 -0.879 0.000 0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 1.195 0.000 
 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.164 -0.879 -0.879 0.000 0.879 0.879 0.164 -0.879 -0.879 0.000 0.879 0.879 0.000 0.000 1.195 
-DEAL:cg::Starting value 3.80
-DEAL:cg::Convergence step 40 value 0.00
-DEAL::Degree=2: 40 iterations to obtain convergence.
+DEAL::solving degree = 2
+DEAL::Solver stopped within 3 - 45 iterations
 0.072 -0.058 0.015 0.002 0.016 -0.031 0.001 0.011 0.000 0.000 0.001 0.000 0.000 0.001 0.000 0.000 -0.040 0.084 -0.016 -0.006 0.000 0.000 
 -0.058 0.151 -0.056 0.015 -0.031 0.067 -0.039 0.001 0.000 -0.002 0.000 -0.001 -0.001 0.000 -0.002 0.000 -0.404 0.224 0.468 0.016 0.000 0.000 
 0.015 -0.056 0.151 -0.058 0.001 -0.039 0.067 -0.031 0.001 0.000 0.002 0.000 0.000 0.002 0.000 0.001 0.064 0.224 -0.468 -0.016 0.000 0.000 
@@ -112,6 +108,5 @@ DEAL::Degree=2: 40 iterations to obtain convergence.
 -0.006 0.016 -0.016 0.006 0.006 -0.016 0.016 -0.006 -0.040 -0.404 0.064 -0.057 0.043 -0.180 0.288 0.027 0.000 0.000 0.000 9.185 -8.068 -7.910 
 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 -0.016 0.468 -0.468 0.016 -0.016 0.468 -0.468 0.016 0.000 0.000 0.000 -8.068 16.137 0.000 
 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.084 0.224 0.224 0.084 -0.084 -0.224 -0.224 -0.084 0.000 0.000 0.000 -7.910 0.000 15.820 
-DEAL:cg::Starting value 3.11
-DEAL:cg::Convergence step 14 value 0.00
-DEAL::Degree=3: 14 iterations to obtain convergence.
+DEAL::solving degree = 3
+DEAL::Solver stopped within 3 - 45 iterations
diff --git a/tests/mpi/cell_weights_01_back_and_forth_01.cc b/tests/mpi/cell_weights_01_back_and_forth_01.cc
index c3befbb39b..b2ab5acbc7 100644
--- a/tests/mpi/cell_weights_01_back_and_forth_01.cc
+++ b/tests/mpi/cell_weights_01_back_and_forth_01.cc
@@ -71,16 +71,16 @@ void test()
 
   // repartition the mesh as described above, first in some arbitrary
   // way, and then with all equal weights
-  tr.signals.cell_weight.connect(std::bind(&cell_weight_1<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight_1<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
   tr.repartition();
 
   tr.signals.cell_weight.disconnect_all_slots();
 
-  tr.signals.cell_weight.connect(std::bind(&cell_weight_2<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight_2<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
   tr.repartition();
 
 
diff --git a/tests/mpi/cell_weights_01_back_and_forth_02.cc b/tests/mpi/cell_weights_01_back_and_forth_02.cc
index 6486bb8dd2..85046d0850 100644
--- a/tests/mpi/cell_weights_01_back_and_forth_02.cc
+++ b/tests/mpi/cell_weights_01_back_and_forth_02.cc
@@ -61,9 +61,9 @@ void test()
 
   // repartition the mesh as described above, first in some arbitrary
   // way, and then with no weights
-  tr.signals.cell_weight.connect(std::bind(&cell_weight_1<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight_1<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
   tr.repartition();
 
   tr.signals.cell_weight.disconnect_all_slots();
diff --git a/tests/mpi/cell_weights_02.cc b/tests/mpi/cell_weights_02.cc
index 9be95619af..d1e54904f4 100644
--- a/tests/mpi/cell_weights_02.cc
+++ b/tests/mpi/cell_weights_02.cc
@@ -53,9 +53,9 @@ void test()
 
   GridGenerator::subdivided_hyper_cube(tr, 16);
 
-  tr.signals.cell_weight.connect(std::bind(&cell_weight<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
   tr.refine_global(1);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
diff --git a/tests/mpi/cell_weights_03.cc b/tests/mpi/cell_weights_03.cc
index 8b124c5053..2806b13b6c 100644
--- a/tests/mpi/cell_weights_03.cc
+++ b/tests/mpi/cell_weights_03.cc
@@ -64,9 +64,9 @@ void test()
 
   tr.refine_global(1);
 
-  tr.signals.cell_weight.connect(std::bind(&cell_weight<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
 
   tr.repartition();
 
diff --git a/tests/mpi/cell_weights_04.cc b/tests/mpi/cell_weights_04.cc
index 64de6a11fa..0be7901f23 100644
--- a/tests/mpi/cell_weights_04.cc
+++ b/tests/mpi/cell_weights_04.cc
@@ -59,9 +59,9 @@ void test()
 
   GridGenerator::subdivided_hyper_cube(tr, 16);
 
-  tr.signals.cell_weight.connect(std::bind(&cell_weight<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
 
   tr.refine_global(1);
 
diff --git a/tests/mpi/cell_weights_05.cc b/tests/mpi/cell_weights_05.cc
index 7d4865799f..547bc9de95 100644
--- a/tests/mpi/cell_weights_05.cc
+++ b/tests/mpi/cell_weights_05.cc
@@ -79,9 +79,9 @@ void test()
 
 
   // repartition the mesh; attach different weights to all cells
-  tr.signals.cell_weight.connect(std::bind(&cell_weight<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
 
   tr.repartition ();
 
diff --git a/tests/mpi/cell_weights_06.cc b/tests/mpi/cell_weights_06.cc
index 55386a5dfb..9d5c095f8e 100644
--- a/tests/mpi/cell_weights_06.cc
+++ b/tests/mpi/cell_weights_06.cc
@@ -79,9 +79,9 @@ void test()
 
   // repartition the mesh; attach different weights to all cells
   n_global_active_cells = tr.n_global_active_cells();
-  tr.signals.cell_weight.connect(std::bind(&cell_weight<dim>,
-                                           std_cxx11::_1,
-                                           std_cxx11::_2));
+  tr.signals.cell_weight.connect(std_cxx11::bind(&cell_weight<dim>,
+                                                 std_cxx11::_1,
+                                                 std_cxx11::_2));
   tr.repartition ();
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
diff --git a/tests/multigrid/transfer_04.mpirun=1.output b/tests/multigrid/transfer_04.with_trilinos=true.mpirun=1.output
similarity index 100%
rename from tests/multigrid/transfer_04.mpirun=1.output
rename to tests/multigrid/transfer_04.with_trilinos=true.mpirun=1.output
diff --git a/tests/multigrid/transfer_04.mpirun=2.output b/tests/multigrid/transfer_04.with_trilinos=true.mpirun=2.output
similarity index 100%
rename from tests/multigrid/transfer_04.mpirun=2.output
rename to tests/multigrid/transfer_04.with_trilinos=true.mpirun=2.output
diff --git a/tests/multigrid/transfer_04a.mpirun=1.debug.output b/tests/multigrid/transfer_04a.with_trilinos=true.mpirun=1.debug.output
similarity index 100%
rename from tests/multigrid/transfer_04a.mpirun=1.debug.output
rename to tests/multigrid/transfer_04a.with_trilinos=true.mpirun=1.debug.output
diff --git a/tests/multigrid/transfer_04a.mpirun=2.debug.output b/tests/multigrid/transfer_04a.with_trilinos=true.mpirun=2.debug.output
similarity index 100%
rename from tests/multigrid/transfer_04a.mpirun=2.debug.output
rename to tests/multigrid/transfer_04a.with_trilinos=true.mpirun=2.debug.output
-- 
2.39.5