]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Added a quad formula as an input argument so that it is consistent with the old funct...
authorWenyu Lei <lwy5515@gmail.com>
Mon, 6 May 2019 14:32:33 +0000 (16:32 +0200)
committerLuca Heltai <luca.heltai@sissa.it>
Sat, 11 May 2019 16:15:24 +0000 (18:15 +0200)
include/deal.II/non_matching/coupling.h
source/non_matching/coupling.cc
source/non_matching/coupling.inst.in

index 1f20afcc8f0492b276fbad047b3c2a93c1f1310b..b8f8e18a7a287147ef6e449631ab51ec6b07c77b 100644 (file)
@@ -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<dim1, spacedim> &cache1,
     const DoFHandler<dim0, spacedim> &      dh0,
     const DoFHandler<dim1, spacedim> &      dh1,
+    const Quadrature<dim1> &                quad,
     Sparsity &                              sparsity,
     const AffineConstraints<Number> &constraints0 = AffineConstraints<Number>(),
     const ComponentMask &            comps0       = ComponentMask(),
index 61dbef7f89bd3f0204c252b9de8cebdb06124b46..ff110959379bfb3488ac18b77e2cf520b4024048 100644 (file)
@@ -626,6 +626,7 @@ namespace NonMatching
     const GridTools::Cache<dim1, spacedim> &cache1,
     const DoFHandler<dim0, spacedim> &      dh0,
     const DoFHandler<dim1, spacedim> &      dh1,
+    const Quadrature<dim1> &                quad,
     Sparsity &                              sparsity,
     const AffineConstraints<Number> &       constraints0,
     const ComponentMask &                   comps0,
@@ -639,7 +640,7 @@ namespace NonMatching
         create_coupling_sparsity_pattern(cache0,
                                          dh0,
                                          dh1,
-                                         QGauss<dim1>(dh1.get_fe().degree + 1),
+                                         quad,
                                          sparsity,
                                          constraints0,
                                          comps0,
index cfc2022cb5eb8addf4fb0c02419083b9f089d27e..303afef8312d8a22d0a71af2a84254bc01ab7c36 100644 (file)
@@ -47,6 +47,7 @@ for (dim0 : DIMENSIONS; dim1 : DIMENSIONS; spacedim : SPACE_DIMENSIONS;
       const GridTools::Cache<dim1, spacedim> &cache1,
       const DoFHandler<dim0, spacedim> &      dh0,
       const DoFHandler<dim1, spacedim> &      dh1,
+      const Quadrature<dim1> &                quad,
       Sparsity &                              sparsity,
       const AffineConstraints<S> &            constraints0,
       const ComponentMask &                   comps0,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.