Move a few files to vector.h and make them inline because we need them in libbase...

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

diff --git a/deal.II/lac/include/lac/vector.h b/deal.II/lac/include/lac/vector.h
index 61872652d54667354339b300170ac9c8724128e2..7251f05525a6421dd45f90991a6d894651e3a14e 100644 (file)
--- a/deal.II/lac/include/lac/vector.h
+++ b/deal.II/lac/include/lac/vector.h
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors
+//    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -951,7 +951,8 @@ Vector<Number> & Vector<Number>::operator *= (const Number factor)
 
 template <typename Number>
 inline
-Vector<Number> & Vector<Number>::operator /= (const Number factor)
+Vector<Number> &
+Vector<Number>::operator /= (const Number factor)
 {
   Assert (deal_II_numbers::is_finite(factor), 
           ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
@@ -963,6 +964,68 @@ Vector<Number> & Vector<Number>::operator /= (const Number factor)
 
 
 
+template <typename Number>
+inline
+void
+Vector<Number>::scale (const Number factor)
+{
+  Assert (deal_II_numbers::is_finite(factor), 
+          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
+
+  Assert (vec_size!=0, ExcEmptyObject());
+
+  iterator             ptr  = begin();
+  const const_iterator eptr = end();
+  while (ptr!=eptr)
+    *ptr++ *= factor;
+}
+
+
+
+template <typename Number>
+inline
+void
+Vector<Number>::add (const Number a,
+                    const Vector<Number>& v)
+{
+  Assert (deal_II_numbers::is_finite(a), 
+          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
+
+  Assert (vec_size!=0, ExcEmptyObject());
+  Assert (vec_size == v.vec_size, ExcDimensionMismatch(vec_size, v.vec_size));
+
+  iterator i_ptr = begin(),
+          i_end = end();
+  const_iterator v_ptr = v.begin();
+  while (i_ptr!=i_end)
+    *i_ptr++ += a * *v_ptr++;
+}
+
+
+
+template <typename Number>
+inline
+void
+Vector<Number>::sadd (const Number x,
+                     const Number a,
+                     const Vector<Number>& v)
+{
+  Assert (deal_II_numbers::is_finite(x), 
+          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
+  Assert (deal_II_numbers::is_finite(a), 
+          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
+
+  Assert (vec_size!=0, ExcEmptyObject());
+  Assert (vec_size == v.vec_size, ExcDimensionMismatch(vec_size, v.vec_size));
+  iterator i_ptr = begin(),
+          i_end = end();
+  const_iterator v_ptr = v.begin();
+  for (; i_ptr!=i_end; ++i_ptr)
+    *i_ptr = x * *i_ptr  +  a * *v_ptr++;
+}
+
+
+
 
 template <typename Number>
 template <typename Number2>

diff --git a/deal.II/lac/include/lac/vector.templates.h b/deal.II/lac/include/lac/vector.templates.h
index 09985c01a876fd1e383a82caf514a756a62dc385..a39e2209f13b4f1e24e4a626c5b11ac48fef11ea 100644 (file)
--- a/deal.II/lac/include/lac/vector.templates.h
+++ b/deal.II/lac/include/lac/vector.templates.h
@@ -439,23 +439,6 @@ void Vector<Number>::add (const Vector<Number>& v)
 }
 
 
-template <typename Number>
-void Vector<Number>::add (const Number a, const Vector<Number>& v)
-{
-  Assert (deal_II_numbers::is_finite(a), 
-          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
-
-  Assert (vec_size!=0, ExcEmptyObject());
-  Assert (vec_size == v.vec_size, ExcDimensionMismatch(vec_size, v.vec_size));
-
-  iterator i_ptr = begin(),
-          i_end = end();
-  const_iterator v_ptr = v.begin();
-  while (i_ptr!=i_end)
-    *i_ptr++ += a * *v_ptr++;
-}
-
-
 template <typename Number>
 void Vector<Number>::add (const Number a, const Vector<Number>& v,
                          const Number b, const Vector<Number>& w)
@@ -493,24 +476,6 @@ void Vector<Number>::sadd (const Number x, const Vector<Number>& v)
 }
 
 
-template <typename Number>
-void Vector<Number>::sadd (const Number x, const Number a,
-                           const Vector<Number>& v)
-{
-  Assert (deal_II_numbers::is_finite(x), 
-          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
-  Assert (deal_II_numbers::is_finite(a), 
-          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
-
-  Assert (vec_size!=0, ExcEmptyObject());
-  Assert (vec_size == v.vec_size, ExcDimensionMismatch(vec_size, v.vec_size));
-  iterator i_ptr = begin(),
-          i_end = end();
-  const_iterator v_ptr = v.begin();
-  for (; i_ptr!=i_end; ++i_ptr)
-    *i_ptr = x * *i_ptr  +  a * *v_ptr++;
-}
-
 
 template <typename Number>
 void Vector<Number>::sadd (const Number x, const Number a,
@@ -567,22 +532,6 @@ void Vector<Number>::sadd (const Number x, const Number a,
 
 
 
-template <typename Number>
-void Vector<Number>::scale (const Number factor)
-{
-  Assert (deal_II_numbers::is_finite(factor), 
-          ExcMessage("The given value is not finite but either infinite or Not A Number (NaN)"));
-
-  Assert (vec_size!=0, ExcEmptyObject());
-
-  iterator             ptr  = begin();
-  const const_iterator eptr = end();
-  while (ptr!=eptr)
-    *ptr++ *= factor;
-}
-
-
-
 template <typename Number>
 template <typename Number2>
 void Vector<Number>::scale (const Vector<Number2> &s)