[SCM] ruby-hdfeos5 branch, master, updated. upstream/1.1-21-g716193a
Youhei SASAKI
uwabami at gfd-dennou.org
Thu Jul 4 17:27:03 UTC 2013
The following commit has been merged in the master branch:
commit 1e1200e656673fdab62f3c5cb846b57cde319a8b
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Fri Jul 5 01:22:54 2013 +0900
Drop unneeded README.source
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 9784808..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,13 +0,0 @@
-libhdfeos5-ruby for Debian
---------------------------
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-
- -- Youhei SASAKI <uwabami at gfd-dennou.org>, Wed, 17 Mar 2010 16:53:27 +0900
diff --git a/debian/patches/FixLibraryPath b/debian/patches/0001-Fix-NArray-Library-Path.patch
similarity index 71%
rename from debian/patches/FixLibraryPath
rename to debian/patches/0001-Fix-NArray-Library-Path.patch
index d6b7d93..5244460 100644
--- a/debian/patches/FixLibraryPath
+++ b/debian/patches/0001-Fix-NArray-Library-Path.patch
@@ -1,5 +1,17 @@
---- ruby-hdfeos5.orig/extconf.rb
-+++ ruby-hdfeos5/extconf.rb
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Fri, 5 Jul 2013 01:23:50 +0900
+Subject: Fix NArray Library Path
+
+In Debian, NArray was installed $vendorarchdir.
+This patch fix search path for NArray.
+---
+ extconf.rb | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/extconf.rb b/extconf.rb
+index 7cceae4..3901f4f 100644
+--- a/extconf.rb
++++ b/extconf.rb
@@ -1,6 +1,6 @@
require "mkmf"
@@ -8,7 +20,7 @@
if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
print <<EOS
-@@ -14,7 +14,15 @@
+@@ -14,7 +14,15 @@ EOS
exit(-1)
end
@@ -25,7 +37,7 @@
if ( ! ( have_header("hdf5.h") && have_library("hdf5") ) )then
print <<-EOS
-@@ -32,9 +40,9 @@
+@@ -32,9 +40,9 @@ if ( ! ( have_header("hdf5.h") && have_library("hdf5") ) )then
exit(-1)
end
@@ -37,7 +49,7 @@
print <<-EOS
** configure error **
Header hdfeos5.h or the compiled hdfeos5 library is not found.
-@@ -69,7 +77,7 @@
+@@ -69,7 +77,7 @@ oldmkfl.each_line{ |line|
newmkfl.puts(line)
newmkfl.puts("")
newmkfl.puts("test: all") # insert the "test" target
diff --git a/debian/patches/FixTestPath b/debian/patches/0002-Fix-test-data-path.patch
similarity index 62%
rename from debian/patches/FixTestPath
rename to debian/patches/0002-Fix-test-data-path.patch
index 074842b..6307f17 100644
--- a/debian/patches/FixTestPath
+++ b/debian/patches/0002-Fix-test-data-path.patch
@@ -1,17 +1,33 @@
---- ruby-hdfeos5.orig/test/test_za.rb
-+++ ruby-hdfeos5/test/test_za.rb
-@@ -7,7 +7,7 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Fri, 5 Jul 2013 01:23:51 +0900
+Subject: Fix test data path
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_gd.rb | 2 +-
+ test/test_pt.rb | 2 +-
+ test/test_sw.rb | 2 +-
+ test/test_za.rb | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/test_gd.rb b/test/test_gd.rb
+index d120d41..b797dc8 100644
+--- a/test/test_gd.rb
++++ b/test/test_gd.rb
+@@ -5,7 +5,7 @@ include NumRu
############################################################################### OK
- ##### he5_za_setup.c
+ ##### OMI ƒf[ƒ^‚ð“Ç‚Ýž‚ñ‚Åì‹Æ‚ª‚Å‚«‚é‚悤‚É‚·‚é
############################################################################### OK
--filename1 = "test_za.he5"
-+filename1 = "test/test_za.he5"
- print "creating ",filename1,"...\n"
- file1=HE5.open(filename1,"w")
- za1=file1.zacreate("za1")
---- ruby-hdfeos5.orig/test/test_pt.rb
-+++ ruby-hdfeos5/test/test_pt.rb
-@@ -9,7 +9,7 @@
+-filename1 = "OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5"
++filename1 = "test/OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5"
+ print "reading ",filename1,"...\n"
+ file1=HE5.open(filename1,"r")
+ p file1.has_swath?()
+diff --git a/test/test_pt.rb b/test/test_pt.rb
+index cfaa6ab..9ff9fdc 100644
+--- a/test/test_pt.rb
++++ b/test/test_pt.rb
+@@ -9,7 +9,7 @@ include NumRu
############################################################################### OK
# sample 1
############################################################################### OK
@@ -20,20 +36,11 @@
print "creating ",filename1,"...\n"
file1=HE5.open(filename1,"w")
point1=file1.ptcreate("Simple point")
---- ruby-hdfeos5.orig/test/test_gd.rb
-+++ ruby-hdfeos5/test/test_gd.rb
-@@ -5,7 +5,7 @@
- ############################################################################### OK
- ##### OMI ƒf[ƒ^‚ð“Ç‚Ýž‚ñ‚Åì‹Æ‚ª‚Å‚«‚é‚悤‚É‚·‚é
- ############################################################################### OK
--filename1 = "OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5"
-+filename1 = "test/OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5"
- print "reading ",filename1,"...\n"
- file1=HE5.open(filename1,"r")
- p file1.has_swath?()
---- ruby-hdfeos5.orig/test/test_sw.rb
-+++ ruby-hdfeos5/test/test_sw.rb
-@@ -5,7 +5,7 @@
+diff --git a/test/test_sw.rb b/test/test_sw.rb
+index 9e3c459..246bd9a 100644
+--- a/test/test_sw.rb
++++ b/test/test_sw.rb
+@@ -5,7 +5,7 @@ include NumRu
############################################################################### OK
##### MLS ƒf[ƒ^‚ð“Ç‚Ýž‚ñ‚Åì‹Æ‚ª‚Å‚«‚é‚悤‚É‚·‚é
############################################################################### OK
@@ -42,3 +49,16 @@
print "reading ",filename1,"...\n"
file1=HE5.open(filename1,"r")
p file1.has_swath?()
+diff --git a/test/test_za.rb b/test/test_za.rb
+index 05850ba..183d5b7 100644
+--- a/test/test_za.rb
++++ b/test/test_za.rb
+@@ -7,7 +7,7 @@ include NumRu
+ ############################################################################### OK
+ ##### he5_za_setup.c
+ ############################################################################### OK
+-filename1 = "test_za.he5"
++filename1 = "test/test_za.he5"
+ print "creating ",filename1,"...\n"
+ file1=HE5.open(filename1,"w")
+ za1=file1.zacreate("za1")
diff --git a/debian/patches/0003-Fix-printf-debugging.patch b/debian/patches/0003-Fix-printf-debugging.patch
new file mode 100644
index 0000000..e34841d
--- /dev/null
+++ b/debian/patches/0003-Fix-printf-debugging.patch
@@ -0,0 +1,914 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 5 Jul 2013 01:30:20 +0900
+Subject: Fix printf debugging
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_gd.rb | 148 +++++++++++++++++++++++++++---------------------------
+ test/test_pt.rb | 99 ++++++++++++++++++------------------
+ test/test_sw.rb | 153 ++++++++++++++++++++++++++++----------------------------
+ test/test_za.rb | 67 +++++++++++++------------
+ 4 files changed, 235 insertions(+), 232 deletions(-)
+
+diff --git a/test/test_gd.rb b/test/test_gd.rb
+index b797dc8..b8672f9 100644
+--- a/test/test_gd.rb
++++ b/test/test_gd.rb
+@@ -1,69 +1,69 @@
++# -*- coding: utf-8 -*-
+ require 'numru/hdfeos5'
+ include NumRu
+
+
+ ############################################################################### OK
+-##### OMI ƒf[ƒ^‚ð“Ç‚Ýž‚ñ‚Åì‹Æ‚ª‚Å‚«‚é‚悤‚É‚·‚é
++##### OMI データをèªã¿è¾¼ã‚“ã§ä½œæ¥ãŒã§ãるよã†ã«ã™ã‚‹
+ ############################################################################### OK
+ filename1 = "test/OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5"
+-print "reading ",filename1,"...\n"
++# print "reading ",filename1,"...\n"
+ file1=HE5.open(filename1,"r")
+-p file1.has_swath?()
+-p file1.has_grid?()
+-p file1.has_za?()
+-p file1.has_point?()
++# p file1.has_swath?()
++# p file1.has_grid?()
++# p file1.has_za?()
++# p file1.has_point?()
+ gridlist=file1.grid_names()
+-p gridlist[0]
++# p gridlist[0]
+ ########################################
+-##### Grid‚ð‚æ‚Þ
++##### Gridをよむ
+ ########################################
+ grid1=file1.grid(gridlist[0])
+ #-------
+-print "ndims = " ,grid1.ndims ,"\n"
+-print "inqdims =", grid1.inqdims('HE5_HDFE_NENTDIM'),"\n"
+-
++# print "ndims = " ,grid1.ndims ,"\n"
++# print "inqdims =", grid1.inqdims('HE5_HDFE_NENTDIM'),"\n"
+ #-------
+-print "inqdatafields : \n"
+-print "var_names : " , grid1.var_names ,"\n"
++# print "inqdatafields : \n"
++# print "var_names : " , grid1.var_names ,"\n"
+ #-------
+-print "inqattrs : " ,grid1.inqattrs(), "\n"
+-print "nvars() = " ,grid1.nvars() ,"\n"
+-print "var_names = " ,grid1.var_names ,"\n"
++# print "inqattrs : " ,grid1.inqattrs(), "\n"
++# print "nvars() = " ,grid1.nvars() ,"\n"
++# print "var_names = " ,grid1.var_names ,"\n"
+ #-------
+ dname1=grid1.var("AerosolModelMW")
+-print "fieldinfo : \n"
+-p dname1.fieldinfo()
++# print "fieldinfo : \n"
++# p dname1.fieldinfo()
+ grid1.close
+ ############################################################################### OK
+-##### GridField‚ð‚æ‚Þ
++##### GridFieldをよむ
+ ########################################
+ dname1=HE5GdField.open(filename1, gridlist[0],"AerosolModelMW")
+-p "HE5GdField fieldinfo : \n"
+-p dname1.fieldinfo()
++# p "HE5GdField fieldinfo : \n"
++# p dname1.fieldinfo()
+ start= [0,0]
+ edge = [100,300]
+-p dname1.readfield([0,0],[1,1],[100,300],"sint")
++# p dname1.readfield([0,0],[1,1],[100,300],"sint")
+ #-------
+-print "inqlocattrs : \n"
+-p dname1.inqlocattrs()
+-p dname1.get_att("Units")
+-p dname1.get_att("Title")
+-p dname1.get_att("_FillValue")
+-p dname1.get_att("MissingValue")
+-p dname1.get_att("UniqueFieldDefinition")
+-p dname1.grid.inqdatatype(dname1.name,"Title","HE5_HDFE_DATAGROUP")
++# print "inqlocattrs : \n"
++# p dname1.inqlocattrs()
++# p dname1.get_att("Units")
++# p dname1.get_att("Title")
++# p dname1.get_att("_FillValue")
++# p dname1.get_att("MissingValue")
++# p dname1.get_att("UniqueFieldDefinition")
++# p dname1.grid.inqdatatype(dname1.name,"Title","HE5_HDFE_DATAGROUP")
+ dname1.grid.close
+ ############################################################################### OK
+ dname1=HE5GdField.open(filename1, gridlist[0],"Longitude")
+-print "HE5GdField fieldinfo : \n"
+-p dname1.fieldinfo()
++# print "HE5GdField fieldinfo : \n"
++# p dname1.fieldinfo()
+
+ start= [0,0]
+ edge = [20,10]
+
+-p dname1.readfield([0,0],[1,1],[20,10],"sfloat")
+-p dname1.name
+-p dname1.get({"start"=>[3,5]})
++#p dname1.readfield([0,0],[1,1],[20,10],"sfloat")
++#p dname1.name
++#p dname1.get({"start"=>[3,5]})
+
+
+ dname1.grid.close
+@@ -73,7 +73,7 @@ dname1.grid.close
+ ##### he5_gd_setup.c
+ ############################################################################### OK
+ filename1 = "test_gd.he5"
+-print "creating ",filename1,"...\n"
++#print "creating ",filename1,"...\n"
+ file1=HE5.open(filename1,"w")
+
+ uplft = [210584.50041, 322395.95445]
+@@ -109,7 +109,7 @@ file2.close
+ ############################################################################### OK
+ ##### he5_gd_defunlimfld.c he5_sw_definefields.c
+ ############################################################################### OK
+-print "add2 ",filename1,"...\n"
++#print "add2 ",filename1,"...\n"
+ file2=HE5.open(filename1,"a")
+
+ tilerank = 2
+@@ -118,7 +118,7 @@ compparm = [ 8, 0, 0, 0, 0]
+ grid2=file2.grid("UTMGrid")
+ grid2.def_var("Pollution", "sfloat", "Time,YDim,XDim")
+ fillvalue2 = -7.0
+-p grid2.setfillvalue("Pollution","sfloat",fillvalue2)
++#p grid2.setfillvalue("Pollution","sfloat",fillvalue2)
+ grid2.deftile("HE5_HDFE_TILE", tilerank, tiledims)
+ grid2.defcomp("HE5_HDFE_COMP_DEFLATE", compparm)
+ grid2.def_var("Vegetation", "sfloat", "YDim,XDim")
+@@ -130,12 +130,12 @@ grid2.def_var("Pressure", "sfloat", "YDim,XDim")
+ grid2.def_var("Soil Dryness", "sfloat", "YDim,XDim")
+ grid2.def_var("Spectra", "float", "Bands,YDim,XDim")
+ fillvalue2 = -9999.0
+-p grid2.setfillvalue("Pressure","sfloat",fillvalue2)
++#p grid2.setfillvalue("Pressure","sfloat",fillvalue2)
+ grid2.detach()
+ ############################################################################### OK
+-##### he5_gd_writedata.c
++##### he5_gd_writedata.c
+ ############################################################################### OK
+-print "add3 ",filename1,"...\n"
++#print "add3 ",filename1,"...\n"
+ file3=HE5.open(filename1,"a")
+ grid3=file3.grid("UTMGrid")
+ dname1=grid3.var("Vegetation")
+@@ -170,55 +170,55 @@ grid3.close
+ ############################################################################### OK
+ ##### he5_gd_info.c
+ ############################################################################### OK
+-print "info1 ",filename1,"...\n"
++#print "info1 ",filename1,"...\n"
+ file4=HE5.open(filename1,"r")
+ grid41=file4.grid("UTMGrid")
+ grid42=file4.grid("PolarGrid")
+
+-p grid41.inqdims('HE5_HDFE_NENTDIM')
+-p grid42.inqdims('HE5_HDFE_NENTDIM')
+-p grid41.diminfo('Time')
+-p grid42.diminfo('Bands')
+-p grid41.gridinfo()
+-p grid42.gridinfo()
+-p grid41.projinfo()
+-p grid42.projinfo()
+-p grid41.inqfields("HE5_HDFE_NENTDIM")
+-p grid42.inqfields("HE5_HDFE_NENTDIM")
+-p grid41.inqfields("HE5_HDFE_NENTDFLD")
+-p grid42.inqfields("HE5_HDFE_NENTDFLD")
++#p grid41.inqdims('HE5_HDFE_NENTDIM')
++#p grid42.inqdims('HE5_HDFE_NENTDIM')
++#p grid41.diminfo('Time')
++#p grid42.diminfo('Bands')
++#p grid41.gridinfo()
++#p grid42.gridinfo()
++#p grid41.projinfo()
++#p grid42.projinfo()
++#p grid41.inqfields("HE5_HDFE_NENTDIM")
++#p grid42.inqfields("HE5_HDFE_NENTDIM")
++#p grid41.inqfields("HE5_HDFE_NENTDFLD")
++#p grid42.inqfields("HE5_HDFE_NENTDFLD")
+ ############################################################################### OK
+ dname2=grid42.var("Spectra")
+-p dname2.fieldinfo()
++#p dname2.fieldinfo()
+ dname1=grid41.var("Vegetation")
+-p dname1.fieldinfo()
++#p dname1.fieldinfo()
+
+ #p grid41.attrinfo()
+ #p grid41.grpattrinfo()
+ #p dname1.locattrinfo()
+-p grid41.inqattrs()
++#p grid41.inqattrs()
+ #p grid41.inqgrpattrs()
+-p dname1.inqlocattrs()
+-p dname1.tileinfo()
+-p dname1.compinfo()
++#p dname1.inqlocattrs()
++#p dname1.tileinfo()
++#p dname1.compinfo()
+ ############################################################################### ?
+ ##### he5_gd_datainfo.c
+ ############################################################################### ?
+-print "info2 ",filename1,"...\n"
++#print "info2 ",filename1,"...\n"
+ file5=HE5.open(filename1,"r")
+ grid51=file5.grid("UTMGrid")
+ grid52=file5.grid("PolarGrid")
+
+-### datatype ‚ª•¶Žš‰»‚¯‚µ‚Äo‚Ä‚µ‚Ü‚¤I
+-p grid51.inqdatatype("Vegetation","NULL",'HE5_HDFE_DATAGROUP')
+-p grid51.inqdatatype("NULL","GlobalAttribute",'HE5_HDFE_ATTRGROUP')
+-p grid51.inqdatatype("NULL","GroupAttribute",'HE5_HDFE_GRPATTRGROUP')
+-p grid51.inqdatatype("Vegetation","LocalAttribute",'HE5_HDFE_LOCATTRGROUP')
++### datatype ãŒæ–‡å—化ã‘ã—ã¦å‡ºã¦ã—ã¾ã†ï¼
++#p grid51.inqdatatype("Vegetation","NULL",'HE5_HDFE_DATAGROUP')
++#p grid51.inqdatatype("NULL","GlobalAttribute",'HE5_HDFE_ATTRGROUP')
++#p grid51.inqdatatype("NULL","GroupAttribute",'HE5_HDFE_GRPATTRGROUP')
++#p grid51.inqdatatype("Vegetation","LocalAttribute",'HE5_HDFE_LOCATTRGROUP')
+ file5.close
+ ############################################################################### OK
+ ##### he5_gd_readdata.c
+ ############################################################################### OK
+-print "info3 ",filename1,"...\n"
++#print "info3 ",filename1,"...\n"
+ file6=HE5.open(filename1,"r")
+ grid61=file6.grid("UTMGrid")
+ grid62=file6.grid("PolarGrid")
+@@ -226,20 +226,20 @@ dname1=grid61.var("Vegetation")
+
+ start= [0,0]
+ edge = [200,120]
+-p dname1.readfield(start, nil, edge,"sfloat")
+-p grid61.get_att_("GlobalAttribute")
+-p grid61.get_grpatt_("GroupAttribute")
+-p dname1.get_att_("LocalAttribute")
++#p dname1.readfield(start, nil, edge,"sfloat")
++#p grid61.get_att_("GlobalAttribute")
++#p grid61.get_grpatt_("GroupAttribute")
++#p dname1.get_att_("LocalAttribute")
+
+ file6.close
+ ###############################################################################
+-##### he5_gd_subset.c (“r’†‚Ü‚Å)
++##### he5_gd_subset.c (途ä¸ã¾ã§)
+ ###############################################################################
+ #print "add1 ",filename1,"...\n"
+ #file2=HE5.open(filename1,"a")
+ #grid2=file2.grid("PolarGrid")
+-#cornerlon = NArray.float(2)
+-#cornerlat = NArray.float(2)
++#cornerlon = NArray.float(2)
++#cornerlat = NArray.float(2)
+ #cornerlon[0] = 0.0
+ #cornerlon[1] = 90.0
+ #cornerlat[1] = 0.0
+diff --git a/test/test_pt.rb b/test/test_pt.rb
+index 9ff9fdc..a5c311c 100644
+--- a/test/test_pt.rb
++++ b/test/test_pt.rb
+@@ -1,16 +1,17 @@
++# -*- coding: utf-8 -*-
+ require 'numru/hdfeos5'
+ include NumRu
+
+
+ ############################################################################### OK
+-##### MLS ƒf[ƒ^‚ð“Ç‚Ýž‚ñ‚Åì‹Æ‚ª‚Å‚«‚é‚悤‚É‚·‚é
++##### MLS データをèªã¿è¾¼ã‚“ã§ä½œæ¥ãŒã§ãるよã†ã«ã™ã‚‹
+ ############################################################################################
+ # HDF-EOS5 sample program ( HDFEOS5_ug_vol1_may_2004.pdf )
+ ############################################################################### OK
+ # sample 1
+ ############################################################################### OK
+ filename1 = "test/test_pt.he5"
+-print "creating ",filename1,"...\n"
++#print "creating ",filename1,"...\n"
+ file1=HE5.open(filename1,"w")
+ point1=file1.ptcreate("Simple point")
+ point2=file1.ptcreate("FixedBuoy point")
+@@ -23,7 +24,7 @@ file1.close
+ ############################################################################### ok
+ # sample 2
+ ############################################################################### OK
+-print "add2 ",filename1,"...\n"
++#print "add2 ",filename1,"...\n"
+ file2=HE5.open(filename1,"a")
+
+ point4=file2.point("Simple point")
+@@ -94,7 +95,7 @@ file2.close
+ ############################################################################### ok
+ # sample 3
+ ############################################################################### OK
+-print "add3 ",filename1,"...\n"
++#print "add3 ",filename1,"...\n"
+ file3=HE5.open(filename1,"a")
+ point7=file2.point("Simple point")
+ dname1=point7.var("Time")
+@@ -148,13 +149,13 @@ dname1=point8.var("Rainfall")
+ count =[15]
+ time = NArray.sfloat(16)
+ time[] = 0.234
+-dname1.put(time)
++dname1.put(time)
+
+ dname1=point8.var("Temperature")
+ count =[15]
+ time = NArray.sfloat(16)
+ time[] = 233.43
+-dname1.put(time)
++dname1.put(time)
+
+ dname1=point8.var("ID","observations")
+ count =[15]
+@@ -167,7 +168,7 @@ attr1 = [1, 2, 3, 4]
+ point8.writeattr("GlobalAttribute","int",count,attr1)
+
+ count = [8]
+-attr1 = "ABCDEFGH"
++attr1 = "ABCDEFGH"
+ point8.writeattr("GLOBAL_CHAR_ATTR","char",count,attr1)
+ count = [3]
+ attr1 = "abc"
+@@ -188,73 +189,73 @@ file3.close
+ ############################################################################### OK
+ # sample 4
+ ############################################################################### OK
+-print "info1 ",filename1,"...\n"
++#print "info1 ",filename1,"...\n"
+ file4=HE5.open(filename1,"a")
+-p file4.has_swath?()
+-p file4.has_grid?()
+-p file4.has_za?()
+-p file4.has_point?()
++#p file4.has_swath?()
++#p file4.has_grid?()
++#p file4.has_za?()
++#p file4.has_point?()
+
+ point8=file4.point("FixedBuoy point")
+-p point8.getlevelname()
++#p point8.getlevelname()
+ dname1=point8.var("Temperature")
+-p dname1.get_vars_float() # error message is shown but it's normal
++#p dname1.get_vars_float() # error message is shown but it's normal
+ dname1=point8.var("Latitude")
+-p dname1.get_vars_double()
++#p dname1.get_vars_double()
+ dname1=point8.var("DeployDate")
+-p dname1.get_vars_int()
+-p dname1.ntype
+-p dname1.shape
+-p dname1.ndims
+-p dname1.dim_names
+-p dname1.natts
+-p dname1.fieldinfo()
+-p dname1.get
+-p dname1.fwdlink
++#p dname1.get_vars_int()
++#p dname1.ntype
++#p dname1.shape
++#p dname1.ndims
++#p dname1.dim_names
++#p dname1.natts
++#p dname1.fieldinfo()
++#p dname1.get
++#p dname1.fwdlink
+ #p dname1.bcklink
+ point8.detach
+
+ point8=file4.point("FixedBuoy point")
+-p point8.get_att_("GlobalAttribute")
+-p point8.get_grpatt_("GroupAttribute")
+-p point8.nrecs(1)
+-p point8.nfields
+-p point8.nlevels
++#p point8.get_att_("GlobalAttribute")
++#p point8.get_grpatt_("GroupAttribute")
++#p point8.nrecs(1)
++#p point8.nfields
++#p point8.nlevels
+ point8.detach
+ file4.close
+
+ file4=HE5.open(filename1,"r")
+ point9=file4.point("Simple point")
+ dname1=point9.var("Time")
+-p dname1.point
+-p dname1.ntype
+-p dname1.shape
+-p dname1.ndims
+-p dname1.dim_names
+-p dname1.natts
+-p dname1.fieldinfo()
+-p dname1.get # error message is shown but it's normal
+-p dname1.get_vars_double() # error message is shown but it's normal
+-point9.detach
++#p dname1.point
++#p dname1.ntype
++#p dname1.shape
++#p dname1.ndims
++#p dname1.dim_names
++#p dname1.natts
++#p dname1.fieldinfo()
++#p dname1.get # error message is shown but it's normal
++#p dname1.get_vars_double() # error message is shown but it's normal
++point9.detach
+ file4.close
+
+ file4=HE5.open(filename1,"r")
+ point7=file4.point("FixedBuoy point")
+ dname1=point7.var("Latitude")
+-p dname1.point
+-p dname1.ntype
+-p dname1.shape
+-p dname1.ndims
+-p dname1.dim_names
+-p dname1.natts
+-p dname1.fieldinfo()
+-p dname1.get
+-point7.detach
++#p dname1.point
++#p dname1.ntype
++#p dname1.shape
++#p dname1.ndims
++#p dname1.dim_names
++#p dname1.natts
++#p dname1.fieldinfo()
++#p dname1.get
++point7.detach
+ file4.close
+ ############################################################################### OK
+ # sample 5
+ ############################################################################### OK
+-print "info2 ",filename1,"...\n"
++#print "info2 ",filename1,"...\n"
+ file5=HE5.open(filename1,"a")
+ point8=file5.point("FixedBuoy point")
+ dname1=point8.var("Latitude")
+diff --git a/test/test_sw.rb b/test/test_sw.rb
+index 246bd9a..b186ec2 100644
+--- a/test/test_sw.rb
++++ b/test/test_sw.rb
+@@ -1,83 +1,84 @@
++# -*- coding: utf-8 -*-
+ require 'numru/hdfeos5'
+ include NumRu
+
+
+ ############################################################################### OK
+-##### MLS ƒf[ƒ^‚ð“Ç‚Ýž‚ñ‚Åì‹Æ‚ª‚Å‚«‚é‚悤‚É‚·‚é
++##### MLS データをèªã¿è¾¼ã‚“ã§ä½œæ¥ãŒã§ãるよã†ã«ã™ã‚‹
+ ############################################################################### OK
+ filename1 = "test/MLS-Aura_L2GP-O3_v02-21-c01_2007d059.he5"
+-print "reading ",filename1,"...\n"
++#print "reading ",filename1,"...\n"
+ file1=HE5.open(filename1,"r")
+-p file1.has_swath?()
+-p file1.has_grid?()
+-p file1.has_za?()
+-p file1.has_point?()
++#p file1.has_swath?()
++#p file1.has_grid?()
++#p file1.has_za?()
++#p file1.has_point?()
+
+ swathlist=file1.swath_names()
+-p swathlist
+-p swathlist[0]
++#p swathlist
++#p swathlist[0]
+ ########################################
+-##### Swath1‚ð‚æ‚Þ
++##### Swath1をよむ
+ ########################################
+ swath1=file1.swath(swathlist[0])
+ #-------
+-print "inqdims : \n"
++#print "inqdims : \n"
+ swath1.inqdims('HE5_HDFE_NENTDIM')
+ #-------
+-print "inqgeofields : \n"
+-print "geo_names = " ,swath1.geo_names ,"\n"
+-print "ndims() = " ,swath1.ndims() ,"\n"
+-print "dim_names = " ,swath1.dim_names ,"\n"
++#print "inqgeofields : \n"
++#print "geo_names = " ,swath1.geo_names ,"\n"
++#print "ndims() = " ,swath1.ndims() ,"\n"
++#print "dim_names = " ,swath1.dim_names ,"\n"
+ #-------
+-print "inqdatafields : \n"
+-print "var_names = " ,swath1.var_names ,"\n"
++#print "inqdatafields : \n"
++#print "var_names = " ,swath1.var_names ,"\n"
+ swath1.inqdatafields('HE5_HDFE_NENTDFLD')
+ #-------
+-print "inqattrs : \n"
++#print "inqattrs : \n"
+ swath1.inqattrs()
+-print "nvars() = " ,swath1.nvars() ,"\n"
+-print "var_names = " ,swath1.var_names ,"\n"
+-print "vars() = " ,swath1.vars() ,"\n"
+-print "vars([]) = " ,swath1.vars(["L2gpValue","L2gpPrecision"]) ,"\n"
+-print "geos() = " ,swath1.geos() ,"\n"
+-print "geos([]) = " ,swath1.geos(["Latitude"]) ,"\n"
++#print "nvars() = " ,swath1.nvars() ,"\n"
++#print "var_names = " ,swath1.var_names ,"\n"
++#print "vars() = " ,swath1.vars() ,"\n"
++#print "vars([]) = " ,swath1.vars(["L2gpValue","L2gpPrecision"]) ,"\n"
++#print "geos() = " ,swath1.geos() ,"\n"
++#print "geos([]) = " ,swath1.geos(["Latitude"]) ,"\n"
+ gname1=swath1.geo("Time")
+ dname1=swath1.var("L2gpValue")
+ #-------
+-print "fieldinfo : \n"
+-p dname1.fieldinfo()
++#print "fieldinfo : \n"
++#p dname1.fieldinfo()
+ swath1.detach
+ file1.close
+ ############################################################################### OK
+-##### SwathField‚ð‚æ‚Þ
++##### SwathFieldをよむ
+ ########################################
+ dname1=HE5SwField.open(filename1, swathlist[0],"Latitude")
+-print "HE5SwField fieldinfo : \n"
+-p dname1.fieldinfo()
++#print "HE5SwField fieldinfo : \n"
++#p dname1.fieldinfo()
+ start= [0,0]
+ edge = [20,10]
+-p dname1.get_vars_float(start,nil,edge)
++#p dname1.get_vars_float(start,nil,edge)
+ #-------
+-print "inqlocattrs : \n"
+-p dname1.inqlocattrs()
+-p dname1.get_att("Units")
+-p dname1.get_att("Title")
+-p dname1.get_att("_FillValue")
+-p dname1.get_att("Units")
+-p dname1.get_att("MissingValue")
+-p dname1.get_att("UniqueFieldDefinition")
+-p dname1.swath.inqdatatype(dname1.name,"Units","HE5_HDFE_GEOGROUP")
++#print "inqlocattrs : \n"
++#p dname1.inqlocattrs()
++#p dname1.get_att("Units")
++#p dname1.get_att("Title")
++#p dname1.get_att("_FillValue")
++#p dname1.get_att("Units")
++#p dname1.get_att("MissingValue")
++#p dname1.get_att("UniqueFieldDefinition")
++#p dname1.swath.inqdatatype(dname1.name,"Units","HE5_HDFE_GEOGROUP")
+ dname1.swath.detach
+ dname1.swath.file.close
+ ############################################################################### OK
+ dname1=HE5SwField.open(filename1, swathlist[0],"L2gpValue")
+-print "HE5SwField fieldinfo : \n"
++#print "HE5SwField fieldinfo : \n"
+ #p dname1.fieldinfo()
+
+ start= [0,0]
+ edge = [20,10]
+
+-p dname1.name
++#p dname1.name
+
+ dname1.swath.detach
+ dname1.swath.file.close
+@@ -87,7 +88,7 @@ dname1.swath.file.close
+ ##### he5_sw_setup.c
+ ############################################################################### OK
+ filename1 = "test_sw.he5"
+-print "creating ",filename1,"...\n"
++#print "creating ",filename1,"...\n"
+ file1=HE5.open(filename1,"w")
+ swath1=file1.swcreate("Swath1")
+
+@@ -109,27 +110,27 @@ file1.close
+ ############################################################################### ok
+ ##### he5_sw_defunlimfld.c he5_sw_definefields.c
+ ############################################################################### OK
+-print "add1 ",filename1,"...\n"
++#print "add1 ",filename1,"...\n"
+ file2=HE5.open(filename1,"a")
+ swath2=file2.swath("Swath1")
+ swath2.def_geo("Time", "float", "GeoTrack")
+ swath2.def_geo("Longitude", "sfloat", "GeoTrack,GeoXtrack")
+ swath2.def_geo("Latitude", "sfloat", "GeoTrack,GeoXtrack")
+ fillvalue = "charname"
+-p swath2.setfillvalue("Test_string","char",fillvalue)
++#p swath2.setfillvalue("Test_string","char",fillvalue)
+ swath2.def_var("Test_string", "char", "GeoXtrack")
+ swath2.def_var("Density", "sfloat", "GeoTrack")
+ fillvalue2 = -777.0
+-p swath2.setfillvalue("Temperature","sfloat",fillvalue2)
++#p swath2.setfillvalue("Temperature","sfloat",fillvalue2)
+ swath2.def_var("Temperature", "sfloat", "GeoTrack,GeoXtrack")
+ swath2.def_var("Pressure", "float", "Res2tr,Res2xtr")
+
+ RANK = 3
+ chunk_dims=[15,40,20]
+-p swath2.defchunk(RANK,chunk_dims)
++#p swath2.defchunk(RANK,chunk_dims)
+ comp_code = "HE5_HDFE_COMP_NONE"
+ comp_level=[8,0,0,0,0]
+-p swath2.defcomp(comp_code,comp_level)
++#p swath2.defcomp(comp_code,comp_level)
+ swath2.defdatafield("Spectra", "Bands,Res2tr,Res2xtr", "NULL", "sfloat", 0)
+ swath2.defdatafield("Count", "GeoTrack", "NULL", "int", 0);
+
+@@ -137,9 +138,9 @@ swath2.prdefine("Profile-2000", "ProfDim", "NULL", "int")
+ swath2.detach
+ file2.close
+ ############################################################################### ok
+-##### he5_sw_writedata.c
++##### he5_sw_writedata.c
+ ############################################################################### OK
+-print "add3 ",filename1,"...\n"
++#print "add3 ",filename1,"...\n"
+ file3=HE5.open(filename1,"a")
+ swath3=file3.swath("Swath1")
+
+@@ -148,21 +149,21 @@ start= [0,0]
+ edge = [-1,-1]
+
+ tmp = NArray.float(1,20)
+-lat = tmp * NArray.float(10,1)
++lat = tmp * NArray.float(10,1)
+ lng = tmp * NArray.float(10,1)
+
+ lat[] = 1.0
+ lng[] = 5.0
+ dname1=swath3.var("Longitude")
+ dname1.writefield(start,nil, edge, lng,"sfloat")
+-print "dim_names check"
+-p dname1.dim_names
++#print "dim_names check"
++#p dname1.dim_names
+ dname1=swath3.var("Latitude")
+ dname1.writefield(start,nil, edge, lat,"sfloat")
+
+ ttime = NArray.float(20)
+ for i in 0..19
+- ttime[i] = 5.0e7 + 5.0e6 * i
++ ttime[i] = 5.0e7 + 5.0e6 * i
+ end
+
+ tstart = [0]
+@@ -180,7 +181,7 @@ edge = [14,39,19]
+ tmp = NArray.float(1,40,20)
+ spectra = tmp * NArray.float(15,1)
+ spectra[] = 20.0000
+-p "spectra =",spectra
++#p "spectra =",spectra
+ dname1=swath3.var("Spectra")
+ dname1.writefield(start,nil, edge, spectra,"sfloat")
+ ############################################################################### OK
+@@ -189,12 +190,12 @@ attr1 = [1, 2, 3, 4]
+ swath3.writeattr("GlobalAttribute","int",edge,attr1)
+
+ edge[0]=8
+-attr1 = "ABCDEFGH"
++attr1 = "ABCDEFGH"
+ swath3.writeattr("GLOBAL_CHAR_ATTR","char",edge,attr1)
+ edge[0]=3
+ attr1 = "abc"
+ swath3.writeattr("GLOBAL_CHAR_ATTR_11","char",edge,attr1)
+-# Long Œ^‚ւ̑Ήž
++# Long åž‹ã¸ã®å¯¾å¿œ
+ #edge[0]=4
+ #attr1 = [1111111,2222222,3333333,4444444]
+ #swath3.writeattr("GLOBAL_LONG_ATTR","H5T_NATIVE_LONG",edge,attr1)
+@@ -221,7 +222,7 @@ file3.close
+ ############################################################################### OK
+ ##### he5_sw_wrexternaldata.c
+ ############################################################################### OK
+-print "add4 ",filename1,"...\n"
++#print "add4 ",filename1,"...\n"
+ file4=HE5.open(filename1,"a")
+ swath4=file4.swath("Swath1")
+
+@@ -233,42 +234,42 @@ file4.close
+ ############################################################################### OK
+ ##### he5_sw_info.c
+ ############################################################################### OK
+-print "info1 ",filename1,"...\n"
++#print "info1 ",filename1,"...\n"
+ file4=HE5.open(filename1,"r")
+ swath4=file4.swath("Swath1")
+-p swath4.inqdims('HE5_HDFE_NENTDIM')
+-p swath4.inqmaps('HE5_HDFE_NENTMAP')
+-p swath4.inqidxmaps('HE5_HDFE_NENTIMAP')
+-p swath4.inqgeofields('HE5_HDFE_NENTGFLD')
+-p swath4.inqdatafields('HE5_HDFE_NENTDFLD')
+-p swath4.diminfo('GeoTrack')
+-p swath4.mapinfo('GeoTrack',"Res2tr")
+-p swath4.diminfo('IndxTrack')
++#p swath4.inqdims('HE5_HDFE_NENTDIM')
++#p swath4.inqmaps('HE5_HDFE_NENTMAP')
++#p swath4.inqidxmaps('HE5_HDFE_NENTIMAP')
++#p swath4.inqgeofields('HE5_HDFE_NENTGFLD')
++#p swath4.inqdatafields('HE5_HDFE_NENTDFLD')
++#p swath4.diminfo('GeoTrack')
++#p swath4.mapinfo('GeoTrack',"Res2tr")
++#p swath4.diminfo('IndxTrack')
+ dname1=swath4.var("Longitude")
+-p dname1.fieldinfo()
++#p dname1.fieldinfo()
+ dname1=swath4.var("Test_string")
+-p dname1.fieldinfo()
+-p swath4.inqattrs()
++#p dname1.fieldinfo()
++#p swath4.inqattrs()
+ dname1=swath4.var("Spectra")
+-p dname1.inqlocattrs()
+-p dname1.compinfo()
+-p swath4.chunkinfo("Spectra")
++#p dname1.inqlocattrs()
++#p dname1.compinfo()
++#p swath4.chunkinfo("Spectra")
+ swath4.detach
+ file4.close
+ ############################################################################### OK
+ ##### he5_gd_readdata.c
+ ############################################################################### OK
+-print "info3 ",filename1,"...\n"
++#print "info3 ",filename1,"...\n"
+ file6=HE5.open(filename1,"r")
+ swath6=file6.swath("Swath1")
+ dname1=swath6.var("Longitude")
+
+ start= [0,0]
+ edge = [19,9]
+-print "readfield \n"
+-p dname1.readfield(start, nil, edge,"sfloat")
+-p swath6.get_att_("GlobalAttribute")
+-p swath6.get_grpatt_("GroupAttribute")
++#print "readfield \n"
++#p dname1.readfield(start, nil, edge,"sfloat")
++#p swath6.get_att_("GlobalAttribute")
++#p swath6.get_grpatt_("GroupAttribute")
+ swath6.detach
+ file6.close
+ ############################################################################### ok
+diff --git a/test/test_za.rb b/test/test_za.rb
+index 183d5b7..37207cd 100644
+--- a/test/test_za.rb
++++ b/test/test_za.rb
+@@ -1,3 +1,4 @@
++# -*- coding: utf-8 -*-
+ require 'numru/hdfeos5'
+ include NumRu
+
+@@ -8,7 +9,7 @@ include NumRu
+ ##### he5_za_setup.c
+ ############################################################################### OK
+ filename1 = "test/test_za.he5"
+-print "creating ",filename1,"...\n"
++#print "creating ",filename1,"...\n"
+ file1=HE5.open(filename1,"w")
+ za1=file1.zacreate("za1")
+
+@@ -26,7 +27,7 @@ file1.close
+ ############################################################################### ok
+ ##### he5_za_defunlimfld.c he5_za_definefields.c
+ ############################################################################### OK
+-print "add1 ",filename1,"...\n"
++#print "add1 ",filename1,"...\n"
+ file2=HE5.open(filename1,"a")
+ za2=file2.zonal("za1")
+ za2.def_var("Density", "sfloat", "MyTrack1")
+@@ -34,11 +35,11 @@ za2.def_var("Temperature", "sfloat", "MyTrack1,MyTrack2")
+ za2.def_var("Presure", "float", "Res2tr,Res2xtr")
+ za2.def_var("Test_string", "text", "MyTrack2")
+ fillvalue2 = "AAAA"
+-p za2.setfillvalue("Test_string","text",fillvalue2)
++#p za2.setfillvalue("Test_string","text",fillvalue2)
+
+ RANK = 3
+ chunk_dims=[15,40,20]
+-p za2.defchunk(RANK,chunk_dims)
++#p za2.defchunk(RANK,chunk_dims)
+ za2.define("Spectra", "Bands,Res2tr,Res2xtr", "NULL", "sfloat")
+ comp_code = "HDFE_COMP_SZIP_K13orEC"
+ comp_level=[16,0,0,0,0]
+@@ -48,9 +49,9 @@ za2.define("Count", "MyTrack1", "NULL", "int")
+ za2.detach
+ file2.close
+ ############################################################################### ok
+-##### he5_za_writedata.c
++##### he5_za_writedata.c
+ ############################################################################### OK
+-print "add3 ",filename1,"...\n"
++#print "add3 ",filename1,"...\n"
+ file3=HE5.open(filename1,"a")
+ za3=file3.zonal("za1")
+
+@@ -65,7 +66,7 @@ edge = [14,39,19]
+ tmp = NArray.float(1,40,20)
+ spectra = tmp * NArray.float(15,1)
+ spectra[] = 20.0000
+-p "spectra =",spectra
++#p "spectra =",spectra
+ dname1=za3.var("Spectra")
+ dname1.writefield(start,nil, edge, spectra,"sfloat")
+ ############################################################################### OK
+@@ -79,7 +80,7 @@ za3.writeattr("GLOBAL_CHAR_ATTR","char",edge,attr1)
+ edge[0]=3
+ attr1 = "abc"
+ za3.writeattr("GLOBAL_CHAR_ATTR_11","char",edge,attr1)
+-# Long Œ^‚ւ̑Ήž
++# Long åž‹ã¸ã®å¯¾å¿œ
+ #edge[0]=4
+ #attr1 = [1111111,2222222,3333333,4444444]
+ #za3.writeattr("GLOBAL_LONG_ATTR","long",edge,attr1)
+@@ -98,7 +99,7 @@ file3.close
+ ############################################################################### OK
+ ##### he5_za_wrexternaldata.c
+ ############################################################################### OK
+-print "add4 ",filename1,"...\n"
++#print "add4 ",filename1,"...\n"
+ file4=HE5.open(filename1,"a")
+ za4=file4.zonal("za1")
+
+@@ -110,47 +111,47 @@ file4.close
+ ############################################################################### OK
+ ##### he5_za_info.c
+ ############################################################################### OK
+-print "info1 ",filename1,"...\n"
++#print "info1 ",filename1,"...\n"
+ file4=HE5.open(filename1,"r")
+ za4=file4.zonal("za1")
+-p za4.inqdims('HE5_HDFE_NENTDIM')
+-p za4.inquire('HE5_HDFE_NENTDFLD')
+-p za4.diminfo('MyTrack1')
+-p za4.inqattrs()
+-p za4.inqgrpattrs()
++#p za4.inqdims('HE5_HDFE_NENTDIM')
++#p za4.inquire('HE5_HDFE_NENTDFLD')
++#p za4.diminfo('MyTrack1')
++#p za4.inqattrs()
++#p za4.inqgrpattrs()
+ dname1=za4.var("Density")
+-p dname1.inqlocattrs()
+-p dname1.compinfo()
+-p dname1.dim_names
+-p dname1.att_names
+-p dname1.ntype
+-p dname1.shape
+-p za4.chunkinfo("Spectra")
++#p dname1.inqlocattrs()
++#p dname1.compinfo()
++#p dname1.dim_names
++#p dname1.att_names
++#p dname1.ntype
++#p dname1.shape
++#p za4.chunkinfo("Spectra")
+ #-------
+-print "ndims() = " ,za4.ndims() ,"\n"
+-print "dim_names = " ,za4.dim_names ,"\n"
++#print "ndims() = " ,za4.ndims() ,"\n"
++#print "dim_names = " ,za4.dim_names ,"\n"
+ #-------
+-print "inqattrs =" , za4.inqattrs() ,"\n"
+-print "nvars() = " ,za4.nvars() ,"\n"
+-print "var_names = " ,za4.var_names ,"\n"
+-print "vars() = " ,za4.vars() ,"\n"
++#print "inqattrs =" , za4.inqattrs() ,"\n"
++#print "nvars() = " ,za4.nvars() ,"\n"
++#print "var_names = " ,za4.var_names ,"\n"
++#print "vars() = " ,za4.vars() ,"\n"
+ za4.detach
+ file4.close
+ ############################################################################### OK
+ ##### he5_gd_readdata.c
+ ############################################################################### OK
+-print "info3 ",filename1,"...\n"
++#print "info3 ",filename1,"...\n"
+ file6=HE5.open(filename1,"r")
+ za6=file6.zonal("za1")
+ dname1=za6.var("Spectra")
+
+ start= [0,0,0]
+ edge = [14,39,19]
+-p dname1.readfield(start, nil, edge,"sfloat")
+-p za6.get_att_("GlobalAttribute")
+-p za6.get_grpatt_("GroupAttribute")
++#p dname1.readfield(start, nil, edge,"sfloat")
++#p za6.get_att_("GlobalAttribute")
++#p za6.get_grpatt_("GroupAttribute")
+ dname1=za6.var("Density")
+-p dname1.get_att_("LocalAttribute_1")
++#p dname1.get_att_("LocalAttribute_1")
+
+ file6.close
+ ############################################################################### ok
diff --git a/debian/patches/series b/debian/patches/series
index 105a54e..6c5aa0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-FixLibraryPath
-FixTestPath
+0001-Fix-NArray-Library-Path.patch
+0002-Fix-test-data-path.patch
+0003-Fix-printf-debugging.patch
--
Ruby interface of HDF-EOS5 library
More information about the Pkg-grass-devel
mailing list