From edb33a0e9a01771dd654b8f104e638f6a621a01d Mon Sep 17 00:00:00 2001 From: wolf Date: Sat, 11 Aug 2001 22:03:05 +0000 Subject: [PATCH] Add precondition_Jacobi to FullMatrix. git-svn-id: https://svn.dealii.org/trunk@4875 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/2001/c-3-1.html | 11 +++++++- deal.II/lac/include/lac/full_matrix.h | 15 +++++++++++ .../lac/include/lac/full_matrix.templates.h | 25 +++++++++++++++++++ deal.II/lac/source/full_matrix.double.cc | 11 ++++++++ deal.II/lac/source/full_matrix.float.cc | 8 ++++++ 5 files changed, 69 insertions(+), 1 deletion(-) diff --git a/deal.II/doc/news/2001/c-3-1.html b/deal.II/doc/news/2001/c-3-1.html index e7726ec5cd..132b7b6c2f 100644 --- a/deal.II/doc/news/2001/c-3-1.html +++ b/deal.II/doc/news/2001/c-3-1.html @@ -333,7 +333,16 @@ documentation, etc.

  1. - Changed: The Vector and + New: There is now a function + FullMatrix::precondition_Jacobi. The + PreconditionJacobi class is + therefore now also applicable with the full matrix class. +
    + (WB 2001/08/11) +

    + +

  2. + New: The Vector and BlockVector classes can now be initialized using a new constructor that takes two iterators that denote a range of elements which are to be copied. diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h index 91d92c6dd3..128a0436cb 100644 --- a/deal.II/lac/include/lac/full_matrix.h +++ b/deal.II/lac/include/lac/full_matrix.h @@ -452,6 +452,21 @@ class FullMatrix : public vector2d */ void invert (const FullMatrix &M); + /** + * Apply the Jacobi + * preconditioner, which + * multiplies every element of + * the @p{src} vector by the + * inverse of the respective + * diagonal element and + * multiplies the result with the + * damping factor @p{omega}. + */ + template + void precondition_Jacobi (Vector &dst, + const Vector &src, + const number omega = 1.) const; + /** * $A(i,1-n)+=s*A(j,1-n)$. * Simple addition of rows of this diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 256d706e83..7a7e4894e8 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -1251,12 +1251,37 @@ FullMatrix::invert (const FullMatrix &M) } default: + // if no inversion is + // hardcoded, fall back + // to use the + // Gauss-Jordan algorithm *this = M; gauss_jordan(); }; }; +template +template +void +FullMatrix::precondition_Jacobi (Vector &dst, + const Vector &src, + const number om) const +{ + Assert (m() == n(), ExcNotQuadratic()); + Assert (dst.size() == n(), ExcDimensionMismatch (dst.size(), n())); + Assert (src.size() == n(), ExcDimensionMismatch (src.size(), n())); + + const unsigned int n = src.size(); + somenumber *dst_ptr = dst.begin(); + const somenumber *src_ptr = src.begin(); + + for (unsigned int i=0; i void FullMatrix::print_formatted (std::ostream &out, diff --git a/deal.II/lac/source/full_matrix.double.cc b/deal.II/lac/source/full_matrix.double.cc index 15986ce5bd..dc7e460bfd 100644 --- a/deal.II/lac/source/full_matrix.double.cc +++ b/deal.II/lac/source/full_matrix.double.cc @@ -46,6 +46,12 @@ template void FullMatrix::backward(Vector&, const Vector::householder(Vector&); template double FullMatrix::least_squares(Vector&, Vector&); +template +void FullMatrix::precondition_Jacobi (Vector &, + const Vector &, + const TYPEMAT) const; + + #undef TYPEVEC #define TYPEVEC float @@ -62,6 +68,11 @@ template void FullMatrix::backward(Vector&, const Vector::householder(Vector&); template double FullMatrix::least_squares(Vector&, Vector&); +template +void FullMatrix::precondition_Jacobi (Vector &, + const Vector &, + const TYPEMAT) const; + #undef TYPERES #define TYPERES float diff --git a/deal.II/lac/source/full_matrix.float.cc b/deal.II/lac/source/full_matrix.float.cc index 04e8f8f9ab..84a078f7f4 100644 --- a/deal.II/lac/source/full_matrix.float.cc +++ b/deal.II/lac/source/full_matrix.float.cc @@ -44,6 +44,10 @@ template void FullMatrix::forward(Vector&, const Vector::backward(Vector&, const Vector&) const; template void FullMatrix::householder(Vector&); template double FullMatrix::least_squares(Vector&, Vector&); +template +void FullMatrix::precondition_Jacobi (Vector &, + const Vector &, + const TYPEMAT) const; #undef TYPEVEC #define TYPEVEC float @@ -60,6 +64,10 @@ template void FullMatrix::forward(Vector&, const Vector::backward(Vector&, const Vector&) const; template void FullMatrix::householder(Vector&); template double FullMatrix::least_squares(Vector&, Vector&); +template +void FullMatrix::precondition_Jacobi (Vector &, + const Vector &, + const TYPEMAT) const; #undef TYPERES -- 2.39.5