From: guido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sat, 24 Nov 2001 14:30:30 +0000 (+0000)
Subject: first equ template
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5f55cf28fceac7ad2ce781507cc611b77a53d91;p=dealii-svn.git

first equ template


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

diff --git a/deal.II/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h
index a9fd7c994c..54dfcc07d4 100644
--- a/deal.II/lac/include/lac/block_vector.h
+++ b/deal.II/lac/include/lac/block_vector.h
@@ -1029,9 +1029,10 @@ class BlockVector
     BlockVector<Number> & operator *= (const Number factor);
 
 				     /**
-				      *  U=a*V. Replacing.
+				      *  U=a*V. Assignment.
 				      */
-    void equ (const Number a, const BlockVector<Number>& V);
+    template <typename Number2>
+    void equ (const Number a, const BlockVector<Number2>& V);
     
 				     /**
 				      * U=a*V+b*W.
diff --git a/deal.II/lac/include/lac/block_vector.templates.h b/deal.II/lac/include/lac/block_vector.templates.h
index 2b53f56671..7b0732e04c 100644
--- a/deal.II/lac/include/lac/block_vector.templates.h
+++ b/deal.II/lac/include/lac/block_vector.templates.h
@@ -452,8 +452,9 @@ void BlockVector<Number>::equ (const Number a,
 
 
 template <typename Number>
+template <typename Number2>
 void BlockVector<Number>::equ (const Number a,
-			       const BlockVector<Number>& v)
+			       const BlockVector<Number2>& v)
 {
   Assert (num_blocks == v.num_blocks,
 	  ExcDimensionMismatch(num_blocks, v.num_blocks));
diff --git a/deal.II/lac/include/lac/vector.h b/deal.II/lac/include/lac/vector.h
index 83e1363e1a..17c23268c2 100644
--- a/deal.II/lac/include/lac/vector.h
+++ b/deal.II/lac/include/lac/vector.h
@@ -417,9 +417,10 @@ class Vector
     void scale (const Vector<Number> &scaling_factors);
     
 				     /**
-				      *  U=a*V. Replacing.
+				      *  U=a*V. Assignment.
 				      */
