Merge pull request #493 from JuliaDataCubes/fc/renameda

Reflect renamings in DiskArrays

Author: lazarusA

Project.toml

@@ -1,7 +1,7 @@
 name = "YAXArrays"
 uuid = "c21b50f5-aa40-41ea-b809-c0f5e47bfa5c"
 authors = ["Fabian Gans <[email protected]>"]
-version = "0.6.0"
+version = "0.6.1"
 
 [deps]
 CFTime = "179af706-886a-5703-950a-314cd64e0468"
@@ -35,8 +35,8 @@ YAXArrayBase = "90b8fcef-0c2d-428d-9c56-5f86629e9d14"
 CFTime = "0.0, 0.1"
 DataStructures = "0.17, 0.18"
 DimensionalData = "0.27, 0.28, 0.29"
-DiskArrayTools = "0.1"
-DiskArrays = "0.3, 0.4"
+DiskArrayTools = "0.1.12"
+DiskArrays = "0.3, 0.4.10"
 DocStringExtensions = "0.8, 0.9"
 Glob = "1.3"
 Interpolations = "0.12, 0.13, 0.14, 0.15"

src/Cubes/Cubes.jl

@@ -241,7 +241,7 @@ end
 interpret_cubechunks(cs::NTuple{N,Int},cube) where N = DiskArrays.GridChunks(getdata(cube),cs)
 interpret_cubechunks(cs::DiskArrays.GridChunks,_) = cs
 interpret_dimchunk(cs::Integer,s) = DiskArrays.RegularChunks(cs,0,s)
-interpret_dimchunk(cs::DiskArrays.ChunkType, _) = cs
+interpret_dimchunk(cs::DiskArrays.ChunkVector, _) = cs
 
 function interpret_cubechunks(cs,cube)
     oldchunks = DiskArrays.eachchunk(cube).chunks

src/DAT/DAT.jl

@@ -27,7 +27,7 @@ import YAXArrayBase
 import ProgressMeter: Progress, next!, progress_pmap, progress_map
 using YAXArrayBase
 using DiskArrays: grid_offset, approx_chunksize, max_chunksize, RegularChunks, 
-  IrregularChunks, GridChunks, eachchunk, ChunkType
+  IrregularChunks, GridChunks, eachchunk, ChunkVector
 using OffsetArrays: OffsetArray
 using Dates
 using DimensionalData: DimensionalData as DD
@@ -515,12 +515,12 @@ function makeinplace(f)
 end
 
 function to_chunksize(c::RegularChunks, cs, _ = true) 
-    offset = if c.cs==cs 
+    offset = if c.chunksize==cs 
         c.offset
     else
         0
     end
-    RegularChunks(cs, offset, c.s)
+    RegularChunks(cs, offset, c.arraysize)
 end
 function to_chunksize(c::IrregularChunks, cs, allow_irregular=true)
     fac = cs ÷ approx_chunksize(c)
@@ -988,13 +988,13 @@ function getCacheSizes(dc::DATConfig, loopchunksizes)
     #Now add cache miss information for each input cube to every loop axis
     cmisses = NamedTuple{
         (:iloopax, :cs, :iscompressed, :innerleap, :preventpar),
-        Tuple{Int64,ChunkType,Bool,Int64,Bool},
+        Tuple{Int64,ChunkVector,Bool,Int64,Bool},
     }[]
     userchunks = Dict{Int,Int}()
     for (k, v) in loopchunksizes
         ii = findAxis(k, dc.LoopAxes)
         if ii !== nothing
-            v isa ChunkType || error("Loop chunks must be provided as ChunkType object")
+            v isa ChunkVector || error("Loop chunks must be provided as ChunkVector object")
             userchunks[ii] = v
         end
     end