cdo.{rb,py} release 1.0.4

contrib/python/cdo.py

@@ -134,7 +134,6 @@ class Cdo(object):
     def loadCdf(self):
       try:
         import pycdf as cdf
-        self.returnArray = True
         self.cdf         = cdf.CDF
       except ImportError:
         raise ImportError,"Module pycdf is required to return numpy arrays."

contrib/python/setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 setup (name   = 'cdo',
-  version     = '1.0.3',
+  version     = '1.0.4',
   author      = "Ralf Mueller",
   author_email= "stark.dreamdetective@gmail.com",
   license     = "GPLv2",

contrib/python/test/test_cdo.py

@@ -75,6 +75,13 @@ class CdoTest(unittest.TestCase):
         self.assertEqual(diff[1].split(' ')[-1],"0.53060")
 
     def test_returnArray(self):
+        ofile = MyTempfile().path()
+        press = cdo.stdatm("0",output=ofile,options="-f nc")
+        self.assertEqual(ofile,press)
+        press = cdo.stdatm("0",options="-f nc",returnArray=True).var("P").get()
+        self.assertEqual(1013.25,press.min())
+        press = cdo.stdatm("0",output=ofile,options="-f nc")
+        self.assertEqual(ofile,press)
         cdo.setReturnArray()
         outfile = 'test.nc'
         press = cdo.stdatm("0",output=outfile,options="-f nc").var("P").get()
@@ -86,6 +93,8 @@ class CdoTest(unittest.TestCase):
         self.assertEqual(1013.25,press.min())
         print("press = "+press.min().__str__())
         cdo.unsetReturnArray()
+        press = cdo.stdatm("0",output=ofile,options="-f nc")
+        self.assertEqual(ofile,press)
 
 
     def test_combine(self):

contrib/ruby/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdo"
-  s.version           = '1.0.3'
+  s.version           = '1.0.4'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdo.rb"] + ["gemspec","COPYING","README.rdoc","ChangeLog"]
   s.test_file         = "test/test_cdo.rb"

contrib/ruby/test/test_cdo.rb

@@ -116,13 +116,18 @@ class TestCdo < Test::Unit::TestCase
     assert_equal(["lon","lat","level","P","T"],vals.var_names)
     assert_equal(276,vals.var("T").get.flatten.mean.floor)
     Cdo.unsetReturnArray
+    vals = Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:out => ofile,:options => "-f nc")
+    assert_equal(ofile,vals)
   end
   def test_simple_returnArray
     ofile0, ofile1 = MyTempfile.path, MyTempfile.path
     sum = Cdo.fldsum(:in => Cdo.stdatm(0,:options => "-f nc"),
                :returnArray => true).var("P").get
     assert_equal(1013.25,sum.min)
+    sum = Cdo.fldsum(:in => Cdo.stdatm(0,:options => "-f nc"),:out => ofile0)
+    assert_equal(ofile0,sum)
     test_returnArray
+
   end
 
   def test_thickness