]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Adjust TrilinosWrappers::VectorBase::add according to the fix of [Bug 6079] Epetra_Im... 72/head
authorDaniel Arndt <d.arndt@math.uni-goettingen.de>
Thu, 7 Aug 2014 12:40:15 +0000 (14:40 +0200)
committerDaniel Arndt <d.arndt@math.uni-goettingen.de>
Fri, 8 Aug 2014 15:09:38 +0000 (17:09 +0200)
source/lac/trilinos_vector_base.cc

index aff9959d2031f4f7a78821804af682478d0d72dd..4f0ecc3391d269fb975e559432e5d2de7890d4e9 100644 (file)
@@ -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);

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.