carray-netcdf 1.0.8 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab6a6e970c18f926b9cd5db1fbeb6a17063b04aa071bac37f63a443236f1563
-  data.tar.gz: 0e5f35cd4896f4b6c1dd1f9d39358327a9e452edcbdac216b8e5b14fd3c7d952
+  metadata.gz: 4f3e60226c628ade3bb1c17f553e5cd2ab593370eb89d00246f7139ed2e6b44f
+  data.tar.gz: 68fba916f7cacf44bb63af2e01374886401d66f52c870a67ab0c949a348da6b2
 SHA512:
-  metadata.gz: 2b718560388e9d0b184e0dada094e85a112b9f2557fb78a2c774df29766a03c5623986c3b5e2d783e553050b91969a8a13a2292630a458674b4675ed7b033217
-  data.tar.gz: e5d7019f0f2b298cec2ef735acb5e8acb88a632716df3b55d65cff0145480313c67982ffea78d96de6f79186411af1798de67aaeab054b97d1a5c3dbd97de759
+  metadata.gz: d03a0d7d42e11f09363a21686cb45fde2e28b641af8848ce7d87f68465f3184cb34db1aeb3d6454fa18ebee978bb2e028dcf8dda737e7e2b65d2ad21cf743f88
+  data.tar.gz: 50073e499670da6e882f8ce3a43d84a32dfd1cb53b496cbd6bfb795ee18867cc1f4124bc9c438d3c4aeef55a95148f011c1182ec3bd08a015a1fdc21fade7687

data/Rakefile

@@ -0,0 +1,12 @@
+
+GEMSPEC = "carray-netcdf.gemspec"
+
+task :install do
+  spec = eval File.read(GEMSPEC)
+  system %{
+    gem build #{GEMSPEC}; gem install #{spec.full_name}.gem
+  }
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/carray-netcdf.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.8"
+  version = "1.0.13"
 
   files = Dir.glob("**/*") - [ 
                                Dir.glob("carray-*.gem"), 
@@ -17,7 +17,7 @@ Gem::Specification::new do |s|
   s.email       = ""
   s.homepage    = 'https://github.com/himotoyoshi/carray-netcdf'
   s.files       = files
-  s.extensions  = [ "extconf.rb" ]
+  s.extensions  = [ "ext/extconf.rb" ]
   s.executables << 'ncdef2yaml'
   s.required_ruby_version = ">= 1.8.1"
 end

data/{rb_netcdflib.c → ext/rb_netcdflib.c}

@@ -1950,11 +1950,11 @@ rb_nc_get_vara (int argc, VALUE *argv, VALUE mod)
     }
     Data_Get_Struct(data, CArray, ca);
 
