Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/messages.jl
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ mind["name"]
"""
function MessageIndex(message::GRIB.Message; index_keys = ALL_KEYS)
values = read_message.(Ref(message), index_keys)
headers = Dict(k => v for (k,v) in zip(index_keys, values))
headers = Dict{String,Any}(k => v for (k, v) in zip(index_keys, values))

offset = Int(message["offset"])
length = message["totalLength"]
Expand All @@ -280,12 +280,11 @@ function filter_messages(mindexs::Vector{<:MessageIndex}, k::AbstractString, v)
end


function filter_messages(mindexs::Vector{<:MessageIndex}; query...)
ms = deepcopy(mindexs)
function filter_messages(ms::Vector{<:MessageIndex}; query...)
for (k, v) in query
ms = filter_messages(ms, string(k), v)
end
ms
return ms
end

function filter_offsets(mindexs::Vector{<:MessageIndex}, key, val)
Expand Down
5 changes: 5 additions & 0 deletions src/variables.jl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ Base.parent(var::Variable) = var.values
Base.size(var::Variable) = _size_dims(var.dims)
Base.getindex(var::Variable, I...) = getindex(parent(var), I...)

DA.eachchunk(A::Variable) = DA.eachchunk(parent(A))
DA.haschunks(A::Variable) = DA.haschunks(parent(A))
DA.readblock!(A::Variable, aout, i::AbstractUnitRange...) =
DA.readblock!(parent(A), aout, i...)

ndims(::AbstractGRIBVariable{T,N}) where {T,N} = N
varname(var::Variable) = var.name
dims(var::Variable) = var.dims
Expand Down
1 change: 1 addition & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DiskArrays = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
GRIB = "b16dfd50-4035-11e9-28d4-9dfe17e6779b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

Expand Down
11 changes: 11 additions & 0 deletions test/dataset.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using GRIBDatasets
using Dates
using DiskArrays
using Test
using GRIBDatasets: getone
using GRIBDatasets: Variable
Expand Down Expand Up @@ -30,6 +31,16 @@ using GRIBDatasets: CDM
@test CDM.name(ds[:t]) == CDM.name(ds["t"])
end

@testset "DiskArrays on Variable" begin
var = ds[:z].var
size(var)
@test DiskArrays.eachchunk(var) == DiskArrays.eachchunk(parent(var))
@test DiskArrays.haschunks(var) == DiskArrays.haschunks(parent(var))
block = zeros(10, 10, 1, 1, 1)
DiskArrays.readblock!(var, block, 1:10, 1:10, 1:1, 1:1, 1:1)
@test all(block .== var[1:10, 1:10, 1, 1, 1])
end

@testset "dataset indexing" begin
vars = keys(ds)
@test vars[1] == "lon"
Expand Down