From: Martin Kronbichler Date: Sat, 15 Aug 2015 09:19:18 +0000 (+0200) Subject: Add missing includes to fix compilation after #1371 X-Git-Tag: v8.4.0-rc2~602^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1373%2Fhead;p=dealii.git 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 7f5e1aa6b7..b1ff432a3b 100644 --- a/include/deal.II/multigrid/mg_transfer.templates.h +++ b/include/deal.II/multigrid/mg_transfer.templates.h @@ -25,6 +25,7 @@ #include #include #include +#include #include diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index 18aa3d2ed7..9ce69f5c9d 100644 --- 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 * - p_d_triangulation - = dynamic_cast *>(&dof.get_tria())) + if (const parallel::Triangulation * + p_triangulation + = dynamic_cast *>(&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 b8832f527c..84b0a97130 100644 --- a/source/distributed/shared_tria.cc +++ b/source/distributed/shared_tria.cc @@ -14,8 +14,8 @@ // // --------------------------------------------------------------------- - #include +#include #include #include #include @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/source/dofs/dof_handler.cc b/source/dofs/dof_handler.cc index 342b7b524b..7bc35123bf 100644 --- a/source/dofs/dof_handler.cc +++ b/source/dofs/dof_handler.cc @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index d573f83d47..efc13fe743 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index cdd4d2d4d2..7aa568315d 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -39,6 +39,8 @@ #include +#include + #include #include #include diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index 6e859e4ec1..12665d0565 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -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 *tria - = (dynamic_cast*> + if (const parallel::Triangulation *tria + = (dynamic_cast*> (&dof_handler.get_tria()))) { std::vector 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 *tria - = (dynamic_cast*> + if (const parallel::Triangulation *tria + = (dynamic_cast*> (&dof_handler.get_tria()))) { std::vector 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 62c53cb706..0119c1bbb4 100644 --- a/source/hp/dof_handler.cc +++ b/source/hp/dof_handler.cc @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include diff --git a/source/numerics/error_estimator.cc b/source/numerics/error_estimator.cc index ae49a61dce..6278501fe5 100644 --- a/source/numerics/error_estimator.cc +++ b/source/numerics/error_estimator.cc @@ -37,6 +37,7 @@ #include #include #include +#include #include diff --git a/source/numerics/error_estimator_1d.cc b/source/numerics/error_estimator_1d.cc index 98d252a2c8..2b6451c276 100644 --- a/source/numerics/error_estimator_1d.cc +++ b/source/numerics/error_estimator_1d.cc @@ -37,6 +37,7 @@ #include #include #include +#include #include