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 0797cad4a32134996eb14ce6ca8264cca68276cf..8314727ac81dd62ca176c90b04220ee3c5f28d37 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
           communication_pattern = {}) override;
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      DEAL_II_DEPRECATED_EARLY virtual void
+      import(const ReadWriteVector<Number> &V,
+             VectorOperation::values        operation,
+             std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+               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 473461a40b19e8a1c2c3c8fc1999b31e7f5a9064..3bbf54bfe01ba0146d1bee8852fa5fb97fe9db53 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
           communication_pattern = {}) override;
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      DEAL_II_DEPRECATED_EARLY virtual void
+      import(const LinearAlgebra::ReadWriteVector<Number> &V,
+             VectorOperation::values                       operation,
+             std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+               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 7f0e23025c689ec21045a32d1e29f311c089ed2d..dd71ae63e0311c4a1d09804e8837e9c73805298d 100644 (file)
--- 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<Number, MemorySpace2> &src,
                       VectorOperation::values             operation);
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      template <typename MemorySpace2>
+      DEAL_II_DEPRECATED_EARLY void
+      import(const Vector<Number, MemorySpace2> &src,
+             VectorOperation::values             operation)
+      {
+        import_elements(src, operation);
+      }
+
       /** @} */
 
       /**
@@ -751,6 +762,18 @@ namespace LinearAlgebra
         std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
           communication_pattern = {}) override;
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      DEAL_II_DEPRECATED_EARLY virtual void
+      import(const LinearAlgebra::ReadWriteVector<Number> &V,
+             VectorOperation::values                       operation,
+             std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+               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 b3bfee762b0a5309816e6495c059f11ffc22407b..e1c8f2a53a6f5cfeb85e63d8099995f23f2b0035 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
         communication_pattern = {}) override;
 
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    DEAL_II_DEPRECATED_EARLY
+    virtual void
+    import(const ReadWriteVector<Number> &V,
+           VectorOperation::values        operation,
+           std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             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 2a31b247af4a303ae255de86342202946b9e1ce5..91b783f20bb34d7224eb3ff5b0db1b52849eb6c1 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
         &communication_pattern = {});
 
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    DEAL_II_DEPRECATED_EARLY
+    void
+    import(const dealii::Vector<Number> &V,
+           VectorOperation::values       operation,
+           const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             &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<const Utilities::MPI::CommunicationPatternBase>
         &communication_pattern = {});
 
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    DEAL_II_DEPRECATED_EARLY
+    void
+    import(const LinearAlgebra::Vector<Number> &V,
+           VectorOperation::values              operation,
+           const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             &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<const Utilities::MPI::CommunicationPatternBase>
         &communication_pattern = {});
 
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    template <typename MemorySpace>
+    DEAL_II_DEPRECATED_EARLY void
+    import(const distributed::Vector<Number, MemorySpace> &V,
+           VectorOperation::values                         operation,
+           const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             &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<const Utilities::MPI::CommunicationPatternBase>
         &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<const Utilities::MPI::CommunicationPatternBase>
+             &communication_pattern = {})
+    {
+      import_elements(V, operation, communication_pattern);
+    }
 #endif
 
 #ifdef DEAL_II_WITH_TRILINOS
@@ -371,6 +424,19 @@ namespace LinearAlgebra
       const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
         &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<const Utilities::MPI::CommunicationPatternBase>
+             &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<const Utilities::MPI::CommunicationPatternBase>
         &communication_pattern = {});
+
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    template <typename Dummy = Number>
+    DEAL_II_DEPRECATED_EARLY
+      std::enable_if_t<std::is_same<Dummy, Number>::value &&
+                       dealii::is_tpetra_type<Number>::value>
+      import(
+        const TpetraWrappers::Vector<Number> &V,
+        VectorOperation::values               operation,
+        const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+          &communication_pattern = {})
+    {
+      import_elements(V, operation, communication_pattern);
+    }
 #  endif
 
     /**
@@ -404,6 +486,19 @@ namespace LinearAlgebra
       VectorOperation::values       operation,
       const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
         &communication_pattern = {});
+
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    DEAL_II_DEPRECATED_EARLY
+    void
+    import(const EpetraWrappers::Vector &V,
+           VectorOperation::values       operation,
+           const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             &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<const Utilities::MPI::CommunicationPatternBase>
         &communication_pattern = {});
+
+
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    DEAL_II_DEPRECATED_EARLY
+    void
+    import(const CUDAWrappers::Vector<Number> &V,
+           VectorOperation::values             operation,
+           const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             &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 b8a53b18c3371b81c9e86dea756b043525d042a9..94826f717f53292be1b103e2e08dd37bb659e724 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
           communication_pattern = {}) override;
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      DEAL_II_DEPRECATED_EARLY
+      virtual void
+      import(const ReadWriteVector<double> &V,
+             VectorOperation::values        operation,
+             std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+               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 ce3c5d9160f0fa87d79bed249ca0863b5096594a..e5d1bd55c8ecfcf667cc52966378c3d3bfc135fc 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
           communication_pattern = {}) override;
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      DEAL_II_DEPRECATED_EARLY
+      virtual void
+      import(const ReadWriteVector<double> &V,
+             VectorOperation::values        operation,
+             std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+               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 066d727f6ea403247091bdee0888212b0985ccf2..af36535854d836249c226be353fc31cb348c4216 100644 (file)
--- 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<double> &rwv,
                       const VectorOperation::values                 operation);
 
+      /**
+       * @deprecated Use import_elements() instead.
+       */
+      DEAL_II_DEPRECATED_EARLY
+      void
+      import(const LinearAlgebra::ReadWriteVector<double> &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 38dc0dde84efc8911d8d586b0b8ae535187f1fda..545935fcae90c84333eb3753b870e8558373bc6b 100644 (file)
--- 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<const Utilities::MPI::CommunicationPatternBase>
         communication_pattern = {}) = 0;
 
+    /**
+     * @deprecated Use import_elements() instead.
+     */
+    DEAL_II_DEPRECATED_EARLY
+    virtual void
+    import(const ReadWriteVector<Number> &V,
+           VectorOperation::values        operation,
+           std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
+             communication_pattern = {}) = 0;
+
     /**
      * Return the scalar product of two vectors.
      */