-    if ( ca->rank != ndims ) {
+    if ( ca->ndim != ndims ) {
       rb_raise(rb_eRuntimeError, "rank mismatch");
     }
 
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       if ( ca->dim[i] != (ca_size_t) count[i] ) {
       	rb_raise(rb_eRuntimeError, "dim[%i] mismatch", i);
       }
@@ -2090,11 +2090,11 @@ rb_nc_get_vars (int argc, VALUE *argv, VALUE mod)
 
     Data_Get_Struct(data, CArray, ca);
 
-    if ( ca->rank != ndims ) {
+    if ( ca->ndim != ndims ) {
       rb_raise(rb_eRuntimeError, "rank mismatch");
     }
 
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       if ( ca->dim[i] != (ca_size_t) count[i] ) {
       	rb_raise(rb_eRuntimeError, "dim[%i] mismatch", i);
       }
@@ -2235,11 +2235,11 @@ rb_nc_get_varm (int argc, VALUE *argv, VALUE mod)
 
     Data_Get_Struct(data, CArray, ca);
 
-    if ( ca->rank != ndims ) {
+    if ( ca->ndim != ndims ) {
       rb_raise(rb_eRuntimeError, "rank mismatch");
     }
 
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       if ( ca->dim[i] != (ca_size_t) count[i] ) {
       	rb_raise(rb_eRuntimeError, "dim[%i] mismatch", i);
       }
@@ -2577,24 +2577,35 @@ Init_netcdflib ()
   rb_define_const(mNetCDF, "NC_NOCLOBBER",    INT2NUM(NC_NOCLOBBER));
   rb_define_const(mNetCDF, "NC_DISKLESS",        INT2NUM(NC_DISKLESS));
   rb_define_const(mNetCDF, "NC_MMAP",        INT2NUM(NC_MMAP));
+#if defined(NC_64BIT_DATA)
   rb_define_const(mNetCDF, "NC_64BIT_DATA",        INT2NUM(NC_64BIT_DATA));
+#endif
+#if defined(NC_CDF5)
   rb_define_const(mNetCDF, "NC_CDF5",        INT2NUM(NC_CDF5));
+#endif
   rb_define_const(mNetCDF, "NC_CLASSIC_MODEL",    INT2NUM(NC_CLASSIC_MODEL));
   rb_define_const(mNetCDF, "NC_LOCK",         INT2NUM(NC_LOCK));
   rb_define_const(mNetCDF, "NC_SHARE",        INT2NUM(NC_SHARE));
   rb_define_const(mNetCDF, "NC_NETCDF4",      INT2NUM(NC_NETCDF4));
   rb_define_const(mNetCDF, "NC_MPIIO",      INT2NUM(NC_MPIIO));
+#if defined(NC_INMEMORY)
   rb_define_const(mNetCDF, "NC_INMEMORY",      INT2NUM(NC_INMEMORY));
+#endif
   rb_define_const(mNetCDF, "NC_PNETCDF",      INT2NUM(NC_PNETCDF));
 
   rb_define_const(mNetCDF, "NC_FORMAT_CLASSIC",      INT2NUM(NC_FORMAT_CLASSIC));
+#if defined(NC_FORMAT_64BIT_OFFSET)
   rb_define_const(mNetCDF, "NC_FORMAT_64BIT_OFFSET",      INT2NUM(NC_FORMAT_64BIT_OFFSET));
+#endif
   rb_define_const(mNetCDF, "NC_FORMAT_64BIT",      INT2NUM(NC_FORMAT_64BIT));
   rb_define_const(mNetCDF, "NC_FORMAT_NETCDF4",      INT2NUM(NC_FORMAT_NETCDF4));
   rb_define_const(mNetCDF, "NC_FORMAT_NETCDF4_CLASSIC",      INT2NUM(NC_FORMAT_NETCDF4_CLASSIC));
+#if defined(NC_FORMAT_64BIT_DATA)
   rb_define_const(mNetCDF, "NC_FORMAT_64BIT_DATA",      INT2NUM(NC_FORMAT_64BIT_DATA));
+#endif
+#if defined(NC_FORMAT_CDF5)
   rb_define_const(mNetCDF, "NC_FORMAT_CDF5",      INT2NUM(NC_FORMAT_CDF5));
-
+#endif
 
   rb_define_const(mNetCDF, "NC_SIZEHINT_DEFAULT", INT2NUM(NC_SIZEHINT_DEFAULT));
 

data/lib/io/netcdf.rb

@@ -235,6 +235,7 @@ class NCVar < NCObject
     when CA_REG_ALL
       out = get_var()
     when CA_REG_BLOCK
+      use_compact = false
       start = []
       count = []
       stride = []
@@ -245,6 +246,7 @@ class NCVar < NCObject
           count << idx[1]
           stride << idx[2]
         else
+          use_compact = true
           start << idx
           count << 1
           stride << 1
@@ -255,17 +257,15 @@ class NCVar < NCObject
       else
         out = get_vars(start, count, stride)
       end
+      if use_compact and out.is_a?(CArray)
+        out = out.compact
+      end
     when CA_REG_SELECT, CA_REG_GRID
       out = get_var[*argv]
     else
       raise "invalid index"
     end
-    case out
-    when CArray
-      return out.compact
-    else
-      return out
-    end
+    return out
   end
   
   def get! (*argv)
@@ -702,14 +702,14 @@ class NCFileWriter
     if definition.has_key?("variables")
       definition["variables"].each do |name, var_def|
         unless var_def.has_key?("type")
-          warn "NetCDF Variable '#{name}' does not have 'type' entry in definition"
+          warn "NCFileWriter: Variable '#{name}' does not have 'type' entry in definition"
         else
           unless ["char","byte","short","int","float","double"].include?(var_def["type"])
             raise "invalid type of NetCDF Variable '#{name}'"
           end          
         end 
         unless var_def.has_key?("dim") 
-          warn "NetCDF Variable '#{name}' does not have 'dim' entry in definition"
+          warn "NCFileWriter: Variable '#{name}' does not have 'dim' entry in definition"
         else
           unless var_def["dim"].is_a?(Array)
             raise "'dim' of NetCDF Variable '#{name}' should be an Array"
@@ -758,17 +758,25 @@ class NCFileWriter
   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, define_mode)
-      @dims.push dim
-      @name2dim[name] = dim
+    if definition.has_key?("dimensions") and definition["dimensions"].is_a?(Hash)
+      definition["dimensions"].each do |name, len|
+        dim = Dim.new(self, name, len.to_i, define_mode)
+        @dims.push dim
+        @name2dim[name] = dim
+      end
+    else
+      warn "NCFileWriter: No dimensions in definition"
     end
-    definition["variables"].each do |name, info|
-      var = Var.new(self, name, info, @compression, define_mode)
-      @vars.push var
-      @name2var[name] = var
+    if definition.has_key?("variables") and definition["variables"].is_a?(Hash)
+      definition["variables"].each do |name, info|
+        var = Var.new(self, name, info, @compression, define_mode)
+        @vars.push var
+        @name2var[name] = var
+      end
+    else
+      warn "NCFileWriter: No variables in definition"
     end
-    if definition.has_key?("attributes")
+    if definition.has_key?("attributes") and definition["attributes"].is_a?(Hash)
       @attributes = definition["attributes"]
       if define_mode
         @attributes.each do |name, value|

metadata

@@ -1,34 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: carray-netcdf
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.13
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies: []
 description: "    Extension for manipulating NetCDF3 file with CArray\n"
 email: ''
 executables:
 - ncdef2yaml
 extensions:
-- extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: []
 files:
 - API.md
 - README.md
+- Rakefile
 - bin/ncdef2yaml
 - carray-netcdf.gemspec
 - examples/test.nc
 - examples/test.rb
 - examples/time.rb
-- extconf.rb
+- ext/extconf.rb
+- ext/rb_netcdflib.c
 - lib/carray-netcdf.rb
 - lib/io/netcdf.rb
-- rb_netcdflib.c
 homepage: https://github.com/himotoyoshi/carray-netcdf
 licenses: []
 metadata: {}
@@ -47,8 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extension for manipulating NetCDF3 file with CArray