From: Timo Heister Date: Mon, 17 Jun 2013 15:47:28 +0000 (+0000) Subject: merge from mainline X-Git-Tag: v8.0.0~120^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d993d8f09060c1e1e4c4a20618379fa10eb0b63;p=dealii.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29837 0785d39b-7218-0410-832d-ea1e28bc413d --- 3d993d8f09060c1e1e4c4a20618379fa10eb0b63 diff --cc deal.II/examples/step-32/step-32.cc index c7147c378a,c22c7a0e77..6572532757 --- a/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 solver(solver_control); + SolverCG 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 7b9bea8a5b,6c2abfcbee..ecb7526c0e --- a/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