]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove dealii:: prefix from VectorOperation. 14963/head
authorDavid Wells <drwells@email.unc.edu>
Thu, 23 Mar 2023 19:08:20 +0000 (15:08 -0400)
committerDavid Wells <drwells@email.unc.edu>
Thu, 23 Mar 2023 19:08:20 +0000 (15:08 -0400)
AFAICT this is never needed - we don't have any conflicting names and
none of our dependencies define a class with the same name.

28 files changed:
include/deal.II/base/partitioner.templates.h
include/deal.II/distributed/cell_data_transfer.templates.h
include/deal.II/lac/block_matrix_base.h
include/deal.II/lac/block_vector.h
include/deal.II/lac/block_vector_base.h
include/deal.II/lac/la_parallel_block_vector.h
include/deal.II/lac/la_parallel_block_vector.templates.h
include/deal.II/lac/la_parallel_vector.h
include/deal.II/lac/la_parallel_vector.templates.h
include/deal.II/lac/petsc_vector.h
include/deal.II/lac/read_write_vector.templates.h
include/deal.II/lac/relaxation_block.templates.h
include/deal.II/lac/sparse_matrix.h
include/deal.II/lac/sparse_matrix.templates.h
include/deal.II/lac/trilinos_sparse_matrix.h
include/deal.II/lac/trilinos_vector.h
include/deal.II/lac/vector.h
include/deal.II/matrix_free/matrix_free.h
include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h
include/deal.II/numerics/cell_data_transfer.templates.h
source/distributed/field_transfer.cc
source/distributed/solution_transfer.cc
source/lac/petsc_matrix_base.cc
source/lac/petsc_parallel_sparse_matrix.cc
source/lac/petsc_vector_base.cc
source/lac/trilinos_sparse_matrix.cc
source/lac/trilinos_vector.cc
source/matrix_free/vector_data_exchange.cc

index b27d484ee99ac3a9c143a17dd6cf2ac9b8188fda..3732ce92cb814ec3c55b27871ad64a2a8e9182ce 100644 (file)
@@ -587,7 +587,7 @@ namespace Utilities
         initialize_import_indices_plain_dev();
 #    endif
 
-      if (vector_operation != dealii::VectorOperation::insert)
+      if (vector_operation != VectorOperation::insert)
         AssertDimension(n_ghost_targets + n_import_targets, requests.size());
       // first wait for the receive to complete
       if (requests.size() > 0 && n_import_targets > 0)
@@ -603,7 +603,7 @@ namespace Utilities
                                                  MemorySpaceType,
                                                  MemorySpace::Default>::value)
             {
-              if (vector_operation == dealii::VectorOperation::add)
+              if (vector_operation == VectorOperation::add)
                 {
                   for (auto const &import_indices_plain :
                        import_indices_plain_dev)
@@ -627,7 +627,7 @@ namespace Utilities
                       read_position += chunk_size;
                     }
                 }
-              else if (vector_operation == dealii::VectorOperation::min)
+              else if (vector_operation == VectorOperation::min)
                 {
                   for (auto const &import_indices_plain :
                        import_indices_plain_dev)
@@ -654,7 +654,7 @@ namespace Utilities
                       read_position += chunk_size;
                     }
                 }
-              else if (vector_operation == dealii::VectorOperation::max)
+              else if (vector_operation == VectorOperation::max)
                 {
                   for (auto const &import_indices_plain :
                        import_indices_plain_dev)
@@ -700,13 +700,13 @@ namespace Utilities
               // local values. For insert, nothing is done here (but in debug
               // mode we assert that the specified value is either zero or
               // matches with the ones already present
-              if (vector_operation == dealii::VectorOperation::add)
+              if (vector_operation == VectorOperation::add)
                 for (const auto &import_range : import_indices_data)
                   for (unsigned int j = import_range.first;
                        j < import_range.second;
                        j++)
                     locally_owned_array[j] += *read_position++;
-              else if (vector_operation == dealii::VectorOperation::min)
+              else if (vector_operation == VectorOperation::min)
                 for (const auto &import_range : import_indices_data)
                   for (unsigned int j = import_range.first;
                        j < import_range.second;
@@ -717,7 +717,7 @@ namespace Utilities
                                           locally_owned_array[j]);
                       read_position++;
                     }
