]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix compilation with MPI but without P4EST 1470/head
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Sun, 30 Aug 2015 15:17:58 +0000 (17:17 +0200)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Sun, 30 Aug 2015 16:03:31 +0000 (18:03 +0200)
source/grid/grid_tools.cc

index e171b079a19d5815b9c92e95680200ad7aa20b6e..d6eec4e0927f6f56da6ee962b933b2fe249eb22b 100644 (file)
@@ -29,6 +29,7 @@
 #include <deal.II/grid/filtered_iterator.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/distributed/tria.h>
+#include <deal.II/distributed/tria_base.h>
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/tria_boundary.h>
@@ -204,14 +205,12 @@ namespace GridTools
     double global_volume = 0;
 
 #ifdef DEAL_II_WITH_MPI
-    if (const parallel::distributed::Triangulation<dim,spacedim> *p_tria
-        = dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>(&triangulation))
+    if (const parallel::Triangulation<dim,spacedim> *p_tria
+        = dynamic_cast<const parallel::Triangulation<dim,spacedim>*>(&triangulation))
       global_volume = Utilities::MPI::sum (local_volume, p_tria->get_communicator());
     else
-      global_volume = local_volume;
-#else
-    global_volume = local_volume;
 #endif
+      global_volume = local_volume;
 
     return global_volume;
   }

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.