]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Introduce some dummy Trilinos structures in case we compile this program with an...
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Sep 2008 19:01:36 +0000 (19:01 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Sep 2008 19:01:36 +0000 (19:01 +0000)
git-svn-id: https://svn.dealii.org/trunk@16739 0785d39b-7218-0410-832d-ea1e28bc413d

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

index a7f8f66ec8370b0122313fb5b10bf6f3d18c3361..fdb5af5987179dbd7ab04eb79a41e59cc7ec4e92 100644 (file)
@@ -20,6 +20,7 @@
 #include <base/logstream.h>
 #include <base/function.h>
 #include <base/utilities.h>
+#include <base/timer.h>
 
 #include <lac/full_matrix.h>
 #include <lac/solver_gmres.h>
 #include <numerics/error_estimator.h>
 #include <numerics/solution_transfer.h>
 
-#include <Epetra_SerialComm.h>
+#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+#  include <Epetra_MpiComm.h>
+#else
+#  include <Epetra_SerialComm.h>
+#endif
 #include <Epetra_Map.h>
 
 #include <fstream>
@@ -520,7 +525,11 @@ class BoussinesqFlowProblem
                      const double                        old_time_step);
 
 
+#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+    Epetra_MpiComm                      trilinos_communicator;
+#else
     Epetra_SerialComm                   trilinos_communicator;
+#endif
 
     Triangulation<dim>                  triangulation;
 
@@ -585,6 +594,9 @@ class BoussinesqFlowProblem
 template <int dim>
 BoussinesqFlowProblem<dim>::BoussinesqFlowProblem ()
                 :
+#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
+               trilinos_communicator (MPI_COMM_WORLD),
+#endif
                triangulation (Triangulation<dim>::maximum_smoothing),
 
                 stokes_degree (1),
@@ -1780,6 +1792,7 @@ void BoussinesqFlowProblem<dim>::solve ()
                                   // be used for the solution of the
                                   // blocked system.
   {
+    Timer computing_timer;
                                     // Set up inverse matrix for
                                     // pressure mass matrix
     LinearSolvers::InverseMatrix<TrilinosWrappers::SparseMatrix,
@@ -1802,7 +1815,8 @@ void BoussinesqFlowProblem<dim>::solve ()
 
     std::cout << "   "
               << solver_control.last_step()
-              << " GMRES iterations for Stokes subsystem."
+              << " GMRES iterations for Stokes subsystem in "
+             << computing_timer() << " s."
               << std::endl;
              
                                     // Produce a constistent solution

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.