-              else if (vector_operation == dealii::VectorOperation::max)
+              else if (vector_operation == VectorOperation::max)
                 for (const auto &import_range : import_indices_data)
                   for (unsigned int j = import_range.first;
                        j < import_range.second;
index 8cd5508780fcfc3d11601c52a8d7593f2d81e292..f5290fb698040ad7d7efa7b69c5ea556dc6d796f 100644 (file)
@@ -50,7 +50,7 @@ namespace internal
         post_unpack_action(std::vector<VectorType *> &all_out)
         {
           for (auto &out : all_out)
-            out->compress(::dealii::VectorOperation::insert);
+            out->compress(VectorOperation::insert);
         }
 
         template <typename value_type>
index eb9ccd195e579946105bc6221e6ebfe1724004ff..a276bdda723dbaa6c6516426e2ef584d01142b60 100644 (file)
@@ -653,7 +653,7 @@ public:
    * for more information.
    */
   void
-  compress(::dealii::VectorOperation::values operation);
+  compress(VectorOperation::values operation);
 
   /**
    * Multiply the entire matrix by a fixed factor.
@@ -2144,8 +2144,7 @@ BlockMatrixBase<MatrixType>::diag_element(const size_type i) const
 
 template <class MatrixType>
 inline void
-BlockMatrixBase<MatrixType>::compress(
-  ::dealii::VectorOperation::values operation)
+BlockMatrixBase<MatrixType>::compress(VectorOperation::values operation)
 {
   for (unsigned int r = 0; r < n_block_rows(); ++r)
     for (unsigned int c = 0; c < n_block_cols(); ++c)
index 3a55071a3a6ee9f2789f3296da419a932f3c0993..a93616935731c75f0a15d82c89d44848dbd76b20 100644 (file)
@@ -179,8 +179,7 @@ public:
    * for more information.
    */
   void
-  compress(::dealii::VectorOperation::values operation =
-             ::dealii::VectorOperation::unknown);
+  compress(VectorOperation::values operation = VectorOperation::unknown);
 
   /**
    * Returns `false` as this is a serial block vector.
@@ -444,7 +443,7 @@ BlockVector<Number>::operator=(const BlockVector<Number2> &v)
 
 template <typename Number>
 inline void
-BlockVector<Number>::compress(::dealii::VectorOperation::values operation)
+BlockVector<Number>::compress(VectorOperation::values operation)
 {
   for (size_type i = 0; i < this->n_blocks(); ++i)
     this->components[i].compress(operation);
index 636babfe39e7582f4b79d89a8e389f6291bc47d5..858adac8f7fcf3f1a6aafb030eb0f78d5e07cda8 100644 (file)
@@ -508,7 +508,7 @@ public:
    * for more information.
    */
   void
-  compress(::dealii::VectorOperation::values operation);
+  compress(VectorOperation::values operation);
 
   /**
    * Access to a single block.
@@ -1527,8 +1527,7 @@ BlockVectorBase<VectorType>::collect_sizes()
 
 template <class VectorType>
 inline void
-BlockVectorBase<VectorType>::compress(
-  ::dealii::VectorOperation::values operation)
+BlockVectorBase<VectorType>::compress(VectorOperation::values operation)
 {
   for (unsigned int i = 0; i < n_blocks(); ++i)
     block(i).compress(operation);
index c250cf4004322fde7e104092526f72dc3131cce0..a0d1fdb129e902216ba97e413fc359afe7647a6e 100644 (file)
@@ -352,7 +352,7 @@ namespace LinearAlgebra
        * elements do not agree.
        */
       virtual void
-      compress(::dealii::VectorOperation::values operation) override;
+      compress(VectorOperation::values operation) override;
 
       /**
        * Fills the data field for ghost indices with the values stored in the
index d530d1819bc0f9fafe0c1fdbbeaff92ee5b6b5ab..bdb96d022bc6378abc128864c9f601f1cad50812 100644 (file)
@@ -372,7 +372,7 @@ namespace LinearAlgebra
 
     template <typename Number>
     void
-    BlockVector<Number>::compress(::dealii::VectorOperation::values operation)
+    BlockVector<Number>::compress(VectorOperation::values operation)
     {
       const unsigned int n_chunks =
         (this->n_blocks() + communication_block_size - 1) /
index cca0fe773663752746e7b1bb517b974cec259100..08467b477c01e34722641a8bb47482fa06c89b9e 100644 (file)
@@ -516,7 +516,7 @@ namespace LinearAlgebra
        * after the second calculation will be zero.
        */
       virtual void
-      compress(::dealii::VectorOperation::values operation) override;
+      compress(VectorOperation::values operation) override;
 
       /**
        * Fills the data field for ghost indices with the values stored in the
@@ -560,9 +560,8 @@ namespace LinearAlgebra
        * LinearAlgebra::distributed::BlockVector).
        */
       void
-      compress_start(
-        const unsigned int                communication_channel = 0,
-        ::dealii::VectorOperation::values operation = VectorOperation::add);
+      compress_start(const unsigned int      communication_channel = 0,
+                     VectorOperation::values operation = VectorOperation::add);
 
       /**
        * For all requests that have been initiated in compress_start, wait for
@@ -583,7 +582,7 @@ namespace LinearAlgebra
        * the device after the call to compress_start will be lost.
        */
       void
-      compress_finish(::dealii::VectorOperation::values operation);
+      compress_finish(VectorOperation::values operation);
 
       /**
        * Initiates communication for the @p update_ghost_values() function
index 21c9b8e530245fecf4c9649df8d56da509a4fcfb..3e4a6396efb99bf3a53a69a4dfe4b1e8a1295c88 100644 (file)
@@ -103,7 +103,7 @@ namespace LinearAlgebra
         static void
         import_elements(
           const ::dealii::LinearAlgebra::ReadWriteVector<Number> & /*V*/,
-          ::dealii::VectorOperation::values /*operation*/,
+          VectorOperation::values /*operation*/,
           const std::shared_ptr<const ::dealii::Utilities::MPI::Partitioner> &
           /*communication_pattern*/,
           const IndexSet & /*locally_owned_elem*/,
@@ -253,7 +253,7 @@ namespace LinearAlgebra
         static void
         import_elements(
           const ::dealii::LinearAlgebra::ReadWriteVector<Number> &V,
-          ::dealii::VectorOperation::values                       operation,
+          VectorOperation::values                                 operation,
           const std::shared_ptr<const ::dealii::Utilities::MPI::Partitioner>
             &             communication_pattern,
           const IndexSet &locally_owned_elem,
@@ -262,8 +262,8 @@ namespace LinearAlgebra
             &data)
         {
           Assert(
-            (operation == ::dealii::VectorOperation::add) ||
-              (operation == ::dealii::VectorOperation::insert),
+            (operation == VectorOperation::add) ||
+              (operation == VectorOperation::insert),
             ExcMessage(
               "Only VectorOperation::add and VectorOperation::insert are allowed"));
 
@@ -369,8 +369,8 @@ namespace LinearAlgebra
             &data)
         {
           Assert(
-            (operation == ::dealii::VectorOperation::add) ||
-              (operation == ::dealii::VectorOperation::insert),
+            (operation == VectorOperation::add) ||
+              (operation == VectorOperation::insert),
             ExcMessage(
               "Only VectorOperation::add and VectorOperation::insert are allowed"));
 
@@ -919,8 +919,7 @@ namespace LinearAlgebra
 
     template <typename Number, typename MemorySpaceType>
     void
-    Vector<Number, MemorySpaceType>::compress(
-      ::dealii::VectorOperation::values operation)
+    Vector<Number, MemorySpaceType>::compress(VectorOperation::values operation)
     {
       compress_start(0, operation);
       compress_finish(operation);
@@ -967,8 +966,8 @@ namespace LinearAlgebra
     template <typename Number, typename MemorySpaceType>
     void
     Vector<Number, MemorySpaceType>::compress_start(
-      const unsigned int                communication_channel,
-      ::dealii::VectorOperation::values operation)
+      const unsigned int      communication_channel,
+      VectorOperation::values operation)
     {
       AssertIndexRange(communication_channel, 200);
       Assert(vector_is_ghosted == false,
@@ -1044,7 +1043,7 @@ namespace LinearAlgebra
     template <typename Number, typename MemorySpaceType>
     void
     Vector<Number, MemorySpaceType>::compress_finish(
-      ::dealii::VectorOperation::values operation)
+      VectorOperation::values operation)
     {
 #ifdef DEAL_II_WITH_MPI
       vector_is_ghosted = false;
index 55cc9ac25ec9a0d5471a4485752e239c0a10e259..00199b16e0b4c240a3cdc6bb5855580089988c4f 100644 (file)
@@ -484,7 +484,7 @@ namespace PETScWrappers
       for (size_type i = 0; i < v.size(); ++i)
         (*this)(i) = v(i);
 
-      compress(::dealii::VectorOperation::insert);
+      compress(VectorOperation::insert);
 
       return *this;
     }
index b4feeac4178f43c8fe61e468e071024808b4c3a2..ef1d092a1ea278a63ceadf7cd22d69055a18cbeb 100644 (file)
@@ -97,9 +97,9 @@ namespace LinearAlgebra
     {
       static void
       import(const std::shared_ptr<const ::dealii::Utilities::MPI::Partitioner>
-               &                                     communication_pattern,
-             const Number *                          values,
-             const ::dealii::VectorOperation::values operation,
+               &                           communication_pattern,
+             const Number *                values,
+             const VectorOperation::values operation,
              ::dealii::LinearAlgebra::ReadWriteVector<Number> &rw_vector)
       {
         (void)communication_pattern;
@@ -124,9 +124,9 @@ namespace LinearAlgebra
 
       static void
       import(const std::shared_ptr<const ::dealii::Utilities::MPI::Partitioner>
-               &                                     communication_pattern,
-             const Number *                          values,
-             const ::dealii::VectorOperation::values operation,
+               &                           communication_pattern,
+             const Number *                values,
+             const VectorOperation::values operation,
              ::dealii::LinearAlgebra::ReadWriteVector<Number> &rw_vector)
       {
         distributed::Vector<Number, ::dealii::MemorySpace::Host> tmp_vector(
@@ -167,9 +167,9 @@ namespace LinearAlgebra
 
       static void
       import(const std::shared_ptr<const ::dealii::Utilities::MPI::Partitioner>
-               &                                     communication_pattern,
-             const Number *                          values,
-             const ::dealii::VectorOperation::values operation,
+               &                           communication_pattern,
+             const Number *                values,
+             const VectorOperation::values operation,
              ::dealii::LinearAlgebra::ReadWriteVector<Number> &rw_vector)
       {
         distributed::Vector<Number, ::dealii::MemorySpace::Host> tmp_vector(
index 050d4e76e078db764525e3fda7f541cd42563c56..6fb3f43906cb6a5dd17e6f851bc21a876ad73670 100644 (file)
@@ -283,7 +283,7 @@ RelaxationBlock<MatrixType, InverseNumberType, VectorType>::do_step(
               additional_data->relaxation * x_cell(row_cell);
         }
     }
-  dst.compress(dealii::VectorOperation::add);
+  dst.compress(VectorOperation::add);
 }
 
 
index dd6144b38e5cded223b0d524e5bc6c012514d41f..3277bf85365139cf446941714b42d4ee30fd338c 100644 (file)
@@ -783,7 +783,7 @@ public:
   /**
    * Dummy function for compatibility with distributed, parallel matrices.
    */
-  void compress(::dealii::VectorOperation::values);
+  void compress(VectorOperation::values);
 
   /** @} */
   /**
index bfc5c39534b7ec9558f431ff5e8de371dbfe8a7b..dc9fb42d50a5e8493483c9a954b2cf8f674daffa 100644 (file)
@@ -2069,7 +2069,7 @@ SparseMatrix<number>::block_read(std::istream &in)
 
 
 template <typename number>
-void SparseMatrix<number>::compress(::dealii::VectorOperation::values)
+void SparseMatrix<number>::compress(VectorOperation::values)
 {}
 
 
index 23ff3ade0bb2fd593c16efbc960e3e72b51c4bad..daab898a2f59263cf43dfd59611e4693a5ceeea9 100644 (file)
@@ -1034,7 +1034,7 @@ namespace TrilinosWrappers
      * for more information.
      */
     void
-    compress(::dealii::VectorOperation::values operation);
+    compress(VectorOperation::values operation);
 
     /**
      * Set the element (<i>i,j</i>) to @p value.
index fb0232102b44ec227dded147753484b544ffe5dc..5b2d87426c3ac998c11e62e0ae0dfd4cd994e6a8 100644 (file)
@@ -633,7 +633,7 @@ namespace TrilinosWrappers
        * for more information.
        */
       void
-      compress(::dealii::VectorOperation::values operation);
+      compress(VectorOperation::values operation);
 
       /**
        * Set all components of the vector to the given number @p s. Simply
index c049ce3898e2f41f33e340f81a5683888877840e..d240da88380c603d6e6da563cce50e5b422a14af 100644 (file)
@@ -271,8 +271,7 @@ public:
    * an empty function.
    */
   void
-  compress(::dealii::VectorOperation::values operation =
-             ::dealii::VectorOperation::unknown) const;
+  compress(VectorOperation::values operation = VectorOperation::unknown) const;
 
   /**
    * Change the dimension of the vector to @p N. The reserved memory for this
@@ -1326,7 +1325,7 @@ Vector<Number>::operator!=(const Vector<Number2> &v) const
 
 
 template <typename Number>
-inline void Vector<Number>::compress(::dealii::VectorOperation::values) const
+inline void Vector<Number>::compress(VectorOperation::values) const
 {}
 
 
index 05fc6890148e0b0feca1c907d23ce1efa7ae3ac2..d9690891575cca964164b2bf03447264f2c6071c 100644 (file)
@@ -3618,7 +3618,7 @@ namespace internal
     {
       (void)component_in_block_vector;
       Assert(vec.has_ghost_elements() == false, ExcNotImplemented());
-      vec.compress(dealii::VectorOperation::add);
+      vec.compress(VectorOperation::add);
     }
 
 
@@ -3681,7 +3681,7 @@ namespace internal
           AssertDimension(requests.size(), tmp_data.size());
 
           part.import_from_ghosted_array_start(
-            dealii::VectorOperation::add,
+            VectorOperation::add,
             component_in_block_vector * 2 + channel_shift,
             ArrayView<Number>(vec.begin(), part.locally_owned_size()),
             vec.shared_vector_data(),
@@ -3725,7 +3725,7 @@ namespace internal
                     VectorType &       vec)
     {
       (void)component_in_block_vector;
-      vec.compress_finish(dealii::VectorOperation::add);
+      vec.compress_finish(VectorOperation::add);
     }
 
 
@@ -4255,7 +4255,7 @@ namespace internal
     const unsigned int                                    channel = 0)
   {
     if (get_communication_block_size(vec) < vec.n_blocks())
-      vec.compress(dealii::VectorOperation::add);
+      vec.compress(VectorOperation::add);
     else
       for (unsigned int i = 0; i < vec.n_blocks(); ++i)
         compress_start(vec.block(i), exchanger, channel + i);
index 25288806cf3eb5ffc6e2411ec545af42fc04beb5..3e3c81c96b8987be746bd29251fb324335d82738 100644 (file)
@@ -2315,7 +2315,7 @@ namespace internal
 
       embedded_partitioner
         ->template import_from_ghosted_array_start<Number, MemorySpace::Host>(
-          dealii::VectorOperation::add,
+          VectorOperation::add,
           0,
           dealii::ArrayView<Number>(
             const_cast<Number *>(vec.begin()) +
@@ -2338,7 +2338,7 @@ namespace internal
 
       embedded_partitioner
         ->template import_from_ghosted_array_finish<Number, MemorySpace::Host>(
-          dealii::VectorOperation::add,
+          VectorOperation::add,
           dealii::ArrayView<const Number>(buffer.begin(), buffer.size()),
           dealii::ArrayView<Number>(vec.begin(),
                                     embedded_partitioner->locally_owned_size()),
index 14dde6d97ea2a631682fd73db3f926d3e3be506f..c255d9a8b566044d9056a95efa22e3284f7da958 100644 (file)
@@ -35,7 +35,7 @@ namespace internal
     void
     post_unpack_action(VectorType &out)
     {
-      out.compress(::dealii::VectorOperation::insert);
+      out.compress(VectorOperation::insert);
     }
 
     template <typename value_type>
index 2f633debc22473a9bfd45055ecbddec3e840bda5..75f870b5421be74ef3f798155a2e5ea9c12aada1 100644 (file)
@@ -204,7 +204,7 @@ namespace parallel
 
 
         // Communicate the results.
-        out.compress(dealii::VectorOperation::insert);
+        out.compress(VectorOperation::insert);
 
         // Treat hanging nodes
         std::vector<types::global_dof_index> dof_indices;
index 3f47b9ab371e14ba8c8eced1d32ea3dd7aa8037f..73c17428fa6432577605fc21c45e4e6e0b44703d 100644 (file)
@@ -270,24 +270,24 @@ namespace parallel
         {
           // finalize valence: compress and invert
           using Number = typename VectorType::value_type;
-          valence.compress(::dealii::VectorOperation::add);
+          valence.compress(VectorOperation::add);
           for (const auto i : valence.locally_owned_elements())
             valence[i] = (static_cast<Number>(valence[i]) == Number() ?
                             Number() :
                             (Number(1.0) / static_cast<Number>(valence[i])));
-          valence.compress(::dealii::VectorOperation::insert);
+          valence.compress(VectorOperation::insert);
 
           for (const auto vec : all_out)
             {
               // compress and weight with valence
-              vec->compress(::dealii::VectorOperation::add);
+              vec->compress(VectorOperation::add);
               vec->scale(valence);
             }
         }
       else
         {
           for (const auto vec : all_out)
-            vec->compress(::dealii::VectorOperation::insert);
+            vec->compress(VectorOperation::insert);
         }
 
       input_vectors.clear();
index 9592822eb0ab326bce6152d22757a0e380b9ef58..43133ce0c34730c6dc16566c6b6d9c8a7212fb0e 100644 (file)
@@ -92,7 +92,7 @@ namespace PETScWrappers
   void
   MatrixBase::reinit(Mat A)
   {
-    AssertThrow(last_action == ::dealii::VectorOperation::unknown,
+    AssertThrow(last_action == VectorOperation::unknown,
                 ExcMessage("Cannot assign a new Mat."));
     PetscErrorCode ierr =
       PetscObjectReference(reinterpret_cast<PetscObject>(A));
index 32981d4451151caf38119b6afeb753ed6647ffc1..7f32a3910f3e5192a8a20ad953b6a9180e29244e 100644 (file)
@@ -326,7 +326,7 @@ namespace PETScWrappers
           ierr = MatMPIAIJSetPreallocationCSR(matrix, &i, &i, nullptr);
           AssertThrow(ierr == 0, ExcPETScError(ierr));
         }
-      compress(dealii::VectorOperation::insert);
+      compress(VectorOperation::insert);
 
       {
         close_matrix(matrix);
@@ -664,7 +664,7 @@ namespace PETScWrappers
           ierr = MatSeqAIJSetPreallocationCSR(local_matrix, &i, &i, nullptr);
           AssertThrow(ierr == 0, ExcPETScError(ierr));
         }
-      compress(dealii::VectorOperation::insert);
+      compress(VectorOperation::insert);
 
       {
         close_matrix(local_matrix);
index acf55a5085d518284f7543a5590b83ed8e990fb2..1160f17aeb4cb303425c7e096808e6f40dc3f537 100644 (file)
@@ -123,7 +123,7 @@ namespace PETScWrappers
   VectorBase::VectorBase()
     : vector(nullptr)
     , ghosted(false)
-    , last_action(::dealii::VectorOperation::unknown)
+    , last_action(VectorOperation::unknown)
   {}
 
 
@@ -132,7 +132,7 @@ namespace PETScWrappers
     : Subscriptor()
     , ghosted(v.ghosted)
     , ghost_indices(v.ghost_indices)
-    , last_action(::dealii::VectorOperation::unknown)
+    , last_action(VectorOperation::unknown)
   {
     PetscErrorCode ierr = VecDuplicate(v.vector, &vector);
     AssertThrow(ierr == 0, ExcPETScError(ierr));
@@ -147,7 +147,7 @@ namespace PETScWrappers
     : Subscriptor()
     , vector(v)
     , ghosted(false)
-    , last_action(::dealii::VectorOperation::unknown)
+    , last_action(VectorOperation::unknown)
   {
     /* TODO GHOSTED */
     const PetscErrorCode ierr =
@@ -171,7 +171,7 @@ namespace PETScWrappers
   VectorBase::reinit(Vec v)
   {
     /* TODO GHOSTED */
-    AssertThrow(last_action == ::dealii::VectorOperation::unknown,
+    AssertThrow(last_action == VectorOperation::unknown,
                 ExcMessage("Cannot assign a new Vec"));
     PetscErrorCode ierr =
       PetscObjectReference(reinterpret_cast<PetscObject>(v));
@@ -189,7 +189,7 @@ namespace PETScWrappers
 
     ghosted = false;
     ghost_indices.clear();
-    last_action = ::dealii::VectorOperation::unknown;
+    last_action = VectorOperation::unknown;
   }
 
 
@@ -407,8 +407,8 @@ namespace PETScWrappers
                                      get_mpi_communicator());
       AssertThrowMPI(ierr);
 
-      AssertThrow(all_int_last_action != (::dealii::VectorOperation::add |
-                                          ::dealii::VectorOperation::insert),
+      AssertThrow(all_int_last_action !=
+                    (VectorOperation::add | VectorOperation::insert),
                   ExcMessage("Error: not all processors agree on the last "
                              "VectorOperation before this compress() call."));
 #    endif
@@ -416,8 +416,7 @@ namespace PETScWrappers
     }
 
     AssertThrow(
-      last_action == ::dealii::VectorOperation::unknown ||
-        last_action == operation,
+      last_action == VectorOperation::unknown || last_action == operation,
       ExcMessage(
         "Missing compress() or calling with wrong VectorOperation argument."));
 
@@ -443,7 +442,7 @@ namespace PETScWrappers
     // reset the last action field to
     // indicate that we're back to a
     // pristine state
-    last_action = ::dealii::VectorOperation::unknown;
+    last_action = VectorOperation::unknown;
   }
 
 
@@ -973,11 +972,9 @@ namespace PETScWrappers
                                    const PetscScalar *values,
                                    const bool         add_values)
   {
-    ::dealii::VectorOperation::values action =
-      (add_values ? ::dealii::VectorOperation::add :
-                    ::dealii::VectorOperation::insert);
-    Assert((last_action == action) ||
-             (last_action == ::dealii::VectorOperation::unknown),
+    VectorOperation::values action =
+      (add_values ? VectorOperation::add : VectorOperation::insert);
+    Assert((last_action == action) || (last_action == VectorOperation::unknown),
            internal::VectorReference::ExcWrongMode(action, last_action));
     Assert(!has_ghost_elements(), ExcGhostsPresent());
     // VecSetValues complains if we
index 7c5992f1e425f15c5f66f1470262361d6fd9c5e3..374fb9492073358326d0f8df23f5939d822a0d56 100644 (file)
@@ -1037,15 +1037,15 @@ namespace TrilinosWrappers
 
 
   void
-  SparseMatrix::compress(::dealii::VectorOperation::values operation)
+  SparseMatrix::compress(VectorOperation::values operation)
   {
     Epetra_CombineMode mode = last_action;
     if (last_action == Zero)
       {
-        if ((operation == ::dealii::VectorOperation::add) ||
-            (operation == ::dealii::VectorOperation::unknown))
+        if ((operation == VectorOperation::add) ||
+            (operation == VectorOperation::unknown))
           mode = Add;
-        else if (operation == ::dealii::VectorOperation::insert)
+        else if (operation == VectorOperation::insert)
           mode = Insert;
         else
           Assert(
@@ -1055,11 +1055,10 @@ namespace TrilinosWrappers
       }
     else
       {
-        Assert(((last_action == Add) &&
-                (operation != ::dealii::VectorOperation::insert)) ||
-                 ((last_action == Insert) &&
-                  (operation != ::dealii::VectorOperation::add)),
-               ExcMessage("Operation and argument to compress() do not match"));
+        Assert(
+          ((last_action == Add) && (operation != VectorOperation::insert)) ||
+            ((last_action == Insert) && (operation != VectorOperation::add)),
+          ExcMessage("Operation and argument to compress() do not match"));
       }
 
     // flush buffers
@@ -1762,9 +1761,8 @@ namespace TrilinosWrappers
   SparseMatrix::operator=(const double d)
   {
     Assert(d == 0, ExcScalarAssignmentOnlyForZeroValue());
-    compress(
-      ::dealii::VectorOperation::unknown); // TODO: why do we do this? Should we
-                                           // not check for is_compressed?
+    compress(VectorOperation::unknown); // TODO: why do we do this? Should we
+                                        // not check for is_compressed?
 
     const int ierr = matrix->PutScalar(d);
     AssertThrow(ierr == 0, ExcTrilinosError(ierr));
index 58063a4a150db5708bb27289bc40e76fba30b6cb..1f8224118a1fa585241bde8f3eaa4ed556b9a415 100644 (file)
@@ -581,7 +581,7 @@ namespace TrilinosWrappers
 
 
     void
-    Vector::compress(::dealii::VectorOperation::values given_last_action)
+    Vector::compress(VectorOperation::values given_last_action)
     {
       // Select which mode to send to Trilinos. Note that we use last_action if
       // available and ignore what the user tells us to detect wrongly mixed
@@ -591,9 +591,9 @@ namespace TrilinosWrappers
       Epetra_CombineMode mode = last_action;
       if (last_action == Zero)
         {
-          if (given_last_action == ::dealii::VectorOperation::add)
+          if (given_last_action == VectorOperation::add)
             mode = Add;
-          else if (given_last_action == ::dealii::VectorOperation::insert)
+          else if (given_last_action == VectorOperation::insert)
             mode = Insert;
           else
             Assert(
@@ -605,9 +605,9 @@ namespace TrilinosWrappers
         {
           Assert(
             ((last_action == Add) &&
-             (given_last_action == ::dealii::VectorOperation::add)) ||
+             (given_last_action == VectorOperation::add)) ||
               ((last_action == Insert) &&
-               (given_last_action == ::dealii::VectorOperation::insert)),
+               (given_last_action == VectorOperation::insert)),
             ExcMessage(
               "The last operation on the Vector and the given last action in the compress() call do not agree!"));
         }
index c3600fbe3a3fb4e2176ba66f702988c65f705d79..6b6e146004c9d403e4f7d74de2557729875a7d95 100644 (file)
@@ -1100,7 +1100,7 @@ namespace internal
         (void)data_others;
         (void)operation;
 
-        Assert(operation == dealii::VectorOperation::add, ExcNotImplemented());
+        Assert(operation == VectorOperation::add, ExcNotImplemented());
 
         requests.resize(sm_ghost_ranks.size() + sm_import_ranks.size() +
                         ghost_targets_data.size() + import_targets_data.size());
@@ -1224,7 +1224,7 @@ namespace internal
 
         (void)operation;
 
-        Assert(operation == dealii::VectorOperation::add, ExcNotImplemented());
+        Assert(operation == VectorOperation::add, ExcNotImplemented());
 
         AssertDimension(requests.size(),
                         sm_ghost_ranks.size() + sm_import_ranks.size() +

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.