carray-netcdf 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce02ff5fab4bb7e3920bd11317c9709e68d56ce
-  data.tar.gz: 78f48636de46a5b1bd7f91b11747b76033bd1f79
+  metadata.gz: 42bc2741ed1cb9934d9920bb3c27ae63a67d64cc
+  data.tar.gz: cb002d9c44eeb1ae1b21a82676e23994a99744d5
 SHA512:
-  metadata.gz: 57f23cc65af411dc64aeedca1276659afc198e57b7bbc914eb9f26d42746b00ce4815b3d2ad0efcdba331f11b42f09e9e6e156cf5ab212cbe5805feb0388f3d5
-  data.tar.gz: 13852779407b6cd82d3fa1960d3f29bfe6b15cf53728b6dd641d8c183a8d02b979575a4f18c60a06b67b4012e6c1cd56521d340ce02e5c5c0a89f67ee9d12bc8
+  metadata.gz: 5835fce18272746e19bed82b402f541c9051269b1f7162e5a0742235e1a652165ef0c1cf6899b16b3e8caf315f2f9af739cc2d7f59df3f98ab1e75eb558a7e98
+  data.tar.gz: 0e597194080519c77cbc8906feeb6f11db456e3d04c65595ab266003c92019453519aebd90e1afbb072c9374ce46c054a0e5afaa5a6091218ad422c9ed39baf3

data/carray-netcdf.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.0"
+  version = "1.0.1"
 
   files = Dir.glob("**/*") - [ 
                                Dir.glob("carray-*.gem"), 

data/examples/write.rb

@@ -0,0 +1,47 @@
+require "pp"
+require "carray-netcdf"
+include NC
+
+=begin
+definition = {
+  dims: {
+    time: 24
+  },
+  vars: {
+    time: {
+      dims: ["time"],
+      long_name: "time from 00UT"
+    },
+    temp: {
+      dims: ["time"],
+    }
+  }
+}
+=end
+
+require "yaml"
+
+definition = YAML.load %{
+dimensions:
+  time: 24
+variables:
+  time:
+    dim: ["time"]
+    long_name: "time from 00UT"
+  temp:
+    type: #{NC_DOUBLE}
+    dim: ["time"]
+creator: "foobar"
+}
+
+pp definition
+
+out = NCFileWriter.new("test.nc")
+out.define definition
+out["time"] = CArray.int(24).seq
+out["temp"] = CArray.float(24).random
+out.close
+
+nc = NCFile.open("test.nc")
+
+pp nc.definition

data/lib/io/netcdf.rb

@@ -85,9 +85,8 @@ class NCVar < NCObject
   def definition
     {
       type: @vartype,
-      dims: dims.map{|x| x.name },
-      attributes: @attributes.dup
-    }
+      dim: dims.map{|x| x.name }
+    }.update(@attributes)
   end
 
   def inspect
@@ -303,7 +302,7 @@ class NCFile < NCObject
     @vars     = []
     @name2dim = {}
     @name2var = {}
-    @attributes = get_attributes(@file_id, NC::NC_GLOBAL)
+    @attributes = get_attributes(@file_id, NC_GLOBAL)
     parse_metadata()
   end
 
@@ -330,10 +329,9 @@ class NCFile < NCObject
 
   def definition
     {
-      dims: @dims.map{|x| [x.name, x.definition] }.to_h,
-      vars: @vars.map{|x| [x.name, x.definition] }.to_h,
-      attributes: @attributes.dup
-    }
+      dimensions: @dims.map{|x| [x.name, x.definition] }.to_h,
+      variables: @vars.map{|x| [x.name, x.definition] }.to_h
+    }.update(@attributes)    
   end
 
   def [] (name)
@@ -365,20 +363,22 @@ class NCFileWriter
     def initialize (ncfile, name, definition)
       @ncfile  = ncfile
       @file_id = ncfile.file_id
-      @definition = definition
       @name    = name
-      @type    = definition[:type]
-      @dims    = definition[:dims]
-      @dim_ids = @dims.map{|key| @ncfile.dim(key).dim_id }
+      @type    = definition["type"] || NC_FLOAT
+      @dims    = definition["dim"]
       @shape   = @dims.map{|key| @ncfile.dim(key).to_i }
-      @var_id  = nc_def_var(@file_id, @name, @type, @dim_ids)
-      @attributes = definition[:attributes].map{|key, value| [key.to_s, value]}.to_h.freeze
+      dim_ids  = @dims.map{|key| @ncfile.dim(key).dim_id }
+      @var_id  = nc_def_var(@file_id, @name, @type, dim_ids)
+      @attributes = definition.dup
+      @attributes.delete("type")
+      @attributes.delete("dim")
       @attributes.each do |name, value|
         nc_put_att(@file_id, @var_id, name, value)
       end
+      @attributes.freeze
     end
     
-    attr_reader :name, :attributes
+    attr_reader :name, :type, :attributes
     
     def []= (*argv)
       put(*argv)      
@@ -472,31 +472,46 @@ class NCFileWriter
   end
   
   def initialize (file)
-    @file_id = nc_create(file)
-    @dims    = []
+    @file_id  = nc_create(file)
+    @dims     = []
     @name2dim = {}
-    @vars    = []
+    @vars     = []
     @name2var = {}
     @attributes = nil
   end
   
   attr_reader :file_id
   
+  def normalize_definition (definition)
+    out = {}
+    definition.each do |key, value|
+      if value.is_a?(Hash)
+        value = normalize_definition(value)
+      end
+      out[key.to_s] = value
+    end
+    return out
+  end
+  
   def define (definition)
-    definition[:dims].each do |name, len|
-      dim = Dim.new(self, name.to_s, len.to_i)
+    definition = normalize_definition(definition)
+    definition["dimensions"].each do |name, len|
+      dim = Dim.new(self, name, len.to_i)
       @dims.push dim
-      @name2dim[name.to_s] = dim
+      @name2dim[name] = dim
     end
-    definition[:vars].each do |name, info|
-      var = Var.new(self, name.to_s, info)
+    definition["variables"].each do |name, info|
+      var = Var.new(self, name, info)
       @vars.push var
-      @name2var[name.to_s] = var
+      @name2var[name] = var
     end
-    @attributes = definition[:attributes].map{|key, value| [key.to_s, value]}.to_h.freeze
+    @attributes = definition.dup
+    @attributes.delete("dimensions")
+    @attributes.delete("variables")
     @attributes.each do |name, value|
       nc_put_att(@file_id, NC_GLOBAL, name, value)
     end
+    @attributes.freeze
     nc_enddef(@file_id)    
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carray-netcdf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hiroki Motoyoshi
@@ -21,7 +21,9 @@ files:
 - API.md
 - README.md
 - carray-netcdf.gemspec
+- examples/test.nc
 - examples/test.rb
+- examples/write.rb
 - extconf.rb
 - lib/carray-netcdf.rb
 - lib/io/netcdf.rb
@@ -45,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Extension for manipulating NetCDF3 file with CArray