From bec49b96816075ddaf0eaf08133cb860bd2c3894 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Mon, 15 Jun 2015 10:23:38 -0500 Subject: [PATCH] Deprecate the following functions: sadd with 7 arguments, equ with 6 arguments, and print with 3 arguments. --- examples/step-35/step-35.cc | 3 ++- include/deal.II/lac/parallel_vector.h | 10 +++++++--- include/deal.II/lac/petsc_vector_base.h | 6 ++++-- include/deal.II/lac/trilinos_vector_base.h | 4 +++- include/deal.II/lac/vector.h | 14 ++++++++++---- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/examples/step-35/step-35.cc b/examples/step-35/step-35.cc index e0e9fb5d19..f7e526da06 100644 --- a/examples/step-35/step-35.cc +++ b/examples/step-35/step-35.cc @@ -1003,7 +1003,8 @@ namespace Step35 void NavierStokesProjection::diffusion_step (const bool reinit_prec) { - pres_tmp.equ (-1., pres_n, -4./3., phi_n, 1./3., phi_n_minus_1); + pres_tmp = pres_n; + pres_tmp.sadd(-1., -4./3., phi_n, 1./3., phi_n_minus_1); assemble_advection_term(); diff --git a/include/deal.II/lac/parallel_vector.h b/include/deal.II/lac/parallel_vector.h index 03646db160..bca43440d8 100644 --- a/include/deal.II/lac/parallel_vector.h +++ b/include/deal.II/lac/parallel_vector.h @@ -826,7 +826,7 @@ namespace parallel /** * Simple vector addition, equal to the operator +=. * - * This function is deprecated use the operator += instead. + * @deprecated Use the operator += instead. */ void add (const Vector &V) DEAL_II_DEPRECATED; @@ -868,6 +868,8 @@ namespace parallel /** * Scaling and multiple addition. *this = s*(*this)+a*V + b*W + * c*X. + * + * This function is deprecated. */ void sadd (const Number s, const Number a, @@ -875,7 +877,7 @@ namespace parallel const Number b, const Vector &W, const Number c, - const Vector &X); + const Vector &X) DEAL_II_DEPRECATED; /** * Scale each element of the vector by a constant value. @@ -921,10 +923,12 @@ namespace parallel /** * Assignment *this = a*u + b*v + b*w. + * + * This function is deprecated. */ void equ (const Number a, const Vector &u, const Number b, const Vector &v, - const Number c, const Vector &w); + const Number c, const Vector &w) DEAL_II_DEPRECATED; /** * Compute the elementwise ratio of the two given vectors, that is let diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index 5e3dae8a0a..84e051cea7 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -599,7 +599,7 @@ namespace PETScWrappers /** * Simple vector addition, equal to the operator +=. * - * This function is deprecated use += instead. + * @deprecated Use the operator += instead. */ void add (const VectorBase &V) DEAL_II_DEPRECATED; @@ -639,6 +639,8 @@ namespace PETScWrappers /** * Scaling and multiple addition. *this = s*(*this)+a*V + b*W + * c*X. + * + * This function is deprecated. */ void sadd (const PetscScalar s, const PetscScalar a, @@ -646,7 +648,7 @@ namespace PETScWrappers const PetscScalar b, const VectorBase &W, const PetscScalar c, - const VectorBase &X); + const VectorBase &X) DEAL_II_DEPRECATED; /** * Scale each element of this vector by the corresponding element in the diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index a8ac99611d..6a0aca5595 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -747,6 +747,8 @@ namespace TrilinosWrappers /** * Scaling and multiple addition. *this = s*(*this) + a*V + b*W + * c*X. + * + * This function is deprecated. */ void sadd (const TrilinosScalar s, const TrilinosScalar a, @@ -754,7 +756,7 @@ namespace TrilinosWrappers const TrilinosScalar b, const VectorBase &W, const TrilinosScalar c, - const VectorBase &X); + const VectorBase &X) DEAL_II_DEPRECATED; /** * Scale each element of this vector by the corresponding element in the diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h index 6a65727f02..4882789621 100644 --- a/include/deal.II/lac/vector.h +++ b/include/deal.II/lac/vector.h @@ -665,7 +665,7 @@ public: /** * Simple vector addition, equal to the operator +=. * - * This function is deprecated use the operator += instead. + * @deprecate Use the operator += instead. * * @dealiiOperationIsMultithreaded */ @@ -719,6 +719,8 @@ public: * Scaling and multiple addition. *this = s*(*this)+a*V + b*W + * c*X. * + * This function is deprecated. + * * @dealiiOperationIsMultithreaded */ void sadd (const Number s, @@ -727,7 +729,7 @@ public: const Number b, const Vector &W, const Number c, - const Vector &X); + const Vector &X) DEAL_II_DEPRECATED; /** * Scale each element of the vector by a constant value. @@ -784,11 +786,13 @@ public: /** * Assignment *this = a*u + b*v + b*w. * + * This function is deprecated. + * * @dealiiOperationIsMultithreaded */ void equ (const Number a, const Vector &u, const Number b, const Vector &v, - const Number c, const Vector &w); + const Number c, const Vector &w) DEAL_II_DEPRECATED; /** * Compute the elementwise ratio of the two given vectors, that is let @@ -848,10 +852,12 @@ public: * manipulator, if printing across. If @p across is @p true then the vector * is printed in a line, while if @p false then the elements are printed on * a separate line each. + * + * This function is deprecated. */ void print (LogStream &out, const unsigned int width = 6, - const bool across = true) const; + const bool across = true) const DEAL_II_DEPRECATED; /** * Write the vector en bloc to a file. This is done in a binary mode, so the -- 2.39.5