Skip to content

Commit 61d7417

Browse files
Merge pull request #2143 from CliMA/ck/data2array
Add data2array support for DataF layouts
2 parents 50e545d + 727ef99 commit 61d7417

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ ClimaCore.jl Release Notes
44
main
55
-------
66

7+
- Added support `data2array` for `DataF` (i.e., `PointField`s). PR [2143](https://github.com/CliMA/ClimaCore.jl/pull/2143).
8+
79
v0.14.22
810
-------
911

src/DataLayouts/DataLayouts.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,6 +2149,7 @@ Also, this assumes that `eltype(data) <: Real`.
21492149
"""
21502150
function data2array end
21512151

2152+
data2array(data::DataF) = reshape(parent(data), :)
21522153
data2array(data::Union{IF, IFH, IHF}) = reshape(parent(data), :)
21532154
data2array(data::Union{IJF, IJFH, IJHF}) = reshape(parent(data), :)
21542155
data2array(

test/DataLayouts/unit_data2array.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ end
2121
device = ClimaComms.device()
2222
ArrayType = ClimaComms.array_type(device)
2323

24+
data = DataF{FT}(ArrayType{FT}, rand)
25+
@test DataLayouts.data2array(data) == reshape(parent(data), :)
26+
@test is_data2array2data_identity(data)
27+
2428
data = IF{FT}(ArrayType{FT}, rand; Ni)
2529
@test DataLayouts.data2array(data) == reshape(parent(data), :)
2630
@test is_data2array2data_identity(data)

0 commit comments

Comments
 (0)