From a7d0e2a9a3cb5c78e24d73e71ab77f4301572ce7 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Fri, 25 Jan 2013 06:33:56 +0000 Subject: [PATCH] Remove use of deprecated function. git-svn-id: https://svn.dealii.org/trunk@28170 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/sparse_matrix.templates.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/deal.II/include/deal.II/lac/sparse_matrix.templates.h b/deal.II/include/deal.II/lac/sparse_matrix.templates.h index d9d982f3ee..8b929f9e45 100644 --- a/deal.II/include/deal.II/lac/sparse_matrix.templates.h +++ b/deal.II/include/deal.II/lac/sparse_matrix.templates.h @@ -992,8 +992,7 @@ SparseMatrix::mmult (SparseMatrix &C, &sp_A.get_column_numbers()[sp_A.get_rowstart_indices()[i+1]]; for (; rows != end_rows; ++rows) { - const double A_val = global_entry - (rows-&sp_A.get_column_numbers()[sp_A.get_rowstart_indices()[0]]); + const double A_val = val[rows-&sp_A.get_column_numbers()[sp_A.get_rowstart_indices()[0]]]; const unsigned int col = *rows; const unsigned int *new_cols = (&sp_B.get_column_numbers()[sp_B.get_rowstart_indices()[col]]); @@ -1002,8 +1001,8 @@ SparseMatrix::mmult (SparseMatrix &C, if (sp_B.optimize_diagonal()) { C.add (i, *new_cols, A_val * - B.global_entry(new_cols-&sp_B.get_column_numbers() - [sp_B.get_rowstart_indices()[0]]) * + B.val[new_cols-&sp_B.get_column_numbers() + [sp_B.get_rowstart_indices()[0]]] * (use_vector ? V(col) : 1)); ++new_cols; } @@ -1151,14 +1150,13 @@ SparseMatrix::Tmmult (SparseMatrix &C, for (; rows != end_rows; ++rows) { const unsigned int row = *rows; - const double A_val = global_entry - (rows-&sp_A.get_column_numbers()[sp_A.get_rowstart_indices()[0]]); + const double A_val = val[rows-&sp_A.get_column_numbers()[sp_A.get_rowstart_indices()[0]]]; // special treatment for diagonal if (sp_B.optimize_diagonal()) C.add (row, i, A_val * - B.global_entry(new_cols-1-&sp_B.get_column_numbers() - [sp_B.get_rowstart_indices()[0]]) * + B.val[new_cols-1-&sp_B.get_column_numbers() + [sp_B.get_rowstart_indices()[0]]] * (use_vector ? V(i) : 1)); // now the innermost loop that goes over -- 2.39.5