From: Wolfgang Bangerth Date: Wed, 24 May 2023 01:14:13 +0000 (-0600) Subject: Re-introduce the now deprecated name. X-Git-Tag: v9.5.0-rc1~198^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad32ce5a50aa7706659b3148aa28cee2f42ec1a3;p=dealii.git Re-introduce the now deprecated name. --- diff --git a/include/deal.II/lac/cuda_vector.h b/include/deal.II/lac/cuda_vector.h index 0797cad4a3..8314727ac8 100644 --- a/include/deal.II/lac/cuda_vector.h +++ b/include/deal.II/lac/cuda_vector.h @@ -147,6 +147,18 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) override; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY virtual void + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override + { + import_elements(V, operation, communication_pattern); + } + /** * Sets all elements of the vector to the scalar @p s. This operation is * only allowed if @p s is equal to zero. diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index 473461a40b..3bbf54bfe0 100644 --- a/include/deal.II/lac/la_parallel_block_vector.h +++ b/include/deal.II/lac/la_parallel_block_vector.h @@ -530,6 +530,18 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) override; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY virtual void + import(const LinearAlgebra::ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override + { + import_elements(V, operation, communication_pattern); + } + /** * Return the scalar product of two vectors. */ diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 7f0e23025c..dd71ae63e0 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -694,6 +694,17 @@ namespace LinearAlgebra import_elements(const Vector &src, VectorOperation::values operation); + /** + * @deprecated Use import_elements() instead. + */ + template + DEAL_II_DEPRECATED_EARLY void + import(const Vector &src, + VectorOperation::values operation) + { + import_elements(src, operation); + } + /** @} */ /** @@ -751,6 +762,18 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) override; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY virtual void + import(const LinearAlgebra::ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override + { + import_elements(V, operation, communication_pattern); + } + /** * Return the scalar product of two vectors. */ diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index b3bfee762b..e1c8f2a53a 100644 --- a/include/deal.II/lac/la_vector.h +++ b/include/deal.II/lac/la_vector.h @@ -228,6 +228,19 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) override; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + virtual void + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override + { + import_elements(V, operation, communication_pattern); + } + /** * Add @p a to all components. Note that @p a is a scalar not a vector. */ diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index 2a31b247af..91b783f20b 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -304,6 +304,19 @@ namespace LinearAlgebra const std::shared_ptr &communication_pattern = {}); + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const dealii::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } + /** * Imports all the elements present in the vector's IndexSet from the * input vector @p vec. VectorOperation::values @p operation @@ -320,6 +333,19 @@ namespace LinearAlgebra const std::shared_ptr &communication_pattern = {}); + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const LinearAlgebra::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } + /** * Imports all the elements present in the vector's IndexSet from the * input vector @p vec. VectorOperation::values @p operation @@ -336,6 +362,20 @@ namespace LinearAlgebra const std::shared_ptr &communication_pattern = {}); + /** + * @deprecated Use import_elements() instead. + */ + template + DEAL_II_DEPRECATED_EARLY void + import(const distributed::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } + + #ifdef DEAL_II_WITH_PETSC /** * Imports all the elements present in the vector's IndexSet from the input @@ -351,6 +391,19 @@ namespace LinearAlgebra VectorOperation::values operation, const std::shared_ptr &communication_pattern = {}); + + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const PETScWrappers::MPI::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } #endif #ifdef DEAL_II_WITH_TRILINOS @@ -371,6 +424,19 @@ namespace LinearAlgebra const std::shared_ptr &communication_pattern = {}); + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const TrilinosWrappers::MPI::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } + # ifdef DEAL_II_TRILINOS_WITH_TPETRA /** * Imports all the elements present in the vector's IndexSet from the input @@ -388,6 +454,22 @@ namespace LinearAlgebra VectorOperation::values operation, const std::shared_ptr &communication_pattern = {}); + + /** + * @deprecated Use import_elements() instead. + */ + template + DEAL_II_DEPRECATED_EARLY + std::enable_if_t::value && + dealii::is_tpetra_type::value> + import( + const TpetraWrappers::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } # endif /** @@ -404,6 +486,19 @@ namespace LinearAlgebra VectorOperation::values operation, const std::shared_ptr &communication_pattern = {}); + + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const EpetraWrappers::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } #endif #ifdef DEAL_II_WITH_CUDA @@ -419,6 +514,20 @@ namespace LinearAlgebra VectorOperation::values operation, const std::shared_ptr &communication_pattern = {}); + + + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const CUDAWrappers::Vector &V, + VectorOperation::values operation, + const std::shared_ptr + &communication_pattern = {}) + { + import_elements(V, operation, communication_pattern); + } #endif /** diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index b8a53b18c3..94826f717f 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -133,6 +133,19 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) override; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + virtual void + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override + { + import_elements(V, operation, communication_pattern); + } + /** * Multiply the entire vector by a fixed factor. */ diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h index ce3c5d9160..e5d1bd55c8 100644 --- a/include/deal.II/lac/trilinos_tpetra_vector.h +++ b/include/deal.II/lac/trilinos_tpetra_vector.h @@ -189,6 +189,19 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) override; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + virtual void + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override + { + import_elements(V, operation, communication_pattern); + } + /** * Multiply the entire vector by a fixed factor. */ diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 066d727f6e..af36535854 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -721,6 +721,17 @@ namespace TrilinosWrappers import_elements(const LinearAlgebra::ReadWriteVector &rwv, const VectorOperation::values operation); + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + void + import(const LinearAlgebra::ReadWriteVector &rwv, + const VectorOperation::values operation) + { + import_elements(rwv, operation); + } + /** * Test for equality. This function assumes that the present vector and diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h index 38dc0dde84..545935fcae 100644 --- a/include/deal.II/lac/vector_space_vector.h +++ b/include/deal.II/lac/vector_space_vector.h @@ -114,6 +114,16 @@ namespace LinearAlgebra std::shared_ptr communication_pattern = {}) = 0; + /** + * @deprecated Use import_elements() instead. + */ + DEAL_II_DEPRECATED_EARLY + virtual void + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) = 0; + /** * Return the scalar product of two vectors. */