Added DuffyQuadrature to the factory function Quadrature()

Author: fverdugo

src/Integration/QuadratureFactories.jl

@@ -0,0 +1,29 @@
+module QuadratureFactories
+
+using Gridap
+using Gridap.Helpers
+
+import Gridap: Quadrature
+
+"""
+Factory function to create Quadrature objects in a convenient way
+"""
+function Quadrature(p::Polytope,order::Int)
+  Quadrature(p.extrusion.array.data,order=order)
+end
+
+function Quadrature(extrusion::NTuple{D,Int};order::Int) where D
+
+  if all(extrusion .== HEX_AXIS)
+    return TensorProductQuadrature(orders=tuple(fill(order,D)...))
+
+  elseif all(extrusion .== TET_AXIS)
+    return DuffyQuadrature{D}(order)
+
+  else
+    @notimplemented
+  end
+
+end
+
+end # module

src/Integration/Quadratures.jl

@@ -25,15 +25,6 @@ coordinates(::Quadrature{D} where D)::Array{Point{D,Float64},1} = @abstractmetho
 
 weights(::Quadrature)::Array{Float64,1} = @abstractmethod
 
-# Factories
-
-"""
-Factory function to create Quadrature objects in a convenient way
-"""
-function Quadrature(extrusion::NTuple{D,Int};order::Int) where D
-  _quadrature(extrusion,order)
-end
-
 # Concrete structs
 
 """
@@ -62,11 +53,6 @@ weights(self::TensorProductQuadrature) = self.weights
 
 # Helpers
 
-function _quadrature(extrusion::NTuple{D,Int},order) where D
-  @notimplementedif any(extrusion == TET_AXIS)
-  TensorProductQuadrature(orders=tuple(fill(order,D)...))
-end
-
 function _tensor_product(quads,npoints,::Val{D}) where D
   @assert length(quads) == D
   @assert length(npoints) == D

src/Integration/files.jl

@@ -5,6 +5,9 @@ include("Quadratures.jl")
 include("DuffyQuadratures.jl")
 @reexport using Gridap.DuffyQuadratures
 
+include("QuadratureFactories.jl")
+@reexport using Gridap.QuadratureFactories
+
 include("CellQuadratures.jl")
 @reexport using Gridap.CellQuadratures
 

test/IntegrationTests/QuadratureFactoriesTests.jl

@@ -0,0 +1,17 @@
+module QuadratureFactoriesTests
+
+using Test
+using Gridap
+
+order = 5
+
+p = Polytope(HEX_AXIS,HEX_AXIS)
+quad = Quadrature(p,order)
+@test isa(quad,TensorProductQuadrature)
+
+
+p = Polytope(TET_AXIS,TET_AXIS,TET_AXIS)
+quad = Quadrature(p,order)
+@test isa(quad,DuffyQuadrature)
+
+end # module

test/IntegrationTests/runtests.jl

@@ -6,6 +6,8 @@ using Test
 
 @testset "DuffyQuadratures" begin include("DuffyQuadraturesTests.jl") end
 
+@testset "QuadraturesFactories" begin include("QuadratureFactoriesTests.jl") end
+
 @testset "CellQuadratures" begin include("CellQuadraturesTests.jl") end
 
 @testset "Triangulations" begin include("TriangulationsTests.jl") end