rb-grib 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f3d0dfbd8bcdf02783485139224e0e0c151071
-  data.tar.gz: 6fc49fc43aa1af1fd981803253b40281d2850350
+  metadata.gz: 4d18ea1987ea7a51327997b6217d551a007fbf70
+  data.tar.gz: 1c1e66d6f85bd72655c31a29d39bbf51240783e3
 SHA512:
-  metadata.gz: 5c1a614dd1264329f35793a828cb074d7f5e4603ee21ee22ef5014a73a695b14871e4e3fb750693a5014820b380a31dd4603316fdebcd0d46c350bddd1773092
-  data.tar.gz: c1d07b21d120b59563f2bce553676a8448d4179de0b90f7c8a5cdf3db59f9efd7613140978ccd64d062469a969f04b31fa4d1c707f4237b2cc92df85c7e8e111
+  metadata.gz: 87952a90b57f7d670d03515e6422df16a742d9467ff05dab50fff6206fba3492ca7b568437338576ade22f9c1d2e6bc387c63bc7ecb5598a8c849d82c5b27b01
+  data.tar.gz: a9c17bbc6050b4c0e66cadb2748dd742e08eff5ab86c69de8a1ca38dc1dda011711100038a07301d8cdeb811929eb14b9af7beb112a5afb81309a8b0a605b3e0

data/ext/extconf.rb

@@ -1,23 +1,57 @@
 require "mkmf"
 
+na_path = RbConfig::CONFIG["sitearchdir"]
 begin
   require "rubygems"
+  gem = true
+rescue LoadError
+  gem = false
+end
+if gem
+  if ( na_type = ENV["NARRAY_TYPE"] )
+    nas = [na_type]
+  else
+    nas = %w(narray numru-narray)
+  end
   if Gem::Specification.respond_to?(:find_by_name)
-    if spec = ( Gem::Specification.find_by_name("numru-narray") || Gem::Specification.find_by_name("narray") )
-      gem_path = spec.full_gem_path
+    nas.each do |na|
+      begin
+        if ( spec = Gem::Specification.find_by_name(na) )
+          na_type = na
+          na_path = spec.full_gem_path
+          case na_type
+          when "narray"
+            na_path = File.join(na_path, "src")
+          when "numru-narray"
+            na_path = File.join(na_path, "ext", "numru", "narray")
+          end
+          break
+        end
+      rescue LoadError
+      end
     end
   else
-    if (spec = (Gem.source_index.find_name("numru-narray") || Gem.source_index.find_name("narray")) ).any?
-      gem_path = spec.full_gem_path
+    nas.each do |na|
+      if ( spec = Gem.source_index.find_name(na) ).any?
+        na_type = na
+        na_path = spec[0].full_gem_path
+        case na_type
+        when "narray"
+          na_path = File.join(na_path, "src")
+        when "numru-narray"
+          na_path = File.join(na_path, "ext", "numru", "narray")
+        end
+        break
+      end
     end
   end
-  gem_path = File.join(gem_path, "ext", "numru", "narray")
-rescue LoadError
-  dir_config("narray", RbConfig::CONFIG["sitearchdir"])
 end
 
-unless find_header("narray.h", gem_path)
-  find_header("narray.h", File.join(gem_path,"src"))
+dir_config("narray", na_path, na_path)
+unless have_header("narray.h")
+  $stderr.print "narray.h does not found. Specify the path.\n"
+  $stderr.print "e.g., gem install rb-grib -- --with-narray-include=path\n"
+  exit(-1)
 end
 
 dir_config("grib_api")

data/ext/grib.c

@@ -10,11 +10,13 @@ typedef int na_shape_t;
 
 #define MAX_VALUE_LENGTH 1024
 
+#define CHECK_ERROR(func) raise_error(func, #func)
+
 // error check
 static void
-check_error(int code)
+raise_error(int code, const char* func)
 {
-  if (code) rb_raise(rb_eRuntimeError, "%s", grib_get_error_message(code));
+  if (code) rb_raise(rb_eRuntimeError, "grib-api function failed:\n  function: %s\n  message: %s", func, grib_get_error_message(code));
 };
 
 
