From 77027feeca8b62f1440b8edbff74a21afa406dd0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 27 Mar 2013 22:12:06 +0000 Subject: [PATCH] Fix merge conflict. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29092 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/trilinos_vector_base.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/deal.II/include/deal.II/lac/trilinos_vector_base.h b/deal.II/include/deal.II/lac/trilinos_vector_base.h index 51d06b880a..639a5c5081 100644 --- a/deal.II/include/deal.II/lac/trilinos_vector_base.h +++ b/deal.II/include/deal.II/lac/trilinos_vector_base.h @@ -1513,23 +1513,22 @@ namespace TrilinosWrappers std::pair VectorBase::local_range () const { - TrilinosWrappers::types::int_type begin, end; + begin, end; #ifndef DEAL_II_USE_LARGE_INDEX_TYPE - begin = vector->Map().MinMyGID(); - end = vector->Map().MaxMyGID()+1; -<<<<<<< .working + const TrilinosWrappers::types::int_type begin = vector->Map().MinMyGID(); + const TrilinosWrappers::types::int_type end = vector->Map().MaxMyGID()+1; + const TrilinosWrappers::types::int_type n_elements = vector->Map().NumMyElements(); #else - begin = vector->Map().MinMyGID64(); - end = vector->Map().MaxMyGID64()+1; + const TrilinosWrappers::types::int_type begin = vector->Map().MinMyGID64(); + const TrilinosWrappers::types::int_type end = vector->Map().MaxMyGID64()+1; + const TrilinosWrappers::types::int_type n_elements = vector->Map().NumMyElements64(); #endif -======= - Assert (end-begin == vector->Map().NumMyElements(), + Assert (end-begin == n_elements, ExcMessage ("This function only makes sense if the elements that this " "vector stores on the current processor form a contiguous range. " "This does not appear to be the case for the current vector.")); ->>>>>>> .merge-right.r29088 return std::make_pair (begin, end); } -- 2.39.5