]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix warnings introduced by #212. 1363/head
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 14 Aug 2015 17:37:29 +0000 (12:37 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sat, 15 Aug 2015 11:24:56 +0000 (06:24 -0500)
This fixes a few warnings introduced by the merge of #212
(the parallel::shared::Triangulation).

source/distributed/tria_base.cc
source/dofs/dof_handler_policy.cc

index 94b53abd0c2c4c90d469d754a407d2d0bc5012ff..db6aa8ae9987a60800fd6550fd7f82c66a9b72c6 100644 (file)
@@ -50,7 +50,7 @@ namespace parallel
     n_subdomains(Utilities::MPI::n_mpi_processes(mpi_communicator))
   {
     number_cache.n_locally_owned_active_cells.resize (n_subdomains);
-  };
+  }
 
   template <int dim, int spacedim>
   void
index efc13fe743b9727f1994d522f64d990a03bc192e..8bc62e01e914f020cef57bd75ea7800d4f951bc3 100644 (file)
@@ -1026,10 +1026,9 @@ namespace internal
               (dynamic_cast<const parallel::shared::Triangulation<dim, spacedim>*> (&dof_handler.get_tria ()));
             Assert(tr != 0, ExcInternalError());
             const unsigned int n_cpu = Utilities::MPI::n_mpi_processes (tr->get_communicator ());
-            const unsigned int this_process =
-              Utilities::MPI::this_mpi_process (tr->get_communicator ());
             std::vector<types::global_dof_index> gathered_new_numbers (dof_handler.n_dofs (), 0);
-            Assert(this_process == dof_handler.get_tria ().locally_owned_subdomain (),
+            Assert(Utilities::MPI::this_mpi_process (tr->get_communicator ()) ==
+                   dof_handler.get_tria ().locally_owned_subdomain (),
                    ExcInternalError())
 
             //gather new numbers among processors into one vector
@@ -1054,7 +1053,8 @@ namespace internal
                   displs[i]  = shift;
                   shift     += rcounts[i];
                 }
-              Assert(((int)new_numbers_copy.size()) == rcounts[this_process],
+              Assert(((int)new_numbers_copy.size()) ==
+                     rcounts[Utilities::MPI::this_mpi_process (tr->get_communicator ())],
                      ExcInternalError());
               MPI_Allgatherv (&new_numbers_copy[0],     new_numbers_copy.size (),
                               DEAL_II_DOF_INDEX_MPI_TYPE,

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.