From 4ec060113513357120cb35aa0d225cea1e3de5de Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 9 Dec 2007 22:36:37 +0000 Subject: [PATCH] The matrix_norm_square function forgot to conjugate its argument. Adjust the documentation. git-svn-id: https://svn.dealii.org/trunk@15587 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/full_matrix.h | 3 +-- deal.II/lac/include/lac/full_matrix.templates.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h index 9903ea9928..976398c612 100644 --- a/deal.II/lac/include/lac/full_matrix.h +++ b/deal.II/lac/include/lac/full_matrix.h @@ -440,8 +440,7 @@ class FullMatrix : public Table<2,number> /** * Return the square of the norm - * of the vector v with - * respect to the norm induced by + * of the vector v induced by * this matrix, * i.e. (v,Mv). This is * useful, e.g. in the finite diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 3262955414..e9a48242ea 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -620,7 +620,7 @@ FullMatrix::matrix_norm_square (const Vector &v) const while (val_ptr != val_end_of_row) s += number(*val_ptr++) * number(*v_ptr++); - sum += s* number(v(row)); + sum += s * number(numbers::NumberTraits::conjugate(v(row))); } return sum; -- 2.39.5