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.

Sign up for GitHub

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

Jump to bottom

NonMatching: Remove template on sparsity pattern type. #14431

Merged
merged 1 commit into from
Nov 16, 2022
Merged

NonMatching: Remove template on sparsity pattern type. #14431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 6 additions & 18 deletions include/deal.II/non_matching/coupling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,13 @@ namespace NonMatching
* See the tutorial program step-60 for an example on how to use this
* function.
*/
template <int dim0,
int dim1,
int spacedim,
typename Sparsity,
typename number = double>
template <int dim0, int dim1, int spacedim, typename number = double>
void
create_coupling_sparsity_pattern(
const DoFHandler<dim0, spacedim> &space_dh,
const DoFHandler<dim1, spacedim> &immersed_dh,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<number> & constraints = AffineConstraints<number>(),
const ComponentMask & space_comps = ComponentMask(),
const ComponentMask & immersed_comps = ComponentMask(),
Expand All @@ -117,18 +113,14 @@ namespace NonMatching
* space_mapping cannot be specified, since it is taken from the @p cache
* parameter.
*/
template <int dim0,
int dim1,
int spacedim,
typename Sparsity,
typename number = double>
template <int dim0, int dim1, int spacedim, typename number = double>
void
create_coupling_sparsity_pattern(
const GridTools::Cache<dim0, spacedim> &cache,
const DoFHandler<dim0, spacedim> & space_dh,
const DoFHandler<dim1, spacedim> & immersed_dh,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<number> &constraints = AffineConstraints<number>(),
const ComponentMask & space_comps = ComponentMask(),
const ComponentMask & immersed_comps = ComponentMask(),
Expand Down Expand Up @@ -269,11 +261,7 @@ namespace NonMatching
* restrictive conditions are required on the two spaces. See the
* documentation of the other create_coupling_sparsity_pattern() function.
*/
template <int dim0,
int dim1,
int spacedim,
typename Sparsity,
typename Number = double>
template <int dim0, int dim1, int spacedim, typename Number = double>
void
create_coupling_sparsity_pattern(
const double & epsilon,
Expand All @@ -282,7 +270,7 @@ namespace NonMatching
const DoFHandler<dim0, spacedim> & dh0,
const DoFHandler<dim1, spacedim> & dh1,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<Number> &constraints0 = AffineConstraints<Number>(),
const ComponentMask & comps0 = ComponentMask(),
const ComponentMask & comps1 = ComponentMask());
Expand Down
24 changes: 6 additions & 18 deletions source/non_matching/coupling.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,13 @@ namespace NonMatching
}
} // namespace internal

template <int dim0,
int dim1,
int spacedim,
typename Sparsity,
typename number>
template <int dim0, int dim1, int spacedim, typename number>
void
create_coupling_sparsity_pattern(
const DoFHandler<dim0, spacedim> &space_dh,
const DoFHandler<dim1, spacedim> &immersed_dh,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<number> & constraints,
const ComponentMask & space_comps,
const ComponentMask & immersed_comps,
Expand All @@ -203,18 +199,14 @@ namespace NonMatching



template <int dim0,
int dim1,
int spacedim,
typename Sparsity,
typename number>
template <int dim0, int dim1, int spacedim, typename number>
void
create_coupling_sparsity_pattern(
const GridTools::Cache<dim0, spacedim> &cache,
const DoFHandler<dim0, spacedim> & space_dh,
const DoFHandler<dim1, spacedim> & immersed_dh,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<number> & constraints,
const ComponentMask & space_comps,
const ComponentMask & immersed_comps,
Expand Down Expand Up @@ -626,11 +618,7 @@ namespace NonMatching
}
}

template <int dim0,
int dim1,
int spacedim,
typename Sparsity,
typename Number>
template <int dim0, int dim1, int spacedim, typename Number>
void
create_coupling_sparsity_pattern(
const double & epsilon,
Expand All @@ -639,7 +627,7 @@ namespace NonMatching
const DoFHandler<dim0, spacedim> & dh0,
const DoFHandler<dim1, spacedim> & dh1,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<Number> & constraints0,
const ComponentMask & comps0,
const ComponentMask & comps1)
Expand Down
7 changes: 3 additions & 4 deletions source/non_matching/coupling.inst.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@


for (dim0 : DIMENSIONS; dim1 : DIMENSIONS; spacedim : SPACE_DIMENSIONS;
Sparsity : SPARSITY_PATTERNS;
S : REAL_AND_COMPLEX_SCALARS)
{
#if dim1 <= spacedim && dim0 <= spacedim
template void create_coupling_sparsity_pattern(
const DoFHandler<dim0, spacedim> &space_dh,
const DoFHandler<dim1, spacedim> &immersed_dh,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<S> & constraints,
const ComponentMask & space_comps,
const ComponentMask & immersed_comps,
Expand All @@ -36,7 +35,7 @@ for (dim0 : DIMENSIONS; dim1 : DIMENSIONS; spacedim : SPACE_DIMENSIONS;
const DoFHandler<dim0, spacedim> & space_dh,
const DoFHandler<dim1, spacedim> & immersed_dh,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<S> & constraints,
const ComponentMask & space_comps,
const ComponentMask & immersed_comps,
Expand All @@ -50,7 +49,7 @@ for (dim0 : DIMENSIONS; dim1 : DIMENSIONS; spacedim : SPACE_DIMENSIONS;
const DoFHandler<dim0, spacedim> & dh0,
const DoFHandler<dim1, spacedim> & dh1,
const Quadrature<dim1> & quad,
Sparsity & sparsity,
SparsityPatternBase & sparsity,
const AffineConstraints<S> & constraints0,
const ComponentMask & comps0,
const ComponentMask & comps1);
Expand Down