From ae98fee1b77ca1287d0c98aa8f8c5d204fd61f2b Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Thu, 2 Jun 2022 17:47:11 +0200 Subject: [PATCH] Remove inclusion of additional headers --- include/deal.II/matrix_free/dof_info.h | 20 ++++++++++++++----- .../deal.II/matrix_free/dof_info.templates.h | 1 + .../deal.II/matrix_free/evaluation_kernels.h | 3 +-- .../deal.II/matrix_free/fe_evaluation_data.h | 2 ++ .../matrix_free/matrix_free.templates.h | 2 ++ include/deal.II/matrix_free/task_info.h | 7 +++++-- .../numerics/vector_tools_project.templates.h | 1 + source/matrix_free/task_info.cc | 2 ++ .../matrix_vector_large_degree_02.cc | 1 + .../matrix_vector_stokes_onedof.cc | 1 + tests/simplex/matrix_free_01.cc | 1 + tests/simplex/matrix_free_02.cc | 1 + 12 files changed, 33 insertions(+), 9 deletions(-) diff --git a/include/deal.II/matrix_free/dof_info.h b/include/deal.II/matrix_free/dof_info.h index 65f37a734e..9efe87266f 100644 --- a/include/deal.II/matrix_free/dof_info.h +++ b/include/deal.II/matrix_free/dof_info.h @@ -24,11 +24,6 @@ #include #include -#include - -#include -#include - #include #include #include @@ -41,6 +36,9 @@ DEAL_II_NAMESPACE_OPEN #ifndef DOXYGEN + +// forward declarations + namespace internal { namespace MatrixFreeFunctions @@ -52,6 +50,18 @@ namespace internal struct FPArrayComparator; } // namespace MatrixFreeFunctions } // namespace internal + +template +class AffineConstraints; + +class DynamicSparsityPattern; + +template +class TriaIterator; + +template +class DoFCellAccessor; + #endif namespace internal diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h index af5cc63571..65d27043e5 100644 --- a/include/deal.II/matrix_free/dof_info.templates.h +++ b/include/deal.II/matrix_free/dof_info.templates.h @@ -24,6 +24,7 @@ #include #include +#include #include #include diff --git a/include/deal.II/matrix_free/evaluation_kernels.h b/include/deal.II/matrix_free/evaluation_kernels.h index e01e4955c8..ff05bbc5a0 100644 --- a/include/deal.II/matrix_free/evaluation_kernels.h +++ b/include/deal.II/matrix_free/evaluation_kernels.h @@ -19,12 +19,11 @@ #include +#include #include #include #include -#include - #include #include #include diff --git a/include/deal.II/matrix_free/fe_evaluation_data.h b/include/deal.II/matrix_free/fe_evaluation_data.h index 92a2589b73..f4cbf4fdc2 100644 --- a/include/deal.II/matrix_free/fe_evaluation_data.h +++ b/include/deal.II/matrix_free/fe_evaluation_data.h @@ -22,7 +22,9 @@ #include #include +#include #include +#include #include #include #include diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index ef1aa8bcde..6d2391d3e0 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -38,6 +38,8 @@ #include +#include + #include #include #include diff --git a/include/deal.II/matrix_free/task_info.h b/include/deal.II/matrix_free/task_info.h index 56f0ba86a5..bb0851818e 100644 --- a/include/deal.II/matrix_free/task_info.h +++ b/include/deal.II/matrix_free/task_info.h @@ -28,12 +28,15 @@ #include #include -#include - DEAL_II_NAMESPACE_OPEN +// forward declaration +#ifndef DOXYGEN +class DynamicSparsityPattern; +#endif + namespace internal { diff --git a/include/deal.II/numerics/vector_tools_project.templates.h b/include/deal.II/numerics/vector_tools_project.templates.h index 719a20fc12..bd8497e8b6 100644 --- a/include/deal.II/numerics/vector_tools_project.templates.h +++ b/include/deal.II/numerics/vector_tools_project.templates.h @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/source/matrix_free/task_info.cc b/source/matrix_free/task_info.cc index fafaff1e97..5a851e8ddc 100644 --- a/source/matrix_free/task_info.cc +++ b/source/matrix_free/task_info.cc @@ -21,6 +21,8 @@ #include #include +#include + #include diff --git a/tests/matrix_free/matrix_vector_large_degree_02.cc b/tests/matrix_free/matrix_vector_large_degree_02.cc index f52a8d4755..b815c42aed 100644 --- a/tests/matrix_free/matrix_vector_large_degree_02.cc +++ b/tests/matrix_free/matrix_vector_large_degree_02.cc @@ -33,6 +33,7 @@ #include #include +#include #include #include diff --git a/tests/matrix_free/matrix_vector_stokes_onedof.cc b/tests/matrix_free/matrix_vector_stokes_onedof.cc index f81cf746dc..e294b5117d 100644 --- a/tests/matrix_free/matrix_vector_stokes_onedof.cc +++ b/tests/matrix_free/matrix_vector_stokes_onedof.cc @@ -38,6 +38,7 @@ #include #include +#include #include #include #include diff --git a/tests/simplex/matrix_free_01.cc b/tests/simplex/matrix_free_01.cc index 522cf5b052..004c4464dd 100644 --- a/tests/simplex/matrix_free_01.cc +++ b/tests/simplex/matrix_free_01.cc @@ -33,6 +33,7 @@ #include #include +#include #include #include #include diff --git a/tests/simplex/matrix_free_02.cc b/tests/simplex/matrix_free_02.cc index b631599c3f..e5a522e654 100644 --- a/tests/simplex/matrix_free_02.cc +++ b/tests/simplex/matrix_free_02.cc @@ -35,6 +35,7 @@ #include #include +#include #include #include #include -- 2.39.5