Merge pull request #1883 from CliMA/ck/julia1p11

Fix broken Aqua test in julia 1.11

Author: charleskawczynski

.buildkite/Manifest.toml

@@ -308,7 +308,7 @@ weakdeps = ["CUDA", "MPI"]
 deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "Unrolled"]
 path = ".."
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
-version = "0.14.9"
+version = "0.14.10"
 weakdeps = ["CUDA", "Krylov"]
 
     [deps.ClimaCore.extensions]

src/MatrixFields/band_matrix_row.jl

@@ -40,6 +40,11 @@ subtype of `BandMatrixRow`.
 outer_diagonals(::Type{<:BandMatrixRow{ld, bw}}) where {ld, bw} =
     (ld, ld + bw - 1)
 
+@inline lower_diagonal(::Tuple{<:BandMatrixRow{ld}}) where {ld} = ld
+@inline lower_diagonal(t::Tuple) = lower_diagonal(t...)
+@inline lower_diagonal(::BandMatrixRow{ld}, ::BandMatrixRow{ld}...) where {ld} =
+    ld
+
 """
     band_matrix_row_type(ld, ud, T)
 
@@ -53,8 +58,10 @@ Base.eltype(::Type{BandMatrixRow{ld, bw, T}}) where {ld, bw, T} = T
 Base.zero(::Type{BandMatrixRow{ld, bw, T}}) where {ld, bw, T} =
     BandMatrixRow{ld}(ntuple(_ -> rzero(T), Val(bw))...)
 
-Base.map(f::F, rows::BandMatrixRow{ld}...) where {F, ld} =
-    BandMatrixRow{ld}(map(f, map(row -> row.entries, rows)...)...)
+Base.map(f::F, rows::BandMatrixRow...) where {F} =
+    BandMatrixRow{lower_diagonal(rows)}(
+        map(f, map(row -> row.entries, rows)...)...,
+    )
 
 Base.@propagate_inbounds Base.getindex(row::BandMatrixRow{ld}, d) where {ld} =
     row.entries[d - ld + 1]

test/MatrixFields/band_matrix_row.jl

@@ -51,4 +51,11 @@ include("matrix_field_test_utils.jl")
         TridiagonalMatrixRow{Int},
         PentadiagonalMatrixRow(0, 0, 1, 0, 0),
     )
+
+    @test map(tuple, DiagonalMatrixRow(1), DiagonalMatrixRow(1.0)) ==
+          DiagonalMatrixRow{Tuple{Int, Float64}}(((1, 1.0),))
+    @test map(tuple, DiagonalMatrixRow(1)) == DiagonalMatrixRow(tuple(1))
+    @test zero(typeof(DiagonalMatrixRow(1))) == DiagonalMatrixRow(0)
+    @test eltype(typeof(DiagonalMatrixRow(1))) == Int
+    @test inv(DiagonalMatrixRow(1)) == DiagonalMatrixRow(float(1))
 end