From 0e4098695e14d8b2a731da2adf63ca85e0c76a5d Mon Sep 17 00:00:00 2001 From: "kainan.wang" Date: Tue, 26 Mar 2013 05:16:16 +0000 Subject: [PATCH] change two trilinos function calls to XXX64 git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29036 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/trilinos_sparse_matrix.h | 4 ++-- deal.II/source/lac/slepc_solver.cc | 4 ++-- tests/trilinos/sparse_matrix_add_01.cc | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deal.II/include/deal.II/lac/trilinos_sparse_matrix.h b/deal.II/include/deal.II/lac/trilinos_sparse_matrix.h index cb66f17832..82a5ca95b9 100644 --- a/deal.II/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/deal.II/include/deal.II/lac/trilinos_sparse_matrix.h @@ -3552,8 +3552,8 @@ namespace TrilinosWrappers SparseMatrix::local_range () const { size_type begin, end; - begin = matrix -> RowMap().MinMyGID(); - end = matrix -> RowMap().MaxMyGID()+1; + begin = matrix -> RowMap().MinMyGID64(); + end = matrix -> RowMap().MaxMyGID64()+1; return std::make_pair (begin, end); } diff --git a/deal.II/source/lac/slepc_solver.cc b/deal.II/source/lac/slepc_solver.cc index 68e6435bdb..9951600c4c 100644 --- a/deal.II/source/lac/slepc_solver.cc +++ b/deal.II/source/lac/slepc_solver.cc @@ -102,8 +102,8 @@ namespace SLEPcWrappers } void - SolverBase::solve (const unsigned int n_eigenvectors, - unsigned int *n_converged) + SolverBase::solve (const size_type n_eigenvectors, + size_type *n_converged) { int ierr; diff --git a/tests/trilinos/sparse_matrix_add_01.cc b/tests/trilinos/sparse_matrix_add_01.cc index dd998305e6..175a7cfe83 100644 --- a/tests/trilinos/sparse_matrix_add_01.cc +++ b/tests/trilinos/sparse_matrix_add_01.cc @@ -97,6 +97,7 @@ int main (int argc,char **argv) { { TrilinosWrappers::SparseMatrix m (5U,5U,3U); + test (m); } } -- 2.39.5