rb-grib 0.2.0 → 0.2.1

data/ext/grib.c

@@ -102,6 +102,12 @@ struct var_list {
   msg_array *ary;
   var_list *next;
   VALUE file;
+  long disc;
+  long mtabl;
+  long cent;
+  long ltabl;
+  long categ;
+  long pnum;
 };
 static var_list*
 var_list_alloc(VALUE file)
@@ -150,7 +156,7 @@ push_msg_var(var_list **pvar, grib_handle *handle, VALUE file)
 {
   size_t len = MAX_VALUE_LENGTH;
   char vname[MAX_VALUE_LENGTH];
-  bzero(vname, len);
+  /*
   if (grib_get_string(handle, "shortName", vname, &len) != GRIB_SUCCESS ||
       strcmp("unknown", vname) == 0) {
     long id;
@@ -162,21 +168,48 @@ push_msg_var(var_list **pvar, grib_handle *handle, VALUE file)
       rb_raise(rb_eRuntimeError, "cannot get variable name");
     }
   }
+  */
+  long edition;
+  long cent, mtabl, pnum;
+  long disc, ltabl, categ;
   long ni, nj, ltype_id;
   char gtype[MAX_VALUE_LENGTH];
   len = MAX_VALUE_LENGTH;
-   if (grib_get_long(handle, "Ni", &ni) != GRIB_SUCCESS ||
-      grib_get_long(handle, "Nj", &nj) != GRIB_SUCCESS ||
-       grib_get_string(handle, "typeOfGrid", gtype, &len) != GRIB_SUCCESS ||
-       (grib_get_long(handle, "indicatorOfTypeOfLevel", &ltype_id) != GRIB_SUCCESS && grib_get_long(handle, "typeOfFirstFixedSurface", &ltype_id) != GRIB_SUCCESS)) {
+
+  grib_get_long(handle, "editionNumber", &edition);
+  grib_get_long(handle, "centre", &cent);
+  if(grib_get_long(handle, "Ni", &ni) != GRIB_SUCCESS ||
+     grib_get_long(handle, "Nj", &nj) != GRIB_SUCCESS ||
+     grib_get_string(handle, "typeOfGrid", gtype, &len) != GRIB_SUCCESS ||
+     (grib_get_long(handle, "indicatorOfTypeOfLevel", &ltype_id) != GRIB_SUCCESS && grib_get_long(handle, "typeOfFirstFixedSurface", &ltype_id) != GRIB_SUCCESS))
     rb_raise(rb_eRuntimeError, "connot identify grid type");
+  switch (edition) {
+  case 1:
+    if(grib_get_long(handle, "table2Version", &mtabl) != GRIB_SUCCESS ||
+       grib_get_long(handle, "indicatorOfParameter", &pnum) != GRIB_SUCCESS)
+      rb_raise(rb_eRuntimeError, "connot identify variable");
+    break;
+  case 2:
+    if (grib_get_long(handle, "tablesVersion", &mtabl) != GRIB_SUCCESS ||
+	grib_get_long(handle, "parameterNumber", &pnum) != GRIB_SUCCESS ||
+	grib_get_long(handle, "discipline", &disc) != GRIB_SUCCESS ||
+	grib_get_long(handle, "localTablesVersion", &ltabl) != GRIB_SUCCESS ||
+	grib_get_long(handle, "parameterCategory", &categ) != GRIB_SUCCESS)
+      rb_raise(rb_eRuntimeError, "connot identify variable");
   }
   var_list *last = NULL;
   var_list *var = pvar[0];
   if (var) {
     while (var) {
-      if (strcmp(var->vname, vname)==0 && var->ni == ni && var->nj == nj && strcmp(var->gtype,gtype)==0 && var->ltype_id==ltype_id) {
-	push_msg(var->ary, handle);
+      if (var->cent == cent && var->mtabl == mtabl && var->pnum == pnum &&
+	  var->ni == ni && var->nj == nj &&
+	  strcmp(var->gtype,gtype)==0 &&
+	  var->ltype_id==ltype_id) {
+	if (edition == 1)
+	  push_msg(var->ary, handle);
+	else if (edition == 2 &&
+	    var->disc == disc && var->ltabl == ltabl &&  var->categ == categ)
+	  push_msg(var->ary, handle);
 	return;
       }
       last = var;
@@ -186,14 +219,46 @@ push_msg_var(var_list **pvar, grib_handle *handle, VALUE file)
   var_list *var_new = var_list_alloc(file);
   if (var_new == NULL)
     rb_raise(rb_eRuntimeError, "cannot allocate memory");
+  var_new->cent = cent;
+  var_new->mtabl = mtabl;
+  var_new->pnum = pnum;
+  if (edition == 2) {
+    var_new->disc = disc;
+    var_new->ltabl = ltabl;
+    var_new->categ = categ;
+  }
   var_new->ni = ni;
   var_new->nj = nj;
   var_new->ltype_id = ltype_id;
-  strcpy(var_new->vname, vname);
   strcpy(var_new->gtype, gtype);
+
   len = MAX_VALUE_LENGTH;
+  bzero(vname, len);
+  if (grib_get_string(handle, "shortName", vname, &len) != GRIB_SUCCESS ||
+      strcmp("unknown", vname) == 0) {
+    sprintf(vname, "id%ld", pnum);
+  }
+  strcpy(var_new->vname, vname);
+
+  len = MAX_VALUE_LENGTH;
+  bzero(vname, len);
   check_error(grib_get_string(handle, "typeOfLevel", vname, &len));
-  strcpy(var_new->ltype, vname);
+  if (strcmp(vname, "unknown")==0 || strcmp(vname,"isobaricInhPa")== 0 || strcmp(vname,"pl")==0)
+    strcpy(var_new->ltype, vname);
+  else {
+    int i, j;
+    var_new->ltype[0] = vname[0];
+    for (i=1,j=1; i<strlen(vname); i++) {
+      if (vname[i]>=65 && vname[i]<=90) {
+	var_new->ltype[j] = vname[i]+32;
+	j++;
+      }
+    }
+    if (j==1)
+      strcpy(var_new->ltype, vname);
+    else
+      var_new->ltype[j] = 0;
+  }
   push_msg(var_new->ary, handle);
   if (last)
     last->next = var_new;

data/lib/numru/grib/grib.rb

@@ -75,9 +75,12 @@ module NumRu
       get_value("pressureUnits")
     end
     def date
+      return DateTime.parse(date_raw)
+    end
+    def date_raw
       d = get_value("dataDate").to_s.rjust(8,"0")
       h = get_value("dataTime").to_s.rjust(4,"0")
-      return DateTime.parse(d << h)
+      d << h
     end
     def step
       get_value("step")
@@ -277,7 +280,7 @@ module NumRu
     end
     private
     def get_time(date)
-      (date - Day0).to_f*24
+      (DateTime.parse(date) - Day0).to_f*24
     end
     def init
       @attr = Hash.new
@@ -312,7 +315,7 @@ module NumRu
       hash = Hash.new
       msgs.each_with_index do |msg,i|
         zv = msg.z_value
-        tv = get_time(msg.date)
+        tv = msg.date_raw
         stv = msg.step
         tiv = msg.time_interval
         env = msg.ensemble_member
@@ -363,7 +366,7 @@ module NumRu
         d = def_dim("time", -1)
         d.put_att("long_name","time")
         d.put_att("units","hours since #{Day0.strftime('%Y-%m-%d %H:%M:%S')}")
-        d.put(NArray.to_na(t))
+        d.put(NArray.to_na(t.map{|tv|get_time(tv)}))
       end
       if st.length == 1
         put_att("step", [msg.step]) if msg.step

data/lib/numru/grib/setenv.rb

@@ -1,10 +1,10 @@
-def_path = File.join(File.expand_path(File.dirname(__FILE__)),"grib","definitions")
+def_path = File.join(File.expand_path(File.dirname(__FILE__)),"definitions")
 if File.exist?(def_path)
   env_name = 'GRIB_DEFINITION_PATH'
   if gdp = ENV[env_name]
     ENV[env_name] = "#{gdp}:#{def_path}"
   else
-    path = `grib_info -d`
+    path = `grib_info -d`.strip
     if File.exist?(path)
       ENV[env_name] = "#{path}:#{def_path}"
     end

data/lib/numru/grib/version.rb

@@ -1,5 +1,5 @@
 module NumRu
   class Grib
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rb-grib
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Seiya Nishizawa
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 +09:00
-default_executable: 
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -107,7 +106,6 @@ files:
 - rb-grib.gemspec
 - spec/grib_read_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://ruby.gfd-dennou.org/products/rb-grib/
 licenses: []
 
@@ -137,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rb-grib
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby class library to hanlde GRIB file