From 664590fd9f9bb12f85574790ab14232c6dd31915 Mon Sep 17 00:00:00 2001 From: Fabian Gans Date: Fri, 26 Jul 2024 13:15:58 +0200 Subject: [PATCH] use Ti also for dataset axis names (#418) --- src/DAT/DAT.jl | 1 - src/DatasetAPI/Datasets.jl | 2 +- test/Datasets/datasets.jl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/DAT/DAT.jl b/src/DAT/DAT.jl index 758e34bd..e18a594a 100644 --- a/src/DAT/DAT.jl +++ b/src/DAT/DAT.jl @@ -727,7 +727,6 @@ function runLoop(dc::DATConfig, showprog) if dc.ntr[1] > 1 innerLoop_threaded(r, args...) else - @show "Running nonthreaded" innerLoop(r,args...) end writeoutars(dc, r, outcaches) diff --git a/src/DatasetAPI/Datasets.jl b/src/DatasetAPI/Datasets.jl index d65a27ae..2cbd1898 100644 --- a/src/DatasetAPI/Datasets.jl +++ b/src/DatasetAPI/Datasets.jl @@ -321,7 +321,7 @@ function open_dataset(g; driver = :all) end gatts = YAXArrayBase.get_global_attrs(g) gatts = Dict{String,Any}(string(k)=>v for (k,v) in gatts) - sdimlist = Dict(Symbol(k) => v.ax for (k, v) in dimlist) + sdimlist = Dict(DD.name(v.ax) => v.ax for (k, v) in dimlist) Dataset(allcubes, sdimlist,gatts) end #Base.getindex(x::Dataset; kwargs...) = subsetcube(x; kwargs...) diff --git a/test/Datasets/datasets.jl b/test/Datasets/datasets.jl index 22e1516f..443c7b7f 100644 --- a/test/Datasets/datasets.jl +++ b/test/Datasets/datasets.jl @@ -215,7 +215,7 @@ end ds = open_dataset("test.mock") @test size(ds.Var1) == (10, 5, 2) @test size(ds.Var2) == (10, 5) - @test all(in(keys(ds.axes)), (:time, :d2, :d3)) + @test all(in(keys(ds.axes)), (:Ti, :d2, :d3)) ar = Cube(ds) @test ar isa YAXArray @test size(ar) == (10, 5, 2, 2)