From 39133713266a1749a1f84465320e1c6d7244e3ae Mon Sep 17 00:00:00 2001
From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 8 May 2000 09:12:50 +0000
Subject: [PATCH] Take over fixes from the main branch.

git-svn-id: https://svn.dealii.org/branches/Branch-3-0@2822 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/lac/include/lac/full_matrix.h         |  8 ++
 .../lac/include/lac/full_matrix.templates.h   | 77 +++++--------------
 2 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h
index 0ef1df83e4..a27cb74dbb 100644
--- a/deal.II/lac/include/lac/full_matrix.h
+++ b/deal.II/lac/include/lac/full_matrix.h
@@ -232,6 +232,10 @@ class FullMatrix : public Subscriptor
 				     /**
 				      * Matrix-matrix-multiplication.
 				      * $C=A*B$.
+				      *
+				      * Assumes that #A# and #B# have
+				      * compatible sizes and thet #C#
+				      * already has the right size.
 				      */
     template<typename number2>
     void mmult (FullMatrix<number2>       &C,
@@ -241,6 +245,10 @@ class FullMatrix : public Subscriptor
 				      * Matrix-matrix-multiplication using
 				      * transpose of #this#.
 				      * $C=A^T*B$.
+				      *
+				      * Assumes that #A# and #B# have
+				      * compatible sizes and thet #C#
+				      * already has the right size.
 				      */
     template<typename number2>
     void Tmmult (FullMatrix<number2>       &C,
diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h
index d73fa76fe4..40e031886c 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<number>::diagadd (const number src)
 
 template <typename number>
 template <typename number2>
-void FullMatrix<number>::mmult (FullMatrix<number2>& dst,
-				const FullMatrix<number2>& src) const
+void FullMatrix<number>::mmult (FullMatrix<number2>       &dst,
+				const FullMatrix<number2> &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<m();i++)
-    for (j=0; j<src.n(); ++j)
+  for (unsigned int i=0; i<m(); i++)
+    for (unsigned int j=0; j<src.n(); j++)
       {
-	s = 0.;
-	for (k=0;k<n();k++) s+= el(i,k) * src.el(k,j);
+	number2 s = 0.;
+	for (unsigned k=0; k<n(); k++)
+	  s+= el(i,k) * src.el(k,j);
 	dst.el(i,j) = s;
       }
 }
 
 
-/*void FullMatrix<number>::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<n();i++)
-    for (j=0;j<src.m();j++)
-      {
-	s = 0.;
-	for (k=0;k<m();k++) s+= el(i,k) * src.el(k,j);
-	dst.el(i,j) = s;
-      }
-}*/
-
 
 template <typename number>
 template <typename number2>
-void FullMatrix<number>::Tmmult (FullMatrix<number2>& dst, const FullMatrix<number2>& src) const
+void FullMatrix<number>::Tmmult (FullMatrix<number2>       &dst,
+				 const FullMatrix<number2> &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<m();i++)
-    for (j=0;j<src.m();j++)
+  for (unsigned int i=0; i<n(); i++)
+    for (unsigned int j=0; j<src.n(); j++)
       {
-	s = 0.;
-	for (k=0;k<n();k++) s+= el(k,i) * src.el(k,j);
+	number2 s = 0;
+	for (unsigned int k=0; k<m(); k++)
+	  s += el(k,i) * src.el(k,j);
 	dst.el(i,j) = s;
       }
 }
 
 
-/*void FullMatrix<number>::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<n();i++)
-    for (j=0;j<src.m();j++)
-      {
-	s = 0.;
-	for (k=0;k<m();k++) s+= el(k,i) * src.el(k,j);
-	dst.el(i,j) = s;
-      }
-}*/
-
 
 template <typename number>
 template <typename number2>
-- 
2.39.5