-    void equ (const Number a, const Vector<Number>& V);
+    template <typename Number2>
+    void equ (const Number a, const Vector<Number2>& V);
     
 				     /**
 				      * U=a*V+b*W.
diff --git a/deal.II/lac/include/lac/vector.templates.h b/deal.II/lac/include/lac/vector.templates.h
index a1850e4fd7..0fc76cfac2 100644
--- a/deal.II/lac/include/lac/vector.templates.h
+++ b/deal.II/lac/include/lac/vector.templates.h
@@ -454,13 +454,14 @@ void Vector<Number>::equ (const Number a, const Vector<Number>& u,
 
 
 template <typename Number>
-void Vector<Number>::equ (const Number a, const Vector<Number>& u)
+template <typename Number2>
+void Vector<Number>::equ (const Number a, const Vector<Number2>& u)
 {
   Assert (dim!=0, ExcEmptyVector());
   Assert (dim == u.dim, ExcDimensionMismatch(dim, u.dim));
   iterator i_ptr = begin(),
 	   i_end = end();
-  const_iterator u_ptr = u.begin();
+  typename Vector<Number2>::const_iterator u_ptr = u.begin();
   while (i_ptr!=i_end)
     *i_ptr++ = a * *u_ptr++;
 }
diff --git a/deal.II/lac/source/block_vector.cc b/deal.II/lac/source/block_vector.cc
index b4cf91a8e9..195ab611e2 100644
--- a/deal.II/lac/source/block_vector.cc
+++ b/deal.II/lac/source/block_vector.cc
@@ -19,12 +19,16 @@ template BlockVector<double>& BlockVector<double>::operator=(
   const BlockVector<float>&);
 template void BlockVector<double>::reinit(const BlockVector<double>&, bool);
 template void BlockVector<double>::reinit(const BlockVector<float>&, bool);
+template void BlockVector<double>::equ(double, const BlockVector<double>&);
+template void BlockVector<double>::equ(double, const BlockVector<float>&);
 
 template class BlockVector<float>;
 template BlockVector<float>& BlockVector<float>::operator=(
   const BlockVector<double>&);
 template void BlockVector<float>::reinit(const BlockVector<double>&, bool);
 template void BlockVector<float>::reinit(const BlockVector<float>&, bool);
+template void BlockVector<float>::equ(float, const BlockVector<double>&);
+template void BlockVector<float>::equ(float, const BlockVector<float>&);
 
 namespace BlockVectorIterators
 {
diff --git a/deal.II/lac/source/vector.cc b/deal.II/lac/source/vector.cc
index 73a210a9be..7a960f80d9 100644
--- a/deal.II/lac/source/vector.cc
+++ b/deal.II/lac/source/vector.cc
@@ -21,6 +21,8 @@ template double Vector<double>::operator*(const Vector<float>&) const;
 template double Vector<double>::operator*(const Vector<double>&) const;
 template void Vector<double>::reinit(const Vector<double>&, bool);
 template void Vector<double>::reinit(const Vector<float>&, bool);
+template void Vector<double>::equ(double, const Vector<double>&);
+template void Vector<double>::equ(double, const Vector<float>&);
 
 template class Vector<float>;
 template Vector<float>& Vector<float>::operator=(const Vector<double>&);
@@ -28,6 +30,8 @@ template float Vector<float>::operator*(const Vector<float>&) const;
 template float Vector<float>::operator*(const Vector<double>&) const;
 template void Vector<float>::reinit(const Vector<double>&, bool);
 template void Vector<float>::reinit(const Vector<float>&, bool);
+template void Vector<float>::equ(float, const Vector<double>&);
+template void Vector<float>::equ(float, const Vector<float>&);
 
 // see the .h file for why these functions are disabled.
 // template Vector<float>::Vector (const Vector<double>& v);
diff --git a/deal.II/lac/source/vector.long_double.cc b/deal.II/lac/source/vector.long_double.cc
index 55ba19b90c..8fd4269532 100644
--- a/deal.II/lac/source/vector.long_double.cc
+++ b/deal.II/lac/source/vector.long_double.cc
@@ -17,16 +17,28 @@
 // explicit instantiations
 template class Vector<long double>;
 
-template Vector<long double>& Vector<long double>::operator=(const Vector<float>&);
 template Vector<long double>& Vector<long double>::operator=(const Vector<double>&);
+template Vector<long double>& Vector<long double>::operator=(const Vector<float>&);
+template long double Vector<long double>::operator * (const Vector<long double> &) const;
+template long double Vector<long double>::operator * (const Vector<double> &) const;
+template long double Vector<long double>::operator * (const Vector<float> &) const;
+template void Vector<long double>::reinit(const Vector<long double>&, bool);
+template void Vector<long double>::reinit(const Vector<double>&, bool);
+template void Vector<long double>::reinit(const Vector<float>&, bool);
+template void Vector<long double>::equ(long double, const Vector<long double>&);
+template void Vector<long double>::equ(long double, const Vector<double>&);
+template void Vector<long double>::equ(long double, const Vector<float>&);
+
 template Vector<double>& Vector<double>::operator=(const Vector<long double>&);
-template Vector<float>& Vector<float>::operator=(const Vector<long double>&);
+template double Vector<double>::operator * (const Vector<long double> &) const;
+template void Vector<double>::reinit(const Vector<long double>&, bool);
+template void Vector<double>::equ(double, const Vector<long double>&);
 
+template Vector<float>& Vector<float>::operator=(const Vector<long double>&);
 template float Vector<float>::operator * (const Vector<long double> &) const;
-template double Vector<double>::operator * (const Vector<long double> &) const;
-template long double Vector<long double>::operator * (const Vector<float> &) const;
-template long double Vector<long double>::operator * (const Vector<double> &) const;
-template long double Vector<long double>::operator * (const Vector<long double> &) const;
+template void Vector<float>::reinit(const Vector<long double>&, bool);
+template void Vector<float>::equ(float, const Vector<long double>&);
+
 // see the .h file for why these functions are disabled.
 // template Vector<float>::Vector (const Vector<double>& v);
 // template Vector<double>::Vector (const Vector<float>& v);