@@ -245,7 +247,7 @@ push_msg_var(var_list **pvar, grib_handle *handle, VALUE file)
 
   len = MAX_VALUE_LENGTH;
   bzero(vname, len);
-  check_error(grib_get_string(handle, "typeOfLevel", vname, &len));
+  CHECK_ERROR(grib_get_string(handle, "typeOfLevel", vname, &len));
   if (strcmp(vname, "unknown")==0 || strcmp(vname,"isobaricInhPa")== 0 || strcmp(vname,"pl")==0)
     strcpy(var_new->ltype, vname);
   else {
@@ -405,7 +407,7 @@ rg_file_initialize(int argc, VALUE *argv, VALUE self)
   grib_handle *handle;
   var_list *var = NULL;
   while ((handle = grib_handle_new_from_file(0, file, &error))) {
-    check_error(error);
+    raise_error(error, "grib_handle_new_from_file(0, file, &error)");
     if (handle == NULL)
       rb_raise(rb_eRuntimeError, "unable to create handle in %s", fname);
     push_msg_var(&var, handle, self);
@@ -673,14 +675,14 @@ rg_message_get_value(int argc, VALUE *argv, VALUE self)
 	  len = MAX_VALUE_LENGTH;
 	  bzero(value, len);
 	  if (grib_get_string(message->handle, name, value, &len) == GRIB_SUCCESS) {
-	    check_error(grib_get_long(message->handle, name, &l));
+	    CHECK_ERROR(grib_get_long(message->handle, name, &l));
 	    if (atol(value) == l)
 	      ret = LONG2NUM(l);
 	    else
 	      ret = rb_str_new2(value);
 	  }
 	} else {
-	  check_error(grib_get_long(message->handle, name, &l));
+	  CHECK_ERROR(grib_get_long(message->handle, name, &l));
 	  ret = LONG2NUM(l);
 	}	  
       } else {
@@ -727,9 +729,9 @@ rg_message_get_data(VALUE self)
   Data_Get_Struct(self, rg_message, message);
   int error;
   grib_iterator *iter = grib_iterator_new(message->handle, 0, &error);
-  check_error(error);
+  raise_error(error, "grib_iterator_new(message->handle, 0, &error);");
   long np;
-  check_error(grib_get_long(message->handle, "numberOfPoints", &np));
+  CHECK_ERROR(grib_get_long(message->handle, "numberOfPoints", &np));
   double *lon, *lat, *value;
   VALUE na_lon, na_lat, na_value;
   struct NARRAY *nary;
@@ -808,4 +810,10 @@ void Init_grib()
 
   rb_define_const(cGrib, "KEYS_ITERATOR_ALL_KEYS", ULONG2NUM(GRIB_KEYS_ITERATOR_ALL_KEYS));
   rb_define_const(cGrib, "KEYS_ITERATOR_SKIP_READ_ONLY", ULONG2NUM(GRIB_KEYS_ITERATOR_SKIP_READ_ONLY));
+
+#ifdef NARRAY_BIGMEM
+  rb_define_const(cGrib, "SUPPORT_BIGMEM", Qtrue);
+#else
+  rb_define_const(cGrib, "SUPPORT_BIGMEM", Qfalse);
+#endif
 }

data/lib/numru/grib.rb

@@ -4,3 +4,21 @@ require "numru/grib/setenv.rb"
 require "numru/grib/version.rb"
 require "numru/grib.so"
 require "numru/grib/grib.rb"
+
+if defined?(NumRu::NArray)
+  unless NumRu::Grib::SUPPORT_BIGMEM
+    $stderr.print <<EOM
+rb-grib was compiled with NArray but NumRu::NArray is used.
+Check and use consistent narray!
+EOM
+    raise LoadError, "failed to load rb-grib"
+  end
+else
+  if NumRu::Grib::SUPPORT_BIGMEM
+    $stderr.print <<EOM
+rb-grib was compiled with NumRu::NArray but NArray is used.
+Check and use consistent narray!
+EOM
+    raise LoadError, "failed to load rb-grib"
+  end
+end

data/lib/numru/grib/version.rb

@@ -1,5 +1,5 @@
 module NumRu
   class Grib
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb-grib
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Seiya Nishizawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec