Add missing includes to fix compilation after #1371

diff --git a/include/deal.II/multigrid/mg_transfer.templates.h b/include/deal.II/multigrid/mg_transfer.templates.h
index 7f5e1aa6b7f157e6e58595c65ff51bb9efa10953..b1ff432a3bf669c9548c144f44fb22399746e0ed 100644 (file)
--- a/include/deal.II/multigrid/mg_transfer.templates.h
+++ b/include/deal.II/multigrid/mg_transfer.templates.h
@@ -25,6 +25,7 @@
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/multigrid/mg_tools.h>
 #include <deal.II/multigrid/mg_transfer.h>
+#include <deal.II/distributed/tria.h>
 
 #include <algorithm>
 

diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h
index 18aa3d2ed76231b56ce3daa714615fa3cbd6bc4a..9ce69f5c9d2678612eb85029cd49edfee7ebbffa 100644 (file)
--- a/include/deal.II/numerics/vector_tools.templates.h
+++ b/include/deal.II/numerics/vector_tools.templates.h
@@ -7072,12 +7072,12 @@ namespace VectorTools
             }
         }
 
-#ifdef DEAL_II_WITH_P4EST
+#ifdef DEAL_II_WITH_MPI
     // if this was a distributed DoFHandler, we need to do the reduction
     // over the entire domain
-    if (const parallel::distributed::Triangulation<dim,spacedim> *
-        p_d_triangulation
-        = dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim> *>(&dof.get_tria()))
+    if (const parallel::Triangulation<dim,spacedim> *
+        p_triangulation
+        = dynamic_cast<const parallel::Triangulation<dim,spacedim> *>(&dof.get_tria()))
       {
         // The type used to store the elements of the global vector may be a
         // real or a complex number. Do the global reduction always with real
@@ -7090,7 +7090,7 @@ namespace VectorTools
 
         MPI_Allreduce (&my_values, &global_values, 3, MPI_DOUBLE,
                        MPI_SUM,
-                       p_d_triangulation->get_communicator());
+                       p_triangulation->get_communicator());
 
         set_possibly_complex_number(global_values[0], global_values[1],
                                     mean);

diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc
index b8832f527c3dcae04c84e21d124cbadbbb85e1bf..84b0a97130497c84a1e085cd061eb5121e04d9eb 100644 (file)
--- a/source/distributed/shared_tria.cc
+++ b/source/distributed/shared_tria.cc
@@ -14,8 +14,8 @@
 //
 // ---------------------------------------------------------------------
 
-
 #include <deal.II/base/utilities.h>
+#include <deal.II/base/mpi.h>
 #include <deal.II/base/memory_consumption.h>
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/sparsity_tools.h>
@@ -24,7 +24,7 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/grid/grid_tools.h>
-#include <deal.II/distributed/tria.h>
+#include <deal.II/distributed/shared_tria.h>
 
 
 #include <algorithm>

diff --git a/source/dofs/dof_handler.cc b/source/dofs/dof_handler.cc
index 342b7b524b3d0b1d9bfd13d5c233869bf727e0d6..7bc35123bfa01d00224d38db22121e2edf598667 100644 (file)
--- a/source/dofs/dof_handler.cc
+++ b/source/dofs/dof_handler.cc
@@ -25,6 +25,8 @@
 #include <deal.II/grid/tria.h>
 #include <deal.II/base/geometry_info.h>
 #include <deal.II/fe/fe.h>
+#include <deal.II/distributed/shared_tria.h>
+#include <deal.II/distributed/tria.h>
 
 #include <set>
 #include <algorithm>

diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc
index d573f83d47b45816a854b936afdaee03c15d8759..efc13fe743b9727f1994d522f64d990a03bc192e 100644 (file)
--- a/source/dofs/dof_handler_policy.cc
+++ b/source/dofs/dof_handler_policy.cc
@@ -25,6 +25,8 @@
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_handler_policy.h>
 #include <deal.II/fe/fe.h>
+#include <deal.II/distributed/shared_tria.h>
+#include <deal.II/distributed/tria.h>
 
 #include <set>
 #include <algorithm>

diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc
index cdd4d2d4d29466bee7b03c5152a819ed0aeb8826..7aa568315d9aac6b8b4d4dbb1be21f24ce00dc60 100644 (file)
--- a/source/dofs/dof_renumbering.cc
+++ b/source/dofs/dof_renumbering.cc
@@ -39,6 +39,8 @@
 
 #include <deal.II/multigrid/mg_tools.h>
 
+#include <deal.II/distributed/tria.h>
+
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/cuthill_mckee_ordering.hpp>

diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 6e859e4ec1e7dd7ee082f991ab5ded20ba3cc958..12665d0565c68900ca8b52810b856af040511d2e 100644 (file)
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -37,6 +37,7 @@
 #include <deal.II/hp/q_collection.h>
 #include <deal.II/hp/fe_values.h>
 #include <deal.II/dofs/dof_tools.h>
+#include <deal.II/distributed/tria.h>
 
 
 #include <algorithm>
@@ -1494,12 +1495,12 @@ namespace DoFTools
             ExcInternalError());
 
     // reduce information from all CPUs
-#if defined(DEAL_II_WITH_P4EST) && defined(DEAL_II_WITH_MPI)
+#ifdef DEAL_II_WITH_MPI
     const unsigned int dim = DH::dimension;
     const unsigned int spacedim = DH::space_dimension;
 
-    if (const parallel::distributed::Triangulation<dim,spacedim> *tria
-        = (dynamic_cast<const parallel::distributed::Triangulation<dim,spacedim>*>
+    if (const parallel::Triangulation<dim,spacedim> *tria
+        = (dynamic_cast<const parallel::Triangulation<dim,spacedim>*>
            (&dof_handler.get_tria())))
       {
         std::vector<types::global_dof_index> local_dof_count = dofs_per_component;
@@ -1573,12 +1574,11 @@ namespace DoFTools
           += std::count(dofs_by_block.begin(), dofs_by_block.end(),
                         block);
 
-#ifdef DEAL_II_WITH_P4EST
 #ifdef DEAL_II_WITH_MPI
         // if we are working on a parallel mesh, we now need to collect
         // this information from all processors
-        if (const parallel::distributed::Triangulation<DH::dimension,DH::space_dimension> *tria
-            = (dynamic_cast<const parallel::distributed::Triangulation<DH::dimension,DH::space_dimension>*>
+        if (const parallel::Triangulation<DH::dimension,DH::space_dimension> *tria
+            = (dynamic_cast<const parallel::Triangulation<DH::dimension,DH::space_dimension>*>
                (&dof_handler.get_tria())))
           {
             std::vector<types::global_dof_index> local_dof_count = dofs_per_block;
@@ -1587,7 +1587,6 @@ namespace DoFTools
                             DEAL_II_DOF_INDEX_MPI_TYPE,
                             MPI_SUM, tria->get_communicator());
           }
-#endif
 #endif
       }
   }

diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc
index 62c53cb706fb2848cf504b8fac85a5ea8ee1172a..0119c1bbb4adf414c0f00c8209c5ee53fdc49423 100644 (file)
--- a/source/hp/dof_handler.cc
+++ b/source/hp/dof_handler.cc
@@ -26,6 +26,8 @@
 #include <deal.II/grid/tria_levels.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/fe/fe.h>
+#include <deal.II/distributed/shared_tria.h>
+#include <deal.II/distributed/tria.h>
 
 #include <set>
 #include <algorithm>

diff --git a/source/numerics/error_estimator.cc b/source/numerics/error_estimator.cc
index ae49a61dce4568fd3f44f2b0925b9a2deff0e16d..6278501fe56423128a9bdac938f425b176226700 100644 (file)
--- a/source/numerics/error_estimator.cc
+++ b/source/numerics/error_estimator.cc
@@ -37,6 +37,7 @@
 #include <deal.II/hp/q_collection.h>
 #include <deal.II/hp/mapping_collection.h>
 #include <deal.II/numerics/error_estimator.h>
+#include <deal.II/distributed/tria.h>
 
 #include <deal.II/base/std_cxx11/bind.h>
 

diff --git a/source/numerics/error_estimator_1d.cc b/source/numerics/error_estimator_1d.cc
index 98d252a2c8d43c295cb6356df288515252e87b2b..2b6451c2769429ff192f55822b8611cb8f523789 100644 (file)
--- a/source/numerics/error_estimator_1d.cc
+++ b/source/numerics/error_estimator_1d.cc
@@ -37,6 +37,7 @@
 #include <deal.II/hp/q_collection.h>
 #include <deal.II/hp/mapping_collection.h>
 #include <deal.II/numerics/error_estimator.h>
+#include <deal.II/distributed/tria.h>
 
 #include <deal.II/base/std_cxx11/bind.h>