]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Explicitly spell dealii::parallel in multiple places 9758/head
authorPeter Munch <peterrmuench@gmail.com>
Sat, 28 Mar 2020 12:52:57 +0000 (13:52 +0100)
committerPeter Munch <peterrmuench@gmail.com>
Fri, 3 Apr 2020 16:52:19 +0000 (18:52 +0200)
include/deal.II/matrix_free/dof_info.templates.h
include/deal.II/matrix_free/face_setup_internal.h
include/deal.II/multigrid/mg_transfer.templates.h
source/dofs/dof_handler_policy.cc
source/multigrid/mg_transfer_internal.cc

index ee12196d50171fd00b9296f00640ae161f663bbd..b717de9bfc8e17e9621967cfadea00b4378509cc 100644 (file)
@@ -1571,16 +1571,15 @@ namespace internal
       std::vector<unsigned int> row_lengths(n_rows);
       std::vector<std::mutex> mutexes(n_rows / internal::bucket_size_threading +
                                       1);
-      parallel::apply_to_subranges(0,
-                                   task_info.n_active_cells,
-                                   [this,
-                                    &mutexes,
-                                    &row_lengths](const unsigned int begin,
-                                                  const unsigned int end) {
-                                     internal::compute_row_lengths(
-                                       begin, end, *this, mutexes, row_lengths);
-                                   },
-                                   20);
+      dealii::parallel::apply_to_subranges(
+        0,
+        task_info.n_active_cells,
+        [this, &mutexes, &row_lengths](const unsigned int begin,
+                                       const unsigned int end) {
+          internal::compute_row_lengths(
+            begin, end, *this, mutexes, row_lengths);
+        },
+        20);
 
       // disregard dofs that only sit on a single cell because they cannot
       // couple
@@ -1594,7 +1593,7 @@ namespace internal
       SparsityPattern connectivity_dof(n_rows,
                                        task_info.n_active_cells,
                                        row_lengths);
