From 30dc0810d80094e26569a53875d552ec626f1deb Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Thu, 19 Nov 2015 14:59:31 -0600 Subject: [PATCH] Remove sadd(scalar,Vector) from VectorSpaceVector interface. --- include/deal.II/lac/la_vector.h | 5 ----- include/deal.II/lac/la_vector.templates.h | 9 --------- include/deal.II/lac/vector_space_vector.h | 5 ----- tests/lac/la_vector_vector.cc | 2 +- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index 893f960b4b..3ef5cda12a 100644 --- 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 &V, const Number b, const VectorSpaceVector &W); - /** - * Scaling and simple vector addition, i.e. *this = s*(*this)+V. - */ - virtual void sadd(const Number s, const VectorSpaceVector &V); - /** * Scaling and simple addition of a multiple of a vector, i.e. *this = * s*(*this)+a*V. diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h index 92f8d0bbe7..9c69b9c78d 100644 --- 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 - void Vector::sadd(const Number s, const VectorSpaceVector &V) - { - *this *= s; - *this += V; - } - - - template void Vector::sadd(const Number s, const Number a, const VectorSpaceVector &V) diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h index 1f09437bac..b12c8c8564 100644 --- 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 &V, const Number b, const VectorSpaceVector &W) = 0; - /** - * Scaling and simple vector addition, i.e. *this = s*(*this)+V. - */ - virtual void sadd(const Number s, const VectorSpaceVector &V) = 0; - /** * Scaling and simple addition of a multiple of a vector, i.e. *this = * s*(*this)+a*V. diff --git a/tests/lac/la_vector_vector.cc b/tests/lac/la_vector_vector.cc index 1dbc2c4be9..1ec01ebc56 100644 --- a/tests/lac/la_vector_vector.cc +++ b/tests/lac/la_vector_vector.cc @@ -116,7 +116,7 @@ void check_vectors (LinearAlgebra::Vector &d1, LinearAlgebra::Vector