From: Daniel Arndt <d.arndt@math.uni-goettingen.de>
Date: Thu, 7 Aug 2014 12:40:15 +0000 (+0200)
Subject: Adjust TrilinosWrappers::VectorBase::add according to the fix of [Bug 6079] Epetra_Im... 
X-Git-Tag: v8.2.0-rc1~213^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd71d72d0313643e580cb6ea7551d87508f50c6b;p=dealii.git

Adjust TrilinosWrappers::VectorBase::add according to the fix of [Bug 6079] Epetra_Import does not work for anything but Zero flags
---

diff --git a/source/lac/trilinos_vector_base.cc b/source/lac/trilinos_vector_base.cc
index aff9959d20..4f0ecc3391 100644
--- a/source/lac/trilinos_vector_base.cc
+++ b/source/lac/trilinos_vector_base.cc
@@ -295,13 +295,13 @@ namespace TrilinosWrappers
         AssertThrow (size() == v.size(),
                      ExcDimensionMismatch (size(), v.size()));
 
-#if DEAL_II_TRILINOS_VERSION_GTE(11,9,0)
+#if DEAL_II_TRILINOS_VERSION_GTE(11,11,0)
          Epetra_Import data_exchange (vector->Map(), v.vector->Map());
-         int ierr = vector->Import(*v.vector, data_exchange, Add);
+         int ierr = vector->Import(*v.vector, data_exchange, Epetra_AddLocalAlso);
          AssertThrow (ierr == 0, ExcTrilinosError(ierr));
          last_action = Add;
 #else
-        // In versions older than 11.9 the Import function is broken for adding
+        // In versions older than 11.11 the Import function is broken for adding
         // Hence, we provide a workaround in this case
 
         Epetra_MultiVector dummy(vector->Map(), 1, false);