Add better function to check if valid fieldarray

Author: Jeremy E Kozdon

src/arrays.jl

@@ -107,3 +107,17 @@ function fieldarray(a::StructArray{S}, dims::Dims=size(a)) where {S}
     @assert isfieldarray(a)
     fieldarray(undef, _namedtuple(S), arraytype(a), dims)
 end
+
+isfieldarray(a) = Tullio.storage_type(a) == typeof(a)
+function isfieldarray(a::StructArray)
+    data = components(a)[1]
+    while data isa StructArray
+        data = components(data)[1]
+    end
+    isfieldarray(a, data)
+end
+isfieldarray(a::StructArray, data) =
+    all(isfieldarray.(values(components(a)), Ref(data)))
+isfieldarray(a::Union{Base.ReshapedArray, SubArray}, data) =
+    isfieldarray(parent(a), data)
+isfieldarray(a, data) = pointer(a) == pointer(data)

src/banded.jl

@@ -63,7 +63,7 @@ function get_batched_array(x::StructArray, Nqh, Neh)
     Nqv = div(prod(size(x)[1:end-1]), Nqh)
     n = Nev * Nqv * Nfields
     xa = parent(components(x)[1])
-    @assert all(map(y -> pointer(y) === pointer(xa), parent.(components(x))))
+    @assert isfieldarray(x)
 
     # Reshape so that fields come before vertical dofs (smaller bandwidth)
     xa = PermutedDimsArray(reshape(xa, Nqh, Nqv, Nfields, Nev, Neh),

test/arrays.jl

@@ -13,6 +13,7 @@
         a = fieldarray(undef, T, A, ())
         @test size(a) == ()
         @test typeof(a) == typeof(fieldarray(a))
+        @test Bennu.isfieldarray(a)
 
         b = fieldarray(a, (1,2,1,3))
         @test size(b) == (1,2,1,3)
@@ -23,6 +24,7 @@
         @test eltype(a) == T
         @test Tullio.storage_type(a) <: A
         @test typeof(a) == typeof(fieldarray(a))
+        @test Bennu.isfieldarray(a)
 
         b = fieldarray(a, (1,2,1,3))
         @test size(b) == (1,2,1,3)
@@ -35,6 +37,7 @@
         @test eltype(a) == T
         @test Tullio.storage_type(a) <: A
         @test typeof(a) == typeof(fieldarray(a))
+        @test Bennu.isfieldarray(a)
 
         b = fieldarray(a, (1,2,1,3))
         @test size(b) == (1,2,1,3)
@@ -47,6 +50,8 @@
         @test eltype(a) == NamedTuple{(:a, :b), Tuple{SVector{2, T}, T}}
         @test Tullio.storage_type(a) <: A
         @test typeof(a) == typeof(fieldarray(a))
+        @test Bennu.isfieldarray(a)
+        @test !Bennu.isfieldarray(similar(a))
 
         b = fieldarray(a, (1,2,1,3))
         @test size(b) == (1,2,1,3)