Skip to content

Commit

Permalink
Merge pull request #44 from gaelforget/v0p1p15a
Browse files Browse the repository at this point in the history
bump version
  • Loading branch information
gaelforget authored Aug 16, 2022
2 parents c605029 + 83c6d5d commit 8d4bc5b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 204 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
version:
- '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
- 'nightly'
os:
- ubuntu-latest
arch:
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "NCTiles"
uuid = "4c1fdd90-559f-11e9-1abf-07ceafc4ffc0"
authors = ["Gael Forget", "Lauren Milechin"]
version = "0.1.14"
version = "0.1.15"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand All @@ -14,6 +14,6 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[compat]
MeshArrays = "0.2"
NCDatasets = "0.9, 0.10, 0.11"
NCDatasets = "0.9, 0.10, 0.11, 0.12"
NetCDF = "0.8, 0.9, 0.10, 0.11"
julia = "1.2"
4 changes: 2 additions & 2 deletions examples/Example5.jl
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ function ClimArray_to_MeshArray(C::ClimArray)

nlon=length(tmp.dims[1][:])
nlat=length(tmp.dims[2][:])
XC = MeshArray(tmp.dims[1][:]*ones(1,nlon))
YC = MeshArray(ones(nlat,1)*tmp.dims[2][:]')
XC = MeshArray(collect(tmp.dims[1][:])*ones(1,nlon))
YC = MeshArray(ones(nlat,1)*collect(tmp.dims[2][:])')
Γ = (XC=XC,YC=YC)

MeshArray(C.data;meta=m),Γ
Expand Down
2 changes: 1 addition & 1 deletion src/write.jl
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ Add dimension data to predefined dimensions in a NetCDF file.
"""
function addDimData(ds,dimvar::NCvar)
atts = merge(Dict(("units" =>dimvar.units)),dimvar.atts)
defVar(ds,dimvar.name,dimvar.values[:],(dimvar.name,),attrib=atts)
defVar(ds,dimvar.name,collect(dimvar.values[:]),(dimvar.name,),attrib=atts)
end

"""
Expand Down
194 changes: 0 additions & 194 deletions test/Manifest.toml

This file was deleted.

9 changes: 5 additions & 4 deletions test/testutils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,9 @@ end
Create test data on a simple, coarse-grained Earth grid.
"""
function maketestdata()
lon=-180:20:180; lat=-90:20:90;
depth = 5:10:100
lon=collect(-180:20:180)
lat=collect(-90:20:90)
depth = collect(5:10:100)
n1,n2,n3 = (length(lon),length(lat),length(depth))

timeinterval = 1
Expand Down Expand Up @@ -231,8 +232,8 @@ function maketestdata()
dep = -1 .* collect([-5 -15 -25 -35 -45 -55 -65 -75.0049972534180 -85.0250015258789 -95.0950012207031 -105.309997558594 -115.870002746582 -127.150001525879 -139.740005493164 -154.470001220703 -172.399993896484 -194.735000610352 -222.710006713867 -257.470001220703 -299.929992675781 -350.679992675781 -409.929992675781 -477.470001220703 -552.710021972656 -634.734985351563 -722.400024414063 -814.469970703125 -909.739990234375 -1007.15502929688 -1105.90502929688 -1205.53503417969 -1306.20495605469 -1409.15002441406 -1517.09497070313 -1634.17504882813 -1765.13500976563 -1914.15002441406 -2084.03491210938 -2276.22509765625 -2491.25000000000 -2729.25000000000 -2990.25000000000 -3274.25000000000 -3581.25000000000 -3911.25000000000 -4264.25000000000 -4640.25000000000 -5039.25000000000 -5461.25000000000 -5906.25000000000]')
tile_ex = Dict(["tilesize" => tilesize,
"grid" => grid,
"dims" => [NCvar("i_c","1",tilesize[1],1:tilesize[1],Dict("long_name" => "Cartesian coordinate 1"),NCDatasets),
NCvar("j_c","1",tilesize[2],1:tilesize[2],Dict("long_name" => "Cartesian coordinate 2"),NCDatasets),
"dims" => [NCvar("i_c","1",tilesize[1],collect(1:tilesize[1]),Dict("long_name" => "Cartesian coordinate 1"),NCDatasets),
NCvar("j_c","1",tilesize[2],collect(1:tilesize[2]),Dict("long_name" => "Cartesian coordinate 2"),NCDatasets),
NCvar("dep_c","m",size(dep),dep,Dict("long_name" => "depth","standard_name" => "depth","positive" => "down"),NCDatasets),
NCvar("tim","days since 1992-1-1 0:0:0",Inf,time_steps,Dict(("long_name" => "time","standard_name" => "time")),NCDatasets)],
"fnamestile2d" => fnamestile2d
Expand Down

0 comments on commit 8d4bc5b

Please sign in to comment.