From: Guido Kanschat <dr.guido.kanschat@gmail.com>
Date: Tue, 12 Feb 2002 11:04:55 +0000 (+0000)
Subject: invert and assignment from matrices with different entry type
X-Git-Tag: v8.0.0~18334
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d538424776cdc3bdf4c2e67eecdaabae1a50a0b;p=dealii.git

invert and assignment from matrices with different entry type


git-svn-id: https://svn.dealii.org/trunk@5507 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/lac/include/lac/full_matrix.h b/deal.II/lac/include/lac/full_matrix.h
index 6bc4bc72e7..5c841f3b70 100644
--- a/deal.II/lac/include/lac/full_matrix.h
+++ b/deal.II/lac/include/lac/full_matrix.h
@@ -118,6 +118,16 @@ class FullMatrix : public vector2d<number>
 		const unsigned int cols,
 		const number* entries);
 
+				     /**
+				      * Assignment operator.
+				      */
+    FullMatrix<number>& operator = (const FullMatrix<number>&);
+    
+				     /**
+				      * Variable assignment operator.
+				      */
+    template<typename number2>
+    FullMatrix<number>& operator = (const FullMatrix<number2>&);
     
 				     /**
 				      * Comparison operator. Be
@@ -448,7 +458,8 @@ class FullMatrix : public vector2d<number>
 				      * @ref{gauss_jordan} is invoked
 				      * implicitly.
 				      */
-    void invert (const FullMatrix<number> &M);
+    template <typename number2>
+    void invert (const FullMatrix<number2> &M);
 
 				     /**
 				      * Apply the Jacobi
diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h
index d044fc6a10..bba5d9850c 100644
--- a/deal.II/lac/include/lac/full_matrix.templates.h
+++ b/deal.II/lac/include/lac/full_matrix.templates.h
@@ -52,6 +52,25 @@ FullMatrix<number>::FullMatrix (const FullMatrix &m) :
 {}
 
 
+template <typename number>
+FullMatrix<number>&
+FullMatrix<number>::operator = (const FullMatrix<number>& M)
+{
+  vector2d<number>::operator=(M);
+  return *this;
+}
+
+
+template <typename number>
+template <typename number2>
+FullMatrix<number>&
+FullMatrix<number>::operator = (const FullMatrix<number2>& M)
+{
+  vector2d<number>::operator=(M);
+  return *this;
+}
+
+
 template <typename number>
 bool
 FullMatrix<number>::all_zero () const
@@ -1126,8 +1145,9 @@ FullMatrix<number>::relative_symmetry_norm2 () const
 
 
 template <typename number>
+template <typename number2>
 void
-FullMatrix<number>::invert (const FullMatrix<number> &M)
+FullMatrix<number>::invert (const FullMatrix<number2> &M)
 {
   Assert (data() != 0, ExcEmptyMatrix());
   
diff --git a/deal.II/lac/source/full_matrix.double.cc b/deal.II/lac/source/full_matrix.double.cc
index 1e6e01348f..940b5a5f3a 100644
--- a/deal.II/lac/source/full_matrix.double.cc
+++ b/deal.II/lac/source/full_matrix.double.cc
@@ -28,6 +28,7 @@ template void FullMatrix<TYPEMAT>::Tadd (const TYPEMAT, const FullMatrix<TYPEMAT
 template void FullMatrix<TYPEMAT>::mmult (FullMatrix<TYPEMAT2>&, const FullMatrix<TYPEMAT2>&, const bool) const;
 template void FullMatrix<TYPEMAT>::Tmmult (FullMatrix<TYPEMAT2>&, const FullMatrix<TYPEMAT2>&, const bool) const;
 template void FullMatrix<TYPEMAT>::add_diag (const TYPEMAT, const FullMatrix<TYPEMAT2>&);
+template void FullMatrix<TYPEMAT>::invert (const FullMatrix<TYPEMAT2>&);
 
 
 #define TYPEVEC double
diff --git a/deal.II/lac/source/full_matrix.float.cc b/deal.II/lac/source/full_matrix.float.cc
index c050ecf331..b8a2128031 100644
--- a/deal.II/lac/source/full_matrix.float.cc
+++ b/deal.II/lac/source/full_matrix.float.cc
@@ -27,7 +27,7 @@ template void FullMatrix<TYPEMAT>::Tadd (const TYPEMAT, const FullMatrix<TYPEMAT
 template void FullMatrix<TYPEMAT>::mmult (FullMatrix<TYPEMAT2>&, const FullMatrix<TYPEMAT2>&, const bool) const;
 template void FullMatrix<TYPEMAT>::Tmmult (FullMatrix<TYPEMAT2>&, const FullMatrix<TYPEMAT2>&, const bool) const;
 template void FullMatrix<TYPEMAT>::add_diag (const TYPEMAT, const FullMatrix<TYPEMAT2>&);
-
+template void FullMatrix<TYPEMAT>::invert (const FullMatrix<TYPEMAT2>&);
 
 #define TYPEVEC double
 #define TYPERES double