From bd71d72d0313643e580cb6ea7551d87508f50c6b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 7 Aug 2014 14:40:15 +0200 Subject: [PATCH] Adjust TrilinosWrappers::VectorBase::add according to the fix of [Bug 6079] Epetra_Import does not work for anything but Zero flags --- source/lac/trilinos_vector_base.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); -- 2.39.5