From c1c5ec5900693175dc93dbfba8c9325ec215d5d0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 16 Feb 2014 17:55:36 +0000 Subject: [PATCH] Propagate exceptions from the member functions of InverseMatrixRichardson. git-svn-id: https://svn.dealii.org/trunk@32494 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 8 +++++ deal.II/include/deal.II/lac/matrix_lib.h | 24 +++++++++++--- .../deal.II/lac/matrix_lib.templates.h | 32 +++++-------------- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 83cd398594..87185c5950 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -135,6 +135,14 @@ inconvenience this causes.

Specific improvements

    +
  1. Changed: The InverseMatrixRichardson used to eat all exceptions + that may have been produced by the underlying Richardson solver, leaving + no trace that the underlying solver may have failed when you call functions + such as InverseMatrixRichardson::vmult(). These exceptions are now propagated + out to the caller. +
    + (Wolfgang Bangerth, 2014/02/16) +
  2. New: FE_TraceQ implements finite elements on faces, which correspond to the traces of H1-conforming elements. diff --git a/deal.II/include/deal.II/lac/matrix_lib.h b/deal.II/include/deal.II/lac/matrix_lib.h index 03eb9b7a3d..3bd6318ea5 100644 --- a/deal.II/include/deal.II/lac/matrix_lib.h +++ b/deal.II/include/deal.II/lac/matrix_lib.h @@ -415,15 +415,29 @@ private: /** - * Inverse matrix computed approximately by using the SolverRichardson - * iterative solver. In particular, the function - * SolverRichardson::Tsolve() allows for the implementation of - * transpose matrix vector products. + * Objects of this type represent the inverse of a matrix as + * computed approximately by using the SolverRichardson + * iterative solver. In other words, if you set up an object + * of the current type for a matrix $A$, then calling the + * vmult() function with arguments $v,w$ amounts to setting + * $w=A^{-1}v$ by solving the linear system $Aw=v$ using the + * Richardson solver with a preconditioner that can be chosen. Similarly, + * this class allows to also multiple with the transpose of the + * inverse (i.e., the inverse of the transpose) using the function + * SolverRichardson::Tsolve(). * * The functions vmult() and Tvmult() approximate the inverse * iteratively starting with the vector dst. Functions * vmult_add() and Tvmult_add() start the iteration with a zero - * vector. + * vector. All of the matrix-vector multiplication functions + * expect that the Richardson solver with the given preconditioner + * actually converge. If the Richardson solver does not converge + * within the specified number of iterations, the exception that will + * result in the solver will simply be propagated to the caller of + * the member function of the current class. + * + * @note A more powerful version of this class is provided by the + * IterativeInverse class. * * @note Instantiations for this template are provided for @ and * @; others can be generated in application programs (see the diff --git a/deal.II/include/deal.II/lac/matrix_lib.templates.h b/deal.II/include/deal.II/lac/matrix_lib.templates.h index 81e0a09157..7d5b067d2d 100644 --- a/deal.II/include/deal.II/lac/matrix_lib.templates.h +++ b/deal.II/include/deal.II/lac/matrix_lib.templates.h @@ -152,12 +152,7 @@ InverseMatrixRichardson::vmult(VECTOR &dst, const VECTOR &src) const Assert (matrix != 0, ExcNotInitialized()); Assert (precondition != 0, ExcNotInitialized()); dst = 0.; - try - { - solver.solve(*matrix, dst, src, *precondition); - } - catch (...) - {} + solver.solve(*matrix, dst, src, *precondition); } @@ -170,12 +165,9 @@ InverseMatrixRichardson::vmult_add(VECTOR &dst, const VECTOR &src) const Assert (precondition != 0, ExcNotInitialized()); VECTOR *aux = mem.alloc(); aux->reinit(dst); - try - { - solver.solve(*matrix, *aux, src, *precondition); - } - catch (...) - {} + + solver.solve(*matrix, *aux, src, *precondition); + dst += *aux; mem.free(aux); } @@ -189,12 +181,7 @@ InverseMatrixRichardson::Tvmult(VECTOR &dst, const VECTOR &src) const Assert (matrix != 0, ExcNotInitialized()); Assert (precondition != 0, ExcNotInitialized()); dst = 0.; - try - { - solver.Tsolve(*matrix, dst, src, *precondition); - } - catch (...) - {} + solver.Tsolve(*matrix, dst, src, *precondition); } @@ -207,12 +194,9 @@ InverseMatrixRichardson::Tvmult_add(VECTOR &dst, const VECTOR &src) cons Assert (precondition != 0, ExcNotInitialized()); VECTOR *aux = mem.alloc(); aux->reinit(dst); - try - { - solver.Tsolve(*matrix, *aux, src, *precondition); - } - catch (...) - {} + + solver.Tsolve(*matrix, *aux, src, *precondition); + dst += *aux; mem.free(aux); } -- 2.39.5