merge from mainline

git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29837 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/examples/step-32/step-32.cc
index c7147c378ad558e727b56cfc9b304bea78a0a606,c22c7a0e778707a8e0c8c5a2a7919e1d49c9f4de..65725327576a35c6321855b5c14777460b02f4ed
--- 1/deal.II/examples/step-32/step-32.cc
--- 2/deal.II/examples/step-32/step-32.cc
+++ b/deal.II/examples/step-32/step-32.cc
@@@ -259,11 -245,11 +259,13 @@@ namespace Step3
          {
            SolverControl solver_control(5000, 1e-6 * src.block(1).l2_norm());
  
 -          SolverCG<TrilinosWrappers::MPI::Vector> solver(solver_control);
 +          SolverCG<LA::MPI::Vector> solver(solver_control);
  
++          std::cout << "begin S"<< src.block(1).l2_norm() << std::endl;
            solver.solve(stokes_preconditioner_matrix->block(1,1),
                         dst.block(1), src.block(1),
                         mp_preconditioner);
++          std::cout << "end S"<< dst.block(1).l2_norm() << std::endl;
  
            dst.block(1) *= -1.0;
          }
@@@ -277,16 -263,12 +279,21 @@@
          if (do_solve_A == true)
            {
              SolverControl solver_control(5000, utmp.l2_norm()*1e-2);
 +#ifdef USE_PETSC_LA
 +            PETScWrappers::SolverCG solver(solver_control, MPI_COMM_WORLD);
 +#else
              TrilinosWrappers::SolverCG solver(solver_control);
 -            solver.solve(stokes_matrix->block(0,0), dst.block(0), utmp,
 +#endif
++std::cout << "begin A "<< dst.block(0).l2_norm() << " " << utmp.l2_norm() << std::endl;
 +            solver.solve(stokes_matrix->block(0, 0), dst.block(0), utmp,
                           a_preconditioner);
++
++std::cout << "end A " <<  dst.block(0).l2_norm() << " " << solver_control.last_step() << std::endl;
            }
          else
            a_preconditioner.vmult (dst.block(0), utmp);
++
++        std::cout << "** " << dst.l2_norm() << " " << dst.block(0).l2_norm() << std::endl;
        }
  
      private:

diff --cc deal.II/examples/step-32/step-32.prm
index 7b9bea8a5bbb07933b5343aa6f4c14706046a652,6c2abfcbee00188e824415b2ff8bb44bbeb5b091..ecb7526c0ef93fa1065c0498b7ea8e27c07e533c
--- 1/deal.II/examples/step-32/step-32.prm
--- 2/deal.II/examples/step-32/step-32.prm
+++ b/deal.II/examples/step-32/step-32.prm
@@@ -13,7 -13,7 +13,7 @@@ set Initial adaptive refinemen
  
  # The number of global refinement steps performed on the initial coarse mesh,
  # before the problem is first solved there.
- set Initial global refinement           = 3
 -set Initial global refinement           = 5
++set Initial global refinement           = 0
  
  # The number of time steps between each generation of graphical output files.
  set Time steps between graphical output = 50