]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove a few conditionals on MPI.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 7 Aug 2009 20:15:02 +0000 (20:15 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 7 Aug 2009 20:15:02 +0000 (20:15 +0000)
git-svn-id: https://svn.dealii.org/trunk@19211 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/source/trilinos_vector.cc

index e7b885dace222f25c3eb6f1805bc6a31c3eb1f2a..5197e98cb44c0dd1acc569b43f3ba4b9c930af0d 100755 (executable)
@@ -31,12 +31,9 @@ namespace TrilinosWrappers
 
 
     Vector::Vector ()
-                   :
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
-                   communicator (Utilities::Trilinos::duplicate_communicator(MPI_COMM_SELF)),
-#else
-                   communicator (new Epetra_SerialComm()),
-#endif
+                   :
+                   communicator (Utilities::Trilinos::
+                                 duplicate_communicator(Utilities::Trilinos::comm_self())),
                    map (0, 0, *communicator)
     {
       last_action = Zero;
@@ -279,12 +276,9 @@ namespace TrilinosWrappers
 
 
   Vector::Vector ()
-                 :
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
-                 map (0, 0, Epetra_MpiComm(MPI_COMM_SELF))
-#else
-                map (0, 0, Epetra_SerialComm())
-#endif
+                 :
+                 map (0, 0,
+                      Utilities::Trilinos::comm_self())
   {
     last_action = Zero;
     vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector(map));
@@ -294,11 +288,8 @@ namespace TrilinosWrappers
 
   Vector::Vector (const unsigned int n)
                  :
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
-                 map ((int)n, 0, Epetra_MpiComm(MPI_COMM_SELF))
-#else
-                map ((int)n, 0, Epetra_SerialComm())
-#endif
+                 map ((int)n, 0,
+                      Utilities::Trilinos::comm_self())
   {
     last_action = Zero;
     vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector (map));
@@ -344,11 +335,8 @@ namespace TrilinosWrappers
       {
        vector.reset();
 
-#ifdef DEAL_II_COMPILER_SUPPORTS_MPI
-       map = Epetra_LocalMap ((int)n, 0, Epetra_MpiComm(MPI_COMM_SELF));
-#else
-       map = Epetra_LocalMap ((int)n, 0, Epetra_SerialComm());
-#endif
+       map = Epetra_LocalMap ((int)n, 0,
+                              Utilities::Trilinos::comm_self());
 
        vector = std::auto_ptr<Epetra_FEVector> (new Epetra_FEVector (map));
       }

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.