Added a new element type to accepted Quadratures in CellPoint

gridap · Dec 22, 2021 · 90713e1 · 90713e1
1 parent e44c3c5
commit 90713e1
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/CellData/CellQuadratures.jl b/src/CellData/CellQuadratures.jl
@@ -1,22 +1,28 @@
 
 # Quadrature rule
 
+VectorBlock{<:AbstractArray{<:Point}}
+
+const QET=Union{<:Quadrature,<:VectorBlock{<:Quadrature}}
+const PET=Union{<:AbstractArray{<:Point},<:VectorBlock{<:AbstractArray{<:Point}}}
+const WET=Union{<:AbstractArray{<:Real},<:VectorBlock{<:AbstractArray{<:Real}}}
+
 """
 """
 struct CellQuadrature{DDS,IDS} <: CellDatum
-  cell_quad::AbstractArray{<:Quadrature}
-  cell_point::AbstractArray{<:AbstractArray{<:Point}}
-  cell_weight::AbstractArray{<:AbstractArray{<:Real}}
+  cell_quad::AbstractArray{<:QET}
+  cell_point::AbstractArray{<:PET}
+  cell_weight::AbstractArray{<:WET}
   trian::Triangulation
   data_domain_style::DDS
   integration_domain_style::IDS
 end
 
 # Old constructor (for backward compatibility)
 function CellQuadrature(
-  cell_quad::AbstractArray{<:Quadrature},
-  cell_point::AbstractArray{<:AbstractArray{<:Point}},
-  cell_weight::AbstractArray{<:AbstractArray{<:Real}},
+  cell_quad::AbstractArray{<:QET},
+  cell_point::AbstractArray{<:PET},
+  cell_weight::AbstractArray{<:WET},
   trian::Triangulation,
   data_domain_style::DomainStyle)
   CellQuadrature(cell_quad,cell_point,cell_weight,trian,data_domain_style,PhysicalDomain())