Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Particles: Remove template on sparsity pattern type. #14432

Merged
merged 1 commit into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions include/deal.II/particles/utilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions source/particles/utilities.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 1 addition & 3 deletions source/particles/utilities.inst.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down