Specific implementation of pair_arrays for CompressedArray

gridap · Feb 21, 2020 · 9bf4f04 · 9bf4f04
1 parent 4c0c9cb
commit 9bf4f04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Arrays/ArrayPairs.jl b/src/Arrays/ArrayPairs.jl
@@ -5,6 +5,16 @@ function pair_arrays(a::AbstractArray,b::AbstractArray)
   ArrayPair(a,b)
 end
 
+function pair_arrays(a::CompressedArray,b::CompressedArray)
+  if (a.ptrs === b.ptrs) || (a.ptrs == b.ptrs)
+    values = [ (ai,bi) for (ai,bi) in zip(a.values,b.values) ]
+    ptrs = a.ptrs
+    return CompressedArray(values,ptrs)
+  else
+    return ArrayPair(a,b)
+  end
+end
+
 struct ArrayPair{T,N,A,B} <:AbstractArray{T,N}
   a::A
   b::B

diff --git a/src/Geometry/CellQuadratures.jl b/src/Geometry/CellQuadratures.jl
@@ -32,14 +32,6 @@ function CellQuadrature(degree,polytopes::Vector{<:Polytope}, cell_types::Abstra
   CellQuadrature(array)
 end
 
-function CellQuadrature(degree,polytopes::Vector{<:Polytope}, cell_types::Fill)
-  ctype = cell_types.value
-  p = polytopes[ctype]
-  quad = Quadrature(p,degree)
-  array = Fill(quad,length(cell_types))
-  CellQuadrature(array)
-end
-
 """
     get_array(quad::CellQuadrature)
 """