Merge pull request #27 from gaelforget/v0p1p21

V0p1p21

Project.toml

@@ -1,7 +1,7 @@
 name = "MITgcmTools"
 uuid = "62725fbc-3a66-4df3-9000-e33e85b3a198"
 authors = ["gaelforget <gforget@mit.edu>"]
-version = "0.1.20"
+version = "0.1.21"
 
 [deps]
 ClimateModels = "f6adb021-9183-4f40-84dc-8cea6f651bb0"
@@ -18,7 +18,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 ClimateModels = "0.1"
-DataFrames = "0.21, 0.22, 1.0"
+DataFrames = "0.21, 0.22, 1"
 MeshArrays = "0.2"
 NetCDF = "0.8, 0.9, 0.10, 0.11"
 OrderedCollections = "1"

src/ReadFiles.jl

@@ -87,8 +87,8 @@ function findtiles(ni::Int,nj::Int,mygrid::gcmgrid)
     mytiles["nFaces"]=mygrid.nFaces;
     mytiles["ioSize"]=mygrid.ioSize;
 
-    XC=GridVariables["XC"];
-    YC=GridVariables["YC"];
+    XC=GridVariables.XC;
+    YC=GridVariables.YC;
     XC11=similar(XC); YC11=similar(XC);
     XCNINJ=similar(XC); YCNINJ=similar(XC);
     iTile=similar(XC); jTile=similar(XC); tileNo=similar(XC);

test/runtests.jl

@@ -5,8 +5,8 @@ using Test
 
     #format conversions
     (γ,Γ)=GridOfOnes("CubeSphere",30,30)
-    @test isa(convert2gcmfaces(Γ["XC"]),Array)
-    @test isa(convert2array(Γ["XC"]),Array)
+    @test isa(convert2gcmfaces(Γ.XC),Array)
+    @test isa(convert2array(Γ.XC),Array)
 
     #physical oceanography
     (ρP,ρI,ρR) = SeaWaterDensity(3.,35.5,3000.)
@@ -76,8 +76,8 @@ using Test
 
     γ=gcmgrid(pth,"CubeSphere",6,fill((32, 32),6), [192 32], Float64, readcube, writecube)
     Γ = GridLoad(γ)
-    tmp1=writecube(Γ["XC"])
-    tmp2=readcube(tmp1,Γ["XC"])
+    tmp1=writecube(Γ.XC)
+    tmp2=readcube(tmp1,Γ.XC)
 
     @test isa(tmp2,MeshArray)