From 4866f386e1886b8333af7c188d6861e30b7cb3ee Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 7 Dec 2013 16:30:01 +0000 Subject: [PATCH] A couple of fixes to make things compile again in 64-bit mode after the change to full_matrix.h a couple of days ago. git-svn-id: https://svn.dealii.org/trunk@31917 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/full_matrix.h | 24 +++++++++++------------ deal.II/include/deal.II/lac/matrix_out.h | 6 ++++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/deal.II/include/deal.II/lac/full_matrix.h b/deal.II/include/deal.II/lac/full_matrix.h index 4829da893e..4be38349f0 100644 --- a/deal.II/include/deal.II/lac/full_matrix.h +++ b/deal.II/include/deal.II/lac/full_matrix.h @@ -446,10 +446,10 @@ public: * rows and columns in the current object. In other words, * the current object is not resized for this operation. */ - template + template void extract_submatrix_from (const MatrixType &matrix, - const std::vector &row_index_set, - const std::vector &column_index_set); + const std::vector &row_index_set, + const std::vector &column_index_set); /** * Copy the elements of the current matrix object into a specified @@ -463,10 +463,10 @@ public: * rows and columns in the current object. In other words, * the current object is not resized for this operation. */ - template + template void - scatter_matrix_to (const std::vector &row_index_set, - const std::vector &column_index_set, + scatter_matrix_to (const std::vector &row_index_set, + const std::vector &column_index_set, MatrixType &matrix) const; /** @@ -1572,12 +1572,12 @@ FullMatrix::copy_transposed (const MATRIX &M) template -template +template inline void FullMatrix::extract_submatrix_from (const MatrixType &matrix, - const std::vector &row_index_set, - const std::vector &column_index_set) + const std::vector &row_index_set, + const std::vector &column_index_set) { AssertDimension(row_index_set.size(), this->n_rows()); AssertDimension(column_index_set.size(), this->n_cols()); @@ -1593,11 +1593,11 @@ FullMatrix::extract_submatrix_from (const MatrixType &matrix, template -template +template inline void -FullMatrix::scatter_matrix_to (const std::vector &row_index_set, - const std::vector &column_index_set, +FullMatrix::scatter_matrix_to (const std::vector &row_index_set, + const std::vector &column_index_set, MatrixType &matrix) const { AssertDimension(row_index_set.size(), this->n_rows()); diff --git a/deal.II/include/deal.II/lac/matrix_out.h b/deal.II/include/deal.II/lac/matrix_out.h index 55c8452217..9916e7a45c 100644 --- a/deal.II/include/deal.II/lac/matrix_out.h +++ b/deal.II/include/deal.II/lac/matrix_out.h @@ -372,9 +372,11 @@ MatrixOut::get_gridpoint_value (const Matrix &matrix, double average = 0; size_type n_elements = 0; for (size_type row=i*options.block_size; - row < std::min(matrix.m(), (i+1)*options.block_size); ++row) + row < std::min(size_type(matrix.m()), + size_type((i+1)*options.block_size)); ++row) for (size_type col=j*options.block_size; - col < std::min(matrix.m(), (j+1)*options.block_size); ++col, ++n_elements) + col < std::min(size_type(matrix.m()), + size_type((j+1)*options.block_size)); ++col, ++n_elements) if (options.show_absolute_values == true) average += std::fabs(get_element (matrix, row, col)); else -- 2.39.5