carray-netcdf 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62dc3decce3d6a06d06baced44145cb748fb1cc19ef3c4edae473e5a269be154
-  data.tar.gz: 84678964ad06f9ae9e516041017c928a9c7df5400bca9e902d83b4c24986d6df
+  metadata.gz: 19f1abb99ae79c059426a1323e0fb028dd669f556b993cd6b5823263fa19e281
+  data.tar.gz: cc84704439ad231e340dc5a2bb4e3fae86496037008102458bf3634ec8dcd10b
 SHA512:
-  metadata.gz: b2dc4b1091f9ac03c1feaae507f388662530aa5f737a62dcc12283ab0c51f4a066ea4789482dc0ccee823fe7da6c957c667a572595dfe507c315112869cb0152
-  data.tar.gz: e7ae67ded7101931ed8a89cef1a298b5c2544aee0272e19a8987d8b883d6c4ca763a324dadc8c0e30b35d3297124096308a075d8d84d151a8ea02d4905985df3
+  metadata.gz: fd1842a3d39729174629d8912ead0714b64c917dc99c888d750419edf5cf6c1e15e33d6f1b6ec8ce0557565bffa8588186ca9b2b07b6b27ceef54d8d2be14495
+  data.tar.gz: fea6389e64aa7728dfa71bc88ad8267af0749d2e419085f50c22cdc47b64bdf806c6b6e0109d71f3907e4f582dd73a8ab26093e6d69e5c92a5eeeaa234802224

data/API.md

@@ -261,3 +261,10 @@ If you want the detailed controling to create netcdf, use nc_function API.
     
     nc = NCFile.open("test.nc")
     nc.definition                        ### return definition Hash 
+
+
+### template with CDL
+
+    out = NCFileWrite.new("test.nc", template: cdl_text)
+    
+    

data/carray-netcdf.gemspec

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

data/lib/io/netcdf.rb

@@ -365,7 +365,16 @@ class NCFile < NCObject
 
   def self.open (filename)
     file_id = NC.open(filename)
-    return NCFile.new(file_id)
+    if block_given?
+      begin
+        nc = NCFile.new(file_id)    
+        yield(nc)
+      ensure
+        nc.close
+      end
+    else
+      return NCFile.new(file_id)    
+    end
   end
 
   def initialize (file_id)
@@ -380,6 +389,10 @@ class NCFile < NCObject
 
   attr_reader :file_id, :dims, :vars
 
+  def close ()
+    nc_close(@file_id)
+  end
+
   def parse_metadata ()
     ndims = nc_inq_ndims(@file_id)
     ndims.times do |i|
@@ -484,7 +497,7 @@ class NCFileWriter
       "double" => NC_DOUBLE,
     }
 
-    def initialize (ncfile, name, definition, compression = 0)
+    def initialize (ncfile, name, definition, compression = 0, define_mode = true)
       @ncfile  = ncfile
       @file_id = ncfile.file_id
       @name    = name
@@ -503,19 +516,25 @@ class NCFileWriter
       else
         dim_ids  = []
       end
-      @var_id  = nc_def_var(@file_id, @name, @type, dim_ids)
-      if compression != 0
-        nc_def_var_deflate(@file_id, @var_id, 1, 1, compression)
+      if define_mode
+        @var_id  = nc_def_var(@file_id, @name, @type, dim_ids)
+        if compression != 0
+          nc_def_var_deflate(@file_id, @var_id, 1, 1, compression)
+        end
+      else
+        @var_id  = nc_inq_varid(@file_id, @name)        
       end
       @attributes = definition.dup
       @attributes.delete("type")
       @attributes.delete("dim")
-      @attributes.each do |name, value|
-        value = NCFileWriter.convert_attribute_value(value)
-        begin
-          nc_put_att(@file_id, @var_id, name, value)
-        rescue => e
-          raise(e.class, e.message + " {#{name}: #{value}}")
+      if define_mode
+        @attributes.each do |name, value|
+          value = NCFileWriter.convert_attribute_value(value)
+          begin
+            nc_put_att(@file_id, @var_id, name, value)
+          rescue => e
+            raise(e.class, e.message + " {#{name}: #{value}}")
+          end
         end
       end
       @attributes.freeze
@@ -598,12 +617,16 @@ class NCFileWriter
 
     include NC
     
-    def initialize (ncfile, name, len)
+    def initialize (ncfile, name, len, define_mode = true)
       @ncfile     = ncfile
       @file_id    = ncfile.file_id
       @name       = name
       @len        = len
-      @dim_id     = nc_def_dim(@file_id, @name, @len)
+      if define_mode
+        @dim_id     = nc_def_dim(@file_id, @name, @len)
+      else
+        @dim_id     = nc_inq_dimid(@file_id, @name)        
+      end
     end
     
     attr_reader :name, :dim_id
@@ -623,18 +646,32 @@ class NCFileWriter
     "double" => NC_DOUBLE,
   }
   
-  def initialize (file, mode = 0, compression: 0)
-    if compression > 0
-      @file_id  = nc_create(file, mode|NC_NETCDF4)
-    else
-      @file_id  = nc_create(file, mode)
-    end
+  def initialize (file, mode = 0, template: nil, compression: 0)
     @dims     = []
     @name2dim = {}
     @vars     = []
     @name2var = {}
     @compression = compression
-    @attributes = nil
+    @attributes = nil      
+    if template.nil?
+      if compression > 0
+        @file_id  = nc_create(file, mode|NC_NETCDF4)
+      else
+        @file_id  = nc_create(file, mode)
+      end
+    else
+      IO.popen("ncgen -o #{file}", "w") { |io|
+        io.write(template)
+      }
+      if compression > 0
+        @file_id  = nc_open(file, mode|NC_WRITE|NC_SHARE|NC_NETCDF4)
+      else
+        @file_id  = nc_open(file, mode|NC_WRITE|NC_SHARE)
+      end
+      NCFile.open(file) {|nc|
+        define nc.definition, define_mode: false
+      }
+    end
   end
   
   attr_reader :file_id
@@ -713,34 +750,38 @@ class NCFileWriter
     return value
   end
 
-  def define (definition)
+  def define (definition, define_mode: true)
     definition = normalize_definition(definition)
     check_definition(definition)
     definition["dimensions"].each do |name, len|
-      dim = Dim.new(self, name, len.to_i)
+      dim = Dim.new(self, name, len.to_i, define_mode)
       @dims.push dim
       @name2dim[name] = dim
     end
     definition["variables"].each do |name, info|
-      var = Var.new(self, name, info, @compression)
+      var = Var.new(self, name, info, @compression, define_mode)
       @vars.push var
       @name2var[name] = var
     end
     if definition.has_key?("attributes")
       @attributes = definition["attributes"]
-      @attributes.each do |name, value|
-        value = NCFileWriter.convert_attribute_value(value)
-        begin
-          nc_put_att(@file_id, NC_GLOBAL, name, value)
-        rescue => e
-          raise(e.class, e.error_message + " {#{name}: #{value}}")
+      if define_mode
+        @attributes.each do |name, value|
+          value = NCFileWriter.convert_attribute_value(value)
+          begin
+            nc_put_att(@file_id, NC_GLOBAL, name, value)
+          rescue => e
+            raise(e.class, e.error_message + " {#{name}: #{value}}")
+          end
         end
       end
       @attributes.freeze
     else
       @attributes = {}.freeze
     end
-    nc_enddef(@file_id)
+    if define_mode
+      nc_enddef(@file_id)
+    end
   end
     
   def dim (name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carray-netcdf
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies: []
 description: "    Extension for manipulating NetCDF3 file with CArray\n"
 email: ''