Fix field2array error msg, level func bounds check

Bump UnrolledUtilities compat

Fix inconsistent tensor indexing behavior

Fix field2array error message

Add tests for level function on Fields

Also add `issubspace` for `FiniteDifferenceSpaces`

The test currently fails because an error
is not thrown for face spaces when out of
bounds indexing.

remove issubspace

Remove `@inbounds` from `level` function

`level` on a field on cell faces does not throw
errors when attempting to access a level
outside the space. This fixes that, but there
may be a performance penalty.

Simplify AxisTensor idxin function

The previous idxin method for a 1d axis tensor
behaved different that non singlular dimension axistensors.

This commit unifies all the different methods by
using unrolled_findfirst

Bump UnrolledUtilities compat

Simplify level bounds tests

Bump UnrolledUtilities again

Author: imreddyTeja

Project.toml

@@ -78,7 +78,7 @@ Statistics = "1"
 StatsBase = "0.34"
 TerminalLoggers = "0.1"
 Test = "1"
-UnrolledUtilities = "0.1.6"
+UnrolledUtilities = "0.1.9"
 julia = "1.10"
 
 [extras]

src/Fields/Fields.jl

@@ -517,7 +517,7 @@ Base.@propagate_inbounds function level(
     v::PlusHalf,
 )
     hspace = level(axes(field), v)
-    @inbounds data = level(field_values(field), v.i + 1)
+    data = level(field_values(field), v.i + 1)
     Field(data, hspace)
 end
 
@@ -664,7 +664,7 @@ element type of the array is the same as the struct type of `field`.
 """
 function field2array(field::Field)
     if sizeof(eltype(field)) != sizeof(eltype(parent(field)))
-        f_axis_size = sizeof(eltype(parent(field))) ÷ sizeof(eltype(field))
+        f_axis_size = sizeof(eltype(field)) ÷ sizeof(eltype(parent(field)))
         error("unable to use field2array because each Field element is \
                represented by $f_axis_size array elements (must be 1)")
     end

src/Geometry/Geometry.jl

@@ -2,6 +2,7 @@ module Geometry
 
 using ..RecursiveApply
 import LinearAlgebra
+import UnrolledUtilities: unrolled_findfirst
 
 using StaticArrays
 

src/Geometry/axistensors.jl

@@ -61,33 +61,8 @@ coordinate_axis(::Type{<:LatLongPoint}) = (1, 2)
 
 coordinate_axis(coord::AbstractPoint) = coordinate_axis(typeof(coord))
 
-@inline idxin(I::Tuple{Int}, i::Int) = 1
-
-@inline function idxin(I::Tuple{Int, Int}, i::Int)
-    @inbounds begin
-        if I[1] == i
-            return 1
-        elseif I[2] == i
-            return 2
-        else
-            return nothing
-        end
-    end
-end
-
-@inline function idxin(I::Tuple{Int, Int, Int}, i::Int)
-    @inbounds begin
-        if I[1] == i
-            return 1
-        elseif I[2] == i
-            return 2
-        elseif I[3] == i
-            return 3
-        else
-            return nothing
-        end
-    end
-end
+@inline idxin(I::NTuple{N, Int}, i::Int) where {N} =
+    unrolled_findfirst(isequal(i), I)
 
 struct PropertyError <: Exception
     ax::Any

test/Fields/unit_field.jl

@@ -1196,6 +1196,43 @@ end
     bf_new = @. bf # test copy()
 end
 
+@testset "Level function boundschecking" begin
+    FT = Float32
+    extruded_center_space = ExtrudedCubedSphereSpace(
+        FT;
+        z_elem = 10,
+        z_min = 0,
+        z_max = 1,
+        radius = 10,
+        h_elem = 10,
+        n_quad_points = 4,
+        staggering = Grids.CellCenter(),
+    )
+    fd_center_space = ColumnSpace(
+        FT;
+        z_elem = 10,
+        z_min = 0,
+        z_max = 10,
+        staggering = CellCenter(),
+    )
+    for center_space in (extruded_center_space, fd_center_space)
+        face_space = Spaces.face_space(center_space)
+        center_field = fill(FT(1), center_space)
+        face_field = fill(FT(2), face_space)
+        if Base.JLOptions().check_bounds == 1
+            for level in (-1, 11, 0)
+                @test_throws BoundsError Fields.level(center_field, level)
+                level != 0 && @test_throws BoundsError Fields.level(
+                    face_field,
+                    PlusHalf(level),
+                )
+            end
+        else
+            @warn "Bounds check on level(::Field) not verified."
+        end
+    end
+end
+
 include("unit_field_multi_broadcast_fusion.jl")
 
 nothing