From a6c18d6da43975b74200056fa7cdc41acfdb82ad Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 24 Mar 2015 07:50:38 -0500 Subject: [PATCH] Fix a 64-bit issue in TrilinosWrappers::SparseMatrix::local_range(). This tripped up all of the Trilinos sparse matrix iterators in 64 bit mode after one of my recent changes. --- doc/news/changes.h | 6 ++++++ include/deal.II/lac/trilinos_sparse_matrix.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 14c559f78c..aca830aecd 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -395,6 +395,12 @@ inconvenience this causes.

Specific improvements

    +
  1. Fixed: TrilinosWrappers::SparseMatrix::local_range() erroneously + threw an exception in 64-bit mode. This is now fixed. +
    + (Wolfgang Bangerth, 2015/03/24) +
  2. +
  3. New: The GridOut::write_gnuplot() function produced output for 1d meshes embedded in higher dimensional spaces that was invalid in that the lines showing individual cells were connected. diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index 6e7614c588..87e0d4a9f9 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -2352,8 +2352,8 @@ namespace TrilinosWrappers begin = matrix->RowMap().MinMyGID(); end = matrix->RowMap().MaxMyGID()+1; #else - begin = matrix->RowMap().MinMyGID(); - end = matrix->RowMap().MaxMyGID()+1; + begin = matrix->RowMap().MinMyGID64(); + end = matrix->RowMap().MaxMyGID64()+1; #endif return ((index >= static_cast(begin)) && -- 2.39.5