-      parallel::apply_to_subranges(
+      dealii::parallel::apply_to_subranges(
         0,
         task_info.n_active_cells,
         [this, &row_lengths, &mutexes, &connectivity_dof](
@@ -1614,7 +1613,7 @@ namespace internal
       // create a connectivity list between cells. The connectivity graph
       // should apply the renumbering, i.e., the entry for cell j is the entry
       // for cell renumbering[j] in the original ordering.
-      parallel::apply_to_subranges(
+      dealii::parallel::apply_to_subranges(
         0,
         task_info.n_active_cells,
         [this, &reverse_numbering, &connectivity_dof, &connectivity](
index 2ad4ab8437eb127af5a41852dbac06adae01f1ce..24ee361cbed646070273a15f46aee25656bf1e9e 100644 (file)
@@ -298,9 +298,9 @@ namespace internal
               // looking at the length of the lists of faces
 #  if defined(DEAL_II_WITH_MPI) && defined(DEBUG)
               MPI_Comm comm = MPI_COMM_SELF;
-              if (const parallel::TriangulationBase<dim> *ptria =
-                    dynamic_cast<const parallel::TriangulationBase<dim> *>(
-                      &triangulation))
+              if (const dealii::parallel::TriangulationBase<dim> *ptria =
+                    dynamic_cast<const dealii::parallel::TriangulationBase<dim>
+                                   *>(&triangulation))
                 comm = ptria->get_communicator();
 
               MPI_Status   status;
index 0158b6310b03b3a98fd9a448b3b4fa72dd38e63a..feb1507e1595618302217a63002cd4cbe2b0b0ee 100644 (file)
@@ -120,8 +120,8 @@ namespace internal
                   MGLevelObject<TrilinosWrappers::MPI::Vector> &v)
     {
       const dealii::parallel::TriangulationBase<dim, spacedim> *tria =
-        (dynamic_cast<const parallel::TriangulationBase<dim, spacedim> *>(
-          &dof_handler.get_triangulation()));
+        (dynamic_cast<const dealii::parallel::TriangulationBase<dim, spacedim>
+                        *>(&dof_handler.get_triangulation()));
       AssertThrow(
         tria != nullptr,
         ExcMessage(
@@ -148,8 +148,8 @@ namespace internal
                   MGLevelObject<PETScWrappers::MPI::Vector> &v)
     {
       const dealii::parallel::TriangulationBase<dim, spacedim> *tria =
-        (dynamic_cast<const parallel::TriangulationBase<dim, spacedim> *>(
-          &dof_handler.get_triangulation()));
+        (dynamic_cast<const dealii::parallel::TriangulationBase<dim, spacedim>
+                        *>(&dof_handler.get_triangulation()));
       AssertThrow(
         tria != nullptr,
         ExcMessage(
@@ -455,8 +455,9 @@ MGLevelGlobalTransfer<LinearAlgebra::distributed::Vector<Number>>::copy_to_mg(
           dst[level].reinit(ghosted_level_vector[level], false);
         else
           {
-            const parallel::TriangulationBase<dim, spacedim> *tria =
-              (dynamic_cast<const parallel::TriangulationBase<dim, spacedim> *>(
+            const dealii::parallel::TriangulationBase<dim, spacedim> *tria =
+              (dynamic_cast<
+                const dealii::parallel::TriangulationBase<dim, spacedim> *>(
                 &dof_handler.get_triangulation()));
             dst[level].reinit(dof_handler.locally_owned_mg_dofs(level),
                               tria != nullptr ? tria->get_communicator() :
index 24940086725beecd8befc2589e75d697c28da6f7..a21950148c8056ee13069de0db342efa5a525fa6 100644 (file)
@@ -1064,8 +1064,8 @@ namespace internal
           // mark all vertices on ghost cells
           std::vector<bool> include_vertex(
             dof_handler.get_triangulation().n_vertices(), false);
-          if (dynamic_cast<
-                const parallel::DistributedTriangulationBase<dim, spacedim> *>(
+          if (dynamic_cast<const dealii::parallel::
+                             DistributedTriangulationBase<dim, spacedim> *>(
                 &dof_handler.get_triangulation()) != nullptr)
             for (const auto &cell : dof_handler.active_cell_iterators())
               if (cell->is_ghost())
@@ -3289,8 +3289,9 @@ namespace internal
         const unsigned int dim      = DoFHandlerType::dimension;
         const unsigned int spacedim = DoFHandlerType::space_dimension;
 
-        const parallel::shared::Triangulation<dim, spacedim> *tr =
-          (dynamic_cast<const parallel::shared::Triangulation<dim, spacedim> *>(
+        const dealii::parallel::shared::Triangulation<dim, spacedim> *tr =
+          (dynamic_cast<
+            const dealii::parallel::shared::Triangulation<dim, spacedim> *>(
             &this->dof_handler->get_triangulation()));
         Assert(tr != nullptr, ExcInternalError());
 
@@ -3451,8 +3452,9 @@ namespace internal
         const unsigned int dim      = DoFHandlerType::dimension;
         const unsigned int spacedim = DoFHandlerType::space_dimension;
 
-        const parallel::shared::Triangulation<dim, spacedim> *tr =
-          (dynamic_cast<const parallel::shared::Triangulation<dim, spacedim> *>(
+        const dealii::parallel::shared::Triangulation<dim, spacedim> *tr =
+          (dynamic_cast<
+            const dealii::parallel::shared::Triangulation<dim, spacedim> *>(
             &this->dof_handler->get_triangulation()));
         Assert(tr != nullptr, ExcInternalError());
 
@@ -3475,10 +3477,12 @@ namespace internal
             std::vector<types::subdomain_id> saved_level_subdomain_ids;
             saved_level_subdomain_ids.resize(tr->n_cells(lvl));
             {
-              typename parallel::shared::Triangulation<dim,
-                                                       spacedim>::cell_iterator
-                cell = this->dof_handler->get_triangulation().begin(lvl),
-                endc = this->dof_handler->get_triangulation().end(lvl);
+              typename dealii::parallel::shared::Triangulation<dim, spacedim>::
+                cell_iterator cell =
+                                this->dof_handler->get_triangulation().begin(
+                                  lvl),
+                              endc =
+                                this->dof_handler->get_triangulation().end(lvl);
 
               const std::vector<types::subdomain_id> &true_level_subdomain_ids =
                 tr->get_true_level_subdomain_ids_of_cells(lvl);
@@ -3609,10 +3613,12 @@ namespace internal
 
             // finally, restore current level subdomain ids
             {
-              typename parallel::shared::Triangulation<dim,
-                                                       spacedim>::cell_iterator
-                cell = this->dof_handler->get_triangulation().begin(lvl),
-                endc = this->dof_handler->get_triangulation().end(lvl);
+              typename dealii::parallel::shared::Triangulation<dim, spacedim>::
+                cell_iterator cell =
+                                this->dof_handler->get_triangulation().begin(
+                                  lvl),
+                              endc =
+                                this->dof_handler->get_triangulation().end(lvl);
 
               for (unsigned int index = 0; cell != endc; ++cell, ++index)
                 cell->set_level_subdomain_id(saved_level_subdomain_ids[index]);
@@ -3645,15 +3651,16 @@ namespace internal
 
         // Similar to distribute_dofs() we need to have a special treatment in
         // case artificial cells are present.
-        const parallel::shared::Triangulation<dim, spacedim> *tr =
-          (dynamic_cast<const parallel::shared::Triangulation<dim, spacedim> *>(
+        const dealii::parallel::shared::Triangulation<dim, spacedim> *tr =
+          (dynamic_cast<
+            const dealii::parallel::shared::Triangulation<dim, spacedim> *>(
             &this->dof_handler->get_triangulation()));
         Assert(tr != nullptr, ExcInternalError());
 
-        typename parallel::shared::Triangulation<dim,
-                                                 spacedim>::active_cell_iterator
-          cell = this->dof_handler->get_triangulation().begin_active(),
-          endc = this->dof_handler->get_triangulation().end();
+        typename dealii::parallel::shared::Triangulation<dim, spacedim>::
+          active_cell_iterator
+            cell = this->dof_handler->get_triangulation().begin_active(),
+            endc = this->dof_handler->get_triangulation().end();
         std::vector<types::subdomain_id> current_subdomain_ids(
           tr->n_active_cells());
         const std::vector<types::subdomain_id> &true_subdomain_ids =
@@ -3821,7 +3828,8 @@ namespace internal
         template <int dim, int spacedim>
         void
         get_mg_dofindices_recursively(
-          const parallel::DistributedTriangulationBase<dim, spacedim> &tria,
+          const dealii::parallel::DistributedTriangulationBase<dim, spacedim>
+            &tria,
           const typename DoFHandler<dim, spacedim>::level_cell_iterator
             &                                           dealii_cell,
           const typename CellId::binary_type &          quadrant,
@@ -3863,9 +3871,9 @@ namespace internal
         template <int dim, int spacedim>
         void
         find_marked_mg_ghost_cells_recursively(
-          const typename parallel::DistributedTriangulationBase<dim, spacedim>
-            &                tria,
-          const unsigned int tree_index,
+          const typename dealii::parallel::
+            DistributedTriangulationBase<dim, spacedim> &tria,
+          const unsigned int                             tree_index,
           const typename DoFHandler<dim, spacedim>::level_cell_iterator
             &dealii_cell,
           std::map<
@@ -3898,7 +3906,8 @@ namespace internal
         template <int dim, int spacedim>
         void
         set_mg_dofindices_recursively(
-          const parallel::DistributedTriangulationBase<dim, spacedim> &tria,
+          const dealii::parallel::DistributedTriangulationBase<dim, spacedim>
+            &tria,
           const typename DoFHandler<dim, spacedim>::level_cell_iterator
             &                                 dealii_cell,
           const typename CellId::binary_type &quadrant,
@@ -3964,9 +3973,9 @@ namespace internal
         template <int dim, int spacedim, class DoFHandlerType>
         void
         communicate_mg_ghost_cells(
-          const typename parallel::DistributedTriangulationBase<dim, spacedim>
-            &             tria,
-          DoFHandlerType &dof_handler)
+          const typename dealii::parallel::
+            DistributedTriangulationBase<dim, spacedim> &tria,
+          DoFHandlerType &                               dof_handler)
         {
           using QuadrantBufferType =
             std::vector<std::pair<unsigned int, typename CellId::binary_type>>;
@@ -4176,9 +4185,9 @@ namespace internal
 
         template <int spacedim>
         void
-        communicate_mg_ghost_cells(
-          const typename parallel::distributed::Triangulation<1, spacedim> &,
-          DoFHandler<1, spacedim> &)
+        communicate_mg_ghost_cells(const typename dealii::parallel::
+                                     distributed::Triangulation<1, spacedim> &,
+                                   DoFHandler<1, spacedim> &)
         {
           Assert(false, ExcNotImplemented());
         }
@@ -4187,9 +4196,9 @@ namespace internal
 
         template <int spacedim>
         void
-        communicate_mg_ghost_cells(
-          const typename parallel::distributed::Triangulation<1, spacedim> &,
-          hp::DoFHandler<1, spacedim> &)
+        communicate_mg_ghost_cells(const typename dealii::parallel::
+                                     distributed::Triangulation<1, spacedim> &,
+                                   hp::DoFHandler<1, spacedim> &)
         {
           Assert(false, ExcNotImplemented());
         }
@@ -4367,9 +4376,10 @@ namespace internal
           // different tags for phase 1 and 2, but the cost of a
           // barrier is negligible compared to everything else we do
           // here
-          if (const auto *triangulation = dynamic_cast<
-                const parallel::DistributedTriangulationBase<dim, spacedim> *>(
-                &dof_handler.get_triangulation()))
+          if (const auto *triangulation =
+                dynamic_cast<const dealii::parallel::
+                               DistributedTriangulationBase<dim, spacedim> *>(
+                  &dof_handler.get_triangulation()))
             {
               const int ierr = MPI_Barrier(triangulation->get_communicator());
               AssertThrowMPI(ierr);
@@ -4411,10 +4421,12 @@ namespace internal
         const unsigned int dim      = DoFHandlerType::dimension;
         const unsigned int spacedim = DoFHandlerType::space_dimension;
 
-        parallel::DistributedTriangulationBase<dim, spacedim> *triangulation =
-          (dynamic_cast<parallel::DistributedTriangulationBase<dim, spacedim>
-                          *>(const_cast<dealii::Triangulation<dim, spacedim> *>(
-            &dof_handler->get_triangulation())));
+        dealii::parallel::DistributedTriangulationBase<dim, spacedim>
+          *triangulation =
+            (dynamic_cast<
+              dealii::parallel::DistributedTriangulationBase<dim, spacedim> *>(
+              const_cast<dealii::Triangulation<dim, spacedim> *>(
+                &dof_handler->get_triangulation())));
         Assert(triangulation != nullptr, ExcInternalError());
 
         const types::subdomain_id subdomain_id =
@@ -4646,10 +4658,12 @@ namespace internal
         const unsigned int dim      = DoFHandlerType::dimension;
         const unsigned int spacedim = DoFHandlerType::space_dimension;
 
-        parallel::DistributedTriangulationBase<dim, spacedim> *triangulation =
-          (dynamic_cast<parallel::DistributedTriangulationBase<dim, spacedim>
-                          *>(const_cast<dealii::Triangulation<dim, spacedim> *>(
-            &dof_handler->get_triangulation())));
+        dealii::parallel::DistributedTriangulationBase<dim, spacedim>
+          *triangulation =
+            (dynamic_cast<
+              dealii::parallel::DistributedTriangulationBase<dim, spacedim> *>(
+              const_cast<dealii::Triangulation<dim, spacedim> *>(
+                &dof_handler->get_triangulation())));
         Assert(triangulation != nullptr, ExcInternalError());
 
         AssertThrow((triangulation->is_multilevel_hierarchy_constructed()),
@@ -4882,10 +4896,12 @@ namespace internal
         const unsigned int dim      = DoFHandlerType::dimension;
         const unsigned int spacedim = DoFHandlerType::space_dimension;
 
-        parallel::DistributedTriangulationBase<dim, spacedim> *triangulation =
-          (dynamic_cast<parallel::DistributedTriangulationBase<dim, spacedim>
-                          *>(const_cast<dealii::Triangulation<dim, spacedim> *>(
-            &dof_handler->get_triangulation())));
+        dealii::parallel::DistributedTriangulationBase<dim, spacedim>
+          *triangulation =
+            (dynamic_cast<
+              dealii::parallel::DistributedTriangulationBase<dim, spacedim> *>(
+              const_cast<dealii::Triangulation<dim, spacedim> *>(
+                &dof_handler->get_triangulation())));
         Assert(triangulation != nullptr, ExcInternalError());
 
 
@@ -5139,9 +5155,9 @@ namespace internal
 
         constexpr int dim      = DoFHandlerType::dimension;
         constexpr int spacedim = DoFHandlerType::space_dimension;
-        const parallel::TriangulationBase<dim, spacedim> *tr =
-          (dynamic_cast<const parallel::TriangulationBase<dim, spacedim> *>(
-            &this->dof_handler->get_triangulation()));
+        const dealii::parallel::TriangulationBase<dim, spacedim> *tr =
+          (dynamic_cast<const dealii::parallel::TriangulationBase<dim, spacedim>
+                          *>(&this->dof_handler->get_triangulation()));
         Assert(tr != nullptr, ExcInternalError());
 
         const unsigned int my_rank =
index 7eb2363c76a039a02255193f8335efa111ac3d38..20179c8eb34130c64be1a4f7300453e79253e87c 100644 (file)
@@ -215,8 +215,8 @@ namespace internal
         }
 
       const dealii::parallel::TriangulationBase<dim, spacedim> *tria =
-        (dynamic_cast<const parallel::TriangulationBase<dim, spacedim> *>(
-          &dof_handler.get_triangulation()));
+        (dynamic_cast<const dealii::parallel::TriangulationBase<dim, spacedim>
+                        *>(&dof_handler.get_triangulation()));
       AssertThrow(
         send_data_temp.size() == 0 || tria != nullptr,
         ExcMessage(
@@ -947,9 +947,9 @@ namespace internal
           // the base class for keeping ghosted transfer indices. To avoid
           // keeping two very similar vectors, we keep one single ghosted
           // vector that is augmented/filled here.
-          const parallel::TriangulationBase<dim, dim> *ptria =
-            (dynamic_cast<const parallel::TriangulationBase<dim, dim> *>(
-              &tria));
+          const dealii::parallel::TriangulationBase<dim, dim> *ptria =
+            (dynamic_cast<
+              const dealii::parallel::TriangulationBase<dim, dim> *>(&tria));
           const MPI_Comm communicator =
             ptria != nullptr ? ptria->get_communicator() : MPI_COMM_SELF;
 

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.