Remove sadd(scalar,Vector) from VectorSpaceVector interface.

diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h
index 893f960b4b6bcbf07ee0633e7ea9e5bdf6ff0ef5..3ef5cda12a95c89160cc2987cc357b932184de09 100644 (file)
--- a/include/deal.II/lac/la_vector.h
+++ b/include/deal.II/lac/la_vector.h
@@ -148,11 +148,6 @@ namespace LinearAlgebra
     virtual void add(const Number a, const VectorSpaceVector<Number> &V,
                      const Number b, const VectorSpaceVector<Number> &W);
 
-    /**
-     * Scaling and simple vector addition, i.e. <tt>*this = s*(*this)+V</tt>.
-     */
-    virtual void sadd(const Number s, const VectorSpaceVector<Number> &V);
-
     /**
      * Scaling and simple addition of a multiple of a vector, i.e. <tt>*this =
      * s*(*this)+a*V</tt>.

diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h
index 92f8d0bbe751cdeadca07f7f5510c14548e36662..9c69b9c78dff417fbda863e270fa513c8fa6af2a 100644 (file)
--- a/include/deal.II/lac/la_vector.templates.h
+++ b/include/deal.II/lac/la_vector.templates.h
@@ -166,15 +166,6 @@ namespace LinearAlgebra
 
 
 
-  template <typename Number>
-  void Vector<Number>::sadd(const Number s, const VectorSpaceVector<Number> &V)
-  {
-    *this *= s;
-    *this += V;
-  }
-
-
-
   template <typename Number>
   void Vector<Number>::sadd(const Number s, const Number a,
                             const VectorSpaceVector<Number> &V)

diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h
index 1f09437bac1937b8648bc59222190734db367d5c..b12c8c8564986f42f1ba61c0e11406df15af7516 100644 (file)
--- a/include/deal.II/lac/vector_space_vector.h
+++ b/include/deal.II/lac/vector_space_vector.h
@@ -93,11 +93,6 @@ namespace LinearAlgebra
     virtual void add(const Number a, const VectorSpaceVector<Number> &V,
                      const Number b, const VectorSpaceVector<Number> &W) = 0;
 
-    /**
-     * Scaling and simple vector addition, i.e. <tt>*this = s*(*this)+V</tt>.
-     */
-    virtual void sadd(const Number s, const VectorSpaceVector<Number> &V) = 0;
-
     /**
      * Scaling and simple addition of a multiple of a vector, i.e. <tt>*this =
      * s*(*this)+a*V</tt>.

diff --git a/tests/lac/la_vector_vector.cc b/tests/lac/la_vector_vector.cc
index 1dbc2c4be9cbd69ecd9409cc3a7dbb2af9aa7bfb..1ec01ebc567009dd30b619df8ba16f8593cdd128 100644 (file)
--- a/tests/lac/la_vector_vector.cc
+++ b/tests/lac/la_vector_vector.cc
@@ -116,7 +116,7 @@ void check_vectors (LinearAlgebra::Vector<number1> &d1, LinearAlgebra::Vector<nu
 
   deallog << "sadd & scale" << std::endl;
 
-  d2.sadd (2., d1);
+  d2.sadd (2., 1., d1);
   print (d2);
 
   d2.sadd (2., .5, d1);