From 649c5f71b7bb33ec06923bf418cd814bac26b03d Mon Sep 17 00:00:00 2001 From: turcksin Date: Tue, 26 Mar 2013 22:03:23 +0000 Subject: [PATCH] Fix some inconsistencies in the use of 64 bits functions of Trilinos. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29049 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/trilinos_sparse_matrix.h | 9 +++++---- deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h | 3 +-- deal.II/source/lac/trilinos_sparse_matrix.cc | 4 ++-- deal.II/source/lac/trilinos_sparsity_pattern.cc | 7 +++---- 4 files changed, 11 insertions(+), 12 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 8c93853739..d454730c14 100644 --- a/deal.II/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/deal.II/include/deal.II/lac/trilinos_sparse_matrix.h @@ -1287,7 +1287,7 @@ namespace TrilinosWrappers * Number of entries in a * specific row. */ - size_type row_length (const size_type row) const; + unsigned int row_length (const size_type row) const; /** * Returns the state of the matrix, @@ -3248,9 +3248,10 @@ namespace TrilinosWrappers { if (matrix->Filled() == false) { - ierr = matrix->Epetra_CrsMatrix::InsertGlobalValues(row, n_columns, - const_cast(col_value_ptr), - col_index_ptr); + ierr = matrix->Epetra_CrsMatrix::InsertGlobalValues( + static_cast(row), + static_cast(n_columns),const_cast(col_value_ptr), + col_index_ptr); // When inserting elements, we do // not want to create exceptions in diff --git a/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h b/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h index aff528d1f8..76b6a32d0f 100644 --- a/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -1649,8 +1649,7 @@ namespace TrilinosWrappers TrilinosWrappers::types::int_type *col_index_ptr = (TrilinosWrappers::types::int_type *)(&*begin); - const TrilinosWrappers::types::int_type n_cols = - static_cast(end - begin); + const int n_cols = static_cast(end - begin); compressed = false; const int ierr = graph->InsertGlobalIndices (1, diff --git a/deal.II/source/lac/trilinos_sparse_matrix.cc b/deal.II/source/lac/trilinos_sparse_matrix.cc index f2d480d541..aa5e848a86 100644 --- a/deal.II/source/lac/trilinos_sparse_matrix.cc +++ b/deal.II/source/lac/trilinos_sparse_matrix.cc @@ -537,7 +537,7 @@ namespace TrilinosWrappers for (size_type row=first_row; rowNumMyRows(); ++i) { graph->ExtractMyRowView (i, num_entries, indices); - for (TrilinosWrappers::types::int_type j=0; jExtractMyRowView (row, num_entries, indices); - for (size_type j=0; j<(size_type)num_entries; ++j) + for (unsigned int j=0; j<(unsigned int)num_entries; ++j) // while matrix entries are usually // written (i,j), with i vertical and // j horizontal, gnuplot output is // x-y, that is we have to exchange // the order of output out << indices[global_row_index(*graph,static_cast(j))] - << " " << -static_cast(row) - << std::endl; + << " " << -static_cast(row) << std::endl; } AssertThrow (out, ExcIO()); -- 2.39.5