From: Martin Kronbichler Date: Fri, 23 Jun 2017 14:59:37 +0000 (+0200) Subject: Merge pull request #4458 from nfehn/master X-Git-Tag: v9.0.0-rc1~1479 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9892ad5bb93d95820451237d00fbf0617b8259a8;p=dealii.git Merge pull request #4458 from nfehn/master Initialization of Chebyshev smoother --- 9892ad5bb93d95820451237d00fbf0617b8259a8 diff --cc include/deal.II/lac/precondition.h index 4b39bb9ec9,b8d833aee4..bed1220a3e --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@@ -2218,12 -2224,18 +2224,12 @@@ PreconditionChebyshevvmult (update2, dst); - internal::PreconditionChebyshev::vector_updates - (src, *data.preconditioner, false, 0., 1./theta, update1, update2, update3, dst); - } - else - internal::PreconditionChebyshev::vector_updates - (src, *data.preconditioner, true, 0., 1./theta, update1, update2, update3, dst); + matrix_ptr->vmult (update2, dst); + internal::PreconditionChebyshev::vector_updates + (src, *data.preconditioner, false, 0., 1./theta, update1, update2, update3, dst); do_chebyshev_loop(dst, src); } @@@ -2238,12 -2250,18 +2244,12 @@@ PreconditionChebyshevTvmult (update2, dst); - internal::PreconditionChebyshev::vector_updates - (src, *data.preconditioner, false, 0., 1./theta, update1, update2, update3, dst); - } - else - internal::PreconditionChebyshev::vector_updates - (src, *data.preconditioner, true, 0., 1./theta, update1, update2, update3, dst); + matrix_ptr->Tvmult (update2, dst); + internal::PreconditionChebyshev::vector_updates + (src, *data.preconditioner, false, 0., 1./theta, update1, update2, update3, dst); do_transpose_chebyshev_loop(dst, src); }