]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Take over some changes from step-31.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 28 Oct 2008 19:46:24 +0000 (19:46 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 28 Oct 2008 19:46:24 +0000 (19:46 +0000)
git-svn-id: https://svn.dealii.org/trunk@17377 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/step-32/step-32.cc

index 73415567ba1a27869de2c866239cf517170a718d..cbe3838b69db026449c1b7b96bf6ec779630957e 100644 (file)
@@ -1212,19 +1212,20 @@ void BoussinesqFlowProblem<dim>::solve ()
   pcout << "   Solving..." << std::endl;
 
   {
-    LinearSolvers::InverseMatrix<TrilinosWrappers::SparseMatrix,
-                                TrilinosWrappers::PreconditionIC>
+    const LinearSolvers::InverseMatrix<TrilinosWrappers::SparseMatrix,
+                                      TrilinosWrappers::PreconditionIC>
       mp_inverse (stokes_preconditioner_matrix.block(1,1), *Mp_preconditioner);
 
-    LinearSolvers::BlockSchurPreconditioner<TrilinosWrappers::PreconditionAMG,
-                                            TrilinosWrappers::PreconditionIC>
+    const LinearSolvers::BlockSchurPreconditioner<TrilinosWrappers::PreconditionAMG,
+                                                  TrilinosWrappers::PreconditionIC>
       preconditioner (stokes_matrix, mp_inverse, *Amg_preconditioner);
 
     SolverControl solver_control (stokes_matrix.m(),
                                  1e-6*stokes_rhs.l2_norm());
 
-    SolverGMRES<TrilinosWrappers::MPI::BlockVector> gmres(solver_control,
-      SolverGMRES<TrilinosWrappers::MPI::BlockVector >::AdditionalData(100));
+    SolverGMRES<TrilinosWrappers::MPI::BlockVector>
+      gmres (solver_control,
+            SolverGMRES<TrilinosWrappers::MPI::BlockVector >::AdditionalData(100));
 
     gmres.solve(stokes_matrix, stokes_solution, stokes_rhs, preconditioner);
 
@@ -1244,6 +1245,9 @@ void BoussinesqFlowProblem<dim>::solve ()
              GridTools::minimal_cell_diameter(triangulation) /
               std::max (get_maximal_velocity(), 1.e-5);
   
+  std::cout << "   " << "Time step: " << time_step
+           << std::endl;
+  
   temperature_solution = old_temperature_solution;
 
 
@@ -1465,7 +1469,6 @@ void BoussinesqFlowProblem<dim>::run ()
     {
       pcout << "Timestep " << timestep_number
            << ":  t=" << time
-           << ", dt=" << time_step
            << std::endl;
 
       assemble_stokes_system ();

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.