From 1f00b15e385ffec0786e8d57bfaad8a089841d41 Mon Sep 17 00:00:00 2001 From: Wenyu Lei Date: Mon, 6 May 2019 16:32:33 +0200 Subject: [PATCH] Added a quad formula as an input argument so that it is consistent with the old function call. --- include/deal.II/non_matching/coupling.h | 7 ++++--- source/non_matching/coupling.cc | 3 ++- source/non_matching/coupling.inst.in | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/deal.II/non_matching/coupling.h b/include/deal.II/non_matching/coupling.h index 1f20afcc8f..b8f8e18a7a 100644 --- a/include/deal.II/non_matching/coupling.h +++ b/include/deal.II/non_matching/coupling.h @@ -264,9 +264,9 @@ namespace NonMatching * of radius @p epsilon. If epsilon is set to zero, then we assume that the * kernel is the Dirac delta distribution, and the call is forwarded to the * method in this namespace with the same name, that does not take an epsilon - * as input. In this case, more restrictive conditions are required on the - * two spaces. See the documentation of the other - * create_coupling_sparsity_pattern() function. + * as input (but a quadrature formula @p quad is required). In this case, more + * restrictive conditions are required on the two spaces. See the + * documentation of the other create_coupling_sparsity_pattern() function. * * @author Luca Heltai, 2019. */ @@ -282,6 +282,7 @@ namespace NonMatching const GridTools::Cache &cache1, const DoFHandler & dh0, const DoFHandler & dh1, + const Quadrature & quad, Sparsity & sparsity, const AffineConstraints &constraints0 = AffineConstraints(), const ComponentMask & comps0 = ComponentMask(), diff --git a/source/non_matching/coupling.cc b/source/non_matching/coupling.cc index 61dbef7f89..ff11095937 100644 --- a/source/non_matching/coupling.cc +++ b/source/non_matching/coupling.cc @@ -626,6 +626,7 @@ namespace NonMatching const GridTools::Cache &cache1, const DoFHandler & dh0, const DoFHandler & dh1, + const Quadrature & quad, Sparsity & sparsity, const AffineConstraints & constraints0, const ComponentMask & comps0, @@ -639,7 +640,7 @@ namespace NonMatching create_coupling_sparsity_pattern(cache0, dh0, dh1, - QGauss(dh1.get_fe().degree + 1), + quad, sparsity, constraints0, comps0, diff --git a/source/non_matching/coupling.inst.in b/source/non_matching/coupling.inst.in index cfc2022cb5..303afef831 100644 --- a/source/non_matching/coupling.inst.in +++ b/source/non_matching/coupling.inst.in @@ -47,6 +47,7 @@ for (dim0 : DIMENSIONS; dim1 : DIMENSIONS; spacedim : SPACE_DIMENSIONS; const GridTools::Cache &cache1, const DoFHandler & dh0, const DoFHandler & dh1, + const Quadrature & quad, Sparsity & sparsity, const AffineConstraints & constraints0, const ComponentMask & comps0, -- 2.39.5