From: Wolfgang Bangerth Date: Mon, 8 May 2000 09:10:37 +0000 (+0000) Subject: Fix mmult/Tmmult: don't resize output arg. X-Git-Tag: v8.0.0~20582 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a18b2761050153a83e6b10ee2b787860908616f;p=dealii.git Fix mmult/Tmmult: don't resize output arg. Tmmult was broken. git-svn-id: https://svn.dealii.org/trunk@2821 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 1039b1b26c..50e3f33380 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -505,86 +505,47 @@ void FullMatrix::diagadd (const number src) template template -void FullMatrix::mmult (FullMatrix& dst, - const FullMatrix& src) const +void FullMatrix::mmult (FullMatrix &dst, + const FullMatrix &src) const { Assert (val != 0, ExcEmptyMatrix()); Assert (n() == src.m(), ExcDimensionMismatch(n(), src.m())); + Assert (dst.n() == src.n(), ExcDimensionMismatch(dst.n(), src.n())); + Assert (dst.m() == m(), ExcDimensionMismatch(m(), dst.m())); - unsigned int i,j,k; - number2 s = 1.; - dst.reinit(m(), src.n()); - - for (i=0;i::mmult (FullMatrix& dst, const FullMatrix& src) const -{ - Assert (val != 0, ExcEmptyMatrix()); - Assert (m() == src.n(), ExcDimensionMismatch(m(), src.n())); - - unsigned int i,j,k; - number2 s = 1.; - - dst.reinit(n(), src.m()); - - for (i=0;i template -void FullMatrix::Tmmult (FullMatrix& dst, const FullMatrix& src) const +void FullMatrix::Tmmult (FullMatrix &dst, + const FullMatrix &src) const { Assert (val != 0, ExcEmptyMatrix()); - Assert (n() == src.n(), ExcDimensionMismatch(n(), src.n())); - - unsigned int i,j,k; - number2 s = 1.; - dst.reinit(m(), src.m()); + Assert (m() == src.m(), ExcDimensionMismatch(m(), src.m())); + Assert (n() == dst.m(), ExcDimensionMismatch(n(), dst.m())); + Assert (src.n() == dst.n(), ExcDimensionMismatch(src.n(), dst.n())); - for (i=0;i::Tmmult(FullMatrix& dst, const FullMatrix& src) const -{ - Assert (val != 0, ExcEmptyMatrix()); - Assert (m() == src.n(), ExcDimensionMismatch(m(), src.n())); - - unsigned int i,j,k; - number2 s = 1.; - - dst.reinit(n(), src.m()); - - for (i=0;i template