Mercurial > repos > public > sbplib_julia

changeset 689:728fd5a2455a feature/boundary_quads

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change order of arguments for quadrature, and make inner_stencil have a default argument
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Fri, 12 Feb 2021 16:43:29 +0100
parents e9e46a587370
children 04149e80e25c
files src/SbpOperators/volumeops/quadratures/quadrature.jl test/testSbpOperators.jl
diffstat 2 files changed, 5 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/SbpOperators/volumeops/quadratures/quadrature.jl	Fri Feb 12 16:42:43 2021 +0100
+++ b/src/SbpOperators/volumeops/quadratures/quadrature.jl	Fri Feb 12 16:43:29 2021 +0100
@@ -1,5 +1,5 @@
 """
-    quadrature(grid::EquidistantGrid, inner_stencil, closure_stencils)
+    quadrature(grid::EquidistantGrid, closure_stencils, inner_stencil)
     quadrature(grid::EquidistantGrid, closure_stencils)
 
 Creates the quadrature operator `H` as a `TensorMapping`
@@ -12,10 +12,10 @@
 On a one-dimensional `grid`, `H` is a `VolumeOperator`. On a multi-dimensional
 `grid`, `H` is the outer product of the 1-dimensional quadrature operators in
 each coordinate direction. Also see the documentation of
-`SbpOperators.volume_operator(...)` for more details. On 0-dimensional `grid`,
+`SbpOperators.volume_operator(...)` for more details. On a 0-dimensional `grid`,
 `H` is a 0-dimensional `IdentityMapping`.
 """
-function quadrature(grid::EquidistantGrid, inner_stencil, closure_stencils)
+function quadrature(grid::EquidistantGrid, closure_stencils, inner_stencil = CenteredStencil(one(eltype(grid))))
     h = spacing(grid)
     H = SbpOperators.volume_operator(grid, scale(inner_stencil,h[1]), scale.(closure_stencils,h[1]), even, 1)
     for i ∈ 2:dimension(grid)
@@ -26,11 +26,4 @@
 end
 export quadrature
 
-quadrature(grid::EquidistantGrid{0,T}, inner_stencil, closure_stencils) where T = IdentityMapping{T}()
-#TODO:  Consider changing the interface of volume_operator to volume_operator(grid,closure_stencils,inner_stencil)
-#       in order to allow for having quadrature(grid, closure_stencils, inner_stencil = CenteredStencil(one(T)))
-#       Then the below function can be removed.
-function quadrature(grid::EquidistantGrid{Dim,T}, closure_stencils) where {Dim,T}
-    inner_stencil = CenteredStencil(one(T))
-    return quadrature(grid, inner_stencil, closure_stencils)
-end
+quadrature(grid::EquidistantGrid{0}, closure_stencils, inner_stencil) = IdentityMapping{eltype(grid)}()
--- a/test/testSbpOperators.jl	Fri Feb 12 16:42:43 2021 +0100
+++ b/test/testSbpOperators.jl	Fri Feb 12 16:43:29 2021 +0100
@@ -411,7 +411,7 @@
         @testset "1D" begin
             H = quadrature(g_1D,op.quadratureClosure)
             inner_stencil = CenteredStencil(1.)
-            @test H == quadrature(g_1D,inner_stencil,op.quadratureClosure)
+            @test H == quadrature(g_1D,op.quadratureClosure,inner_stencil,)
             @test H isa TensorMapping{T,1,1} where T
         end
         @testset "2D" begin