Clean up some sparsity-related header inclusions.

diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h
index 7a036ea670de31e3497c21ab4112ff47202ee7af..3c054a37691832b1d274edca725daf220422c558 100644 (file)
--- a/include/deal.II/matrix_free/dof_info.templates.h
+++ b/include/deal.II/matrix_free/dof_info.templates.h
@@ -24,8 +24,6 @@
 #include <deal.II/base/parallel.h>
 
 #include <deal.II/lac/affine_constraints.h>
-#include <deal.II/lac/dynamic_sparsity_pattern.h>
-#include <deal.II/lac/sparsity_pattern.h>
 
 #include <deal.II/matrix_free/constraint_info.h>
 #include <deal.II/matrix_free/dof_info.h>

diff --git a/include/deal.II/multigrid/mg_transfer_block.h b/include/deal.II/multigrid/mg_transfer_block.h
index 16843b1caf2c17fd81ff4ddb25826e944ae295f7..3d23ecc8d6f87e5d40fb9ccd93c875773a0ecd7a 100644 (file)
--- a/include/deal.II/multigrid/mg_transfer_block.h
+++ b/include/deal.II/multigrid/mg_transfer_block.h
@@ -24,7 +24,6 @@
 
 #include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 
 #include <deal.II/multigrid/mg_base.h>

diff --git a/include/deal.II/multigrid/mg_transfer_component.h b/include/deal.II/multigrid/mg_transfer_component.h
index 0f82d52fec7eacd3d55e310448847bf7d62b05e4..8139049cccec3317071f45933dea24887d715775 100644 (file)
--- a/include/deal.II/multigrid/mg_transfer_component.h
+++ b/include/deal.II/multigrid/mg_transfer_component.h
@@ -27,7 +27,6 @@
 #include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 
 #include <deal.II/multigrid/mg_base.h>

diff --git a/include/deal.II/multigrid/sparse_matrix_collection.h b/include/deal.II/multigrid/sparse_matrix_collection.h
index 4ef45fd65538249d2ee08c340bd9c7c4f000caba..861eb6134fe5a08323f564cc44c004eb224cd4bb 100644 (file)
--- a/include/deal.II/multigrid/sparse_matrix_collection.h
+++ b/include/deal.II/multigrid/sparse_matrix_collection.h
@@ -22,6 +22,7 @@
 
 #include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
+#include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/vector.h>
 
 #include <deal.II/multigrid/mg_base.h>

diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc
index b5af14046cef5e1744f285783cdcea64d0c74c87..d06cbdcd63f676221b02625004fcf4fbe8d7bbff 100644 (file)
--- a/source/distributed/tria.cc
+++ b/source/distributed/tria.cc
@@ -27,9 +27,6 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
-#include <deal.II/lac/dynamic_sparsity_pattern.h>
-#include <deal.II/lac/sparsity_tools.h>
-
 #include <algorithm>
 #include <fstream>
 #include <iostream>

diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc
index 2918231002b9928d7ff4abb096889ea75645d221..9da27f97520938832e4a0b30da1ccf0b156a64fc 100644 (file)
--- a/source/distributed/tria_base.cc
+++ b/source/distributed/tria_base.cc
@@ -29,8 +29,6 @@
 #include <deal.II/grid/tria_accessor.h>
 #include <deal.II/grid/tria_iterator.h>
 
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/sparsity_tools.h>
 #include <deal.II/lac/vector_memory.h>
 
 #include <algorithm>

diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 4bf32a5bb8e5d80e2344181d32709a7f3cd1c356..252705ccedb19c4e8cdaa42b210c0f96b6d8bf5f 100644 (file)
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -41,6 +41,7 @@
 
 #include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/sparsity_pattern.h>
+#include <deal.II/lac/sparsity_pattern_base.h>
 #include <deal.II/lac/vector.h>
 
 #include <algorithm>

