Merge pull request #14432 from drwells/sparsity-pattern-base-particles

Particles: Remove template on sparsity pattern type.
dealii · Nov 16, 2022 · 84e4611 · 84e4611
2 parents 9216e16 + ba34810
commit 84e4611
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/include/deal.II/particles/utilities.h b/include/deal.II/particles/utilities.h
@@ -30,6 +30,7 @@
 #include <deal.II/grid/grid_tools_cache.h>
 
 #include <deal.II/lac/affine_constraints.h>
+#include <deal.II/lac/sparsity_pattern_base.h>
 
 #include <deal.II/particles/particle_handler.h>
 
@@ -90,15 +91,12 @@ namespace Particles
      * AffineConstraints::add_entries_local_to_global() is used to fill the
      * final sparsity pattern.
      */
-    template <int dim,
-              int spacedim,
-              typename SparsityType,
-              typename number = double>
+    template <int dim, int spacedim, typename number = double>
     void
     create_interpolation_sparsity_pattern(
       const DoFHandler<dim, spacedim> &                space_dh,
       const Particles::ParticleHandler<dim, spacedim> &particle_handler,
-      SparsityType &                                   sparsity,
+      SparsityPatternBase &                            sparsity,
       const AffineConstraints<number> &                constraints =
         AffineConstraints<number>(),
       const ComponentMask &space_comps = ComponentMask());

diff --git a/source/particles/utilities.cc b/source/particles/utilities.cc
@@ -27,12 +27,12 @@ namespace Particles
 {
   namespace Utilities
   {
-    template <int dim, int spacedim, typename SparsityType, typename number>
+    template <int dim, int spacedim, typename number>
     void
     create_interpolation_sparsity_pattern(
       const DoFHandler<dim, spacedim> &                space_dh,
       const Particles::ParticleHandler<dim, spacedim> &particle_handler,
-      SparsityType &                                   sparsity,
+      SparsityPatternBase &                            sparsity,
       const AffineConstraints<number> &                constraints,
       const ComponentMask &                            space_comps)
     {

diff --git a/source/particles/utilities.inst.in b/source/particles/utilities.inst.in
@@ -14,19 +14,17 @@
 // ---------------------------------------------------------------------
 
 for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS;
-     Sparsity : SPARSITY_PATTERNS;
      scalar : REAL_SCALARS)
   {
 #if deal_II_dimension <= deal_II_space_dimension && deal_II_dimension > 1
     template void create_interpolation_sparsity_pattern<deal_II_dimension,
                                                         deal_II_space_dimension,
-                                                        Sparsity,
                                                         scalar>(
       const DoFHandler<deal_II_dimension, deal_II_space_dimension> &space_dh,
       const Particles::ParticleHandler<deal_II_dimension,
                                        deal_II_space_dimension>
         &                              particle_handler,
-      Sparsity &                       sparsity,
+      SparsityPatternBase &            sparsity,
       const AffineConstraints<scalar> &constraints,
       const ComponentMask &            space_comps);
 #endif