From: Wolfgang Bangerth Date: Fri, 7 Aug 2009 20:15:02 +0000 (+0000) Subject: Remove a few conditionals on MPI. X-Git-Tag: v8.0.0~7357 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d84a547d4f7fea5066b802da600d252f64b636;p=dealii.git Remove a few conditionals on MPI. git-svn-id: https://svn.dealii.org/trunk@19211 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/source/trilinos_vector.cc b/deal.II/lac/source/trilinos_vector.cc index e7b885dace..5197e98cb4 100755 --- a/deal.II/lac/source/trilinos_vector.cc +++ b/deal.II/lac/source/trilinos_vector.cc @@ -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 (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 (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 (new Epetra_FEVector (map)); }