diff --git a/source/dofs/dof_tools_sparsity.cc b/source/dofs/dof_tools_sparsity.cc
index 310ee84492f33675337838cb191b6e15ed2bcbd0..df1f909bee953e65ab8f2a46a52e405cc4c6de1f 100644 (file)
--- a/source/dofs/dof_tools_sparsity.cc
+++ b/source/dofs/dof_tools_sparsity.cc
@@ -39,10 +39,7 @@
 #include <deal.II/hp/q_collection.h>
 
 #include <deal.II/lac/affine_constraints.h>
-#include <deal.II/lac/block_sparsity_pattern.h>
-#include <deal.II/lac/dynamic_sparsity_pattern.h>
-#include <deal.II/lac/sparsity_pattern.h>
-#include <deal.II/lac/trilinos_sparsity_pattern.h>
+#include <deal.II/lac/sparsity_pattern_base.h>
 #include <deal.II/lac/vector.h>
 
 #include <algorithm>

diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc
index abdddd658e662592069fed40b070046aedb4f4b8..da78657657735a886fb90785289cfd2b7301330c 100644 (file)
--- a/source/fe/fe_enriched.cc
+++ b/source/fe/fe_enriched.cc
@@ -17,6 +17,7 @@
 #include <deal.II/fe/fe_enriched.h>
 #include <deal.II/fe/fe_tools.h>
 
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/sparsity_tools.h>
 
 #include <memory>

diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc
index 5b4c520b04dc1fdce60f7fe4e20c3f84cdc15f05..5cdc79a38a65ef8a907ca3494382336b342ac4a6 100644 (file)
--- a/source/lac/trilinos_sparse_matrix.cc
+++ b/source/lac/trilinos_sparse_matrix.cc
@@ -25,7 +25,6 @@
 #  include <deal.II/lac/la_parallel_vector.h>
 #  include <deal.II/lac/sparse_matrix.h>
 #  include <deal.II/lac/sparsity_pattern.h>
-#  include <deal.II/lac/sparsity_tools.h>
 #  include <deal.II/lac/trilinos_precondition.h>
 #  include <deal.II/lac/trilinos_sparsity_pattern.h>
 

diff --git a/source/matrix_free/dof_info.cc b/source/matrix_free/dof_info.cc
index 7ba077ef9e980387d3e16f57b9d63749e222c816..eb3e1edaeb4d603e4a584e02fc3068580c740847 100644 (file)
--- a/source/matrix_free/dof_info.cc
+++ b/source/matrix_free/dof_info.cc
@@ -18,6 +18,9 @@
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/vectorization.h>
 
+#include <deal.II/lac/dynamic_sparsity_pattern.h>
+#include <deal.II/lac/sparsity_pattern.h>
+
 #include <deal.II/matrix_free/dof_info.templates.h>
 
 #include <iostream>

diff --git a/source/multigrid/mg_tools.cc b/source/multigrid/mg_tools.cc
index 568fb029ab8f8c3e94968b160be422c3da0230a7..4fe1d3a5339ccbdad4df5173c5f2b8d7d36ffc0b 100644 (file)
--- a/source/multigrid/mg_tools.cc
+++ b/source/multigrid/mg_tools.cc
@@ -32,11 +32,9 @@
 #include <deal.II/grid/tria_iterator.h>
 
 #include <deal.II/lac/block_sparse_matrix.h>
-#include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
+#include <deal.II/lac/sparsity_pattern_base.h>
 
 #include <deal.II/multigrid/mg_base.h>
 #include <deal.II/multigrid/mg_constrained_dofs.h>

diff --git a/source/non_matching/coupling.cc b/source/non_matching/coupling.cc
index e90811c1b87ba17a2a136c4f2f684ff47aa53289..54480f7abee1606e0e86ee62e8cbefa580f2250c 100644 (file)
--- a/source/non_matching/coupling.cc
+++ b/source/non_matching/coupling.cc
@@ -31,10 +31,9 @@
 #include <deal.II/lac/petsc_block_sparse_matrix.h>
 #include <deal.II/lac/petsc_sparse_matrix.h>
 #include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/sparsity_pattern.h>
+#include <deal.II/lac/sparsity_pattern_base.h>
 #include <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
-#include <deal.II/lac/trilinos_sparsity_pattern.h>
 
 #include <deal.II/non_matching/coupling.h>