Add Cdo.readCDF operator with Tests

contrib/python/cdo.py

@@ -175,6 +175,14 @@ class Cdo(object):
 
       return delta_levels
 
+    def readCdf(self,iFile):
+      if not self.returnArray:
+        self.loadCdf()
+
+      return self.cdf(iFile)
+
+
+
 # Helper module for easy temp file handling
 class MyTempfile(object):
   def __init__(self):

contrib/python/setup.py

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

contrib/python/test/test_cdo.py

@@ -137,6 +137,12 @@ class CdoTest(unittest.TestCase):
             thicknesses = cdo.thicknessOfLevels(input = ifile)
             self.assertEqual(targetThicknesses,thicknesses)
 
+        def test_readCdf(self):
+            input= "-settunits,days  -setyear,2000 -for,1,4"
+            cdfFile = cdo.copy(options="-f nc",input=input)
+            cdf     = cdo.readCdf(cdfFile)
+            self.assertEqual(['lat','lon','for','time'],cdf.variables().keys())
+
 if __name__ == '__main__':
     unittest.main()
 

contrib/ruby/gemspec

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

contrib/ruby/lib/cdo.rb

@@ -175,6 +175,11 @@ module Cdo
     }
     delta_levels
   end
+
+  def Cdo.readCdf(iFile)
+    Cdo.loadCdf unless State[:returnArray] 
+    return NetCDF.open(iFile)
+  end
 end
 
 # Helper module for easy temp file handling

contrib/ruby/test/test_cdo.rb

@@ -147,6 +147,12 @@ class TestCdo < Test::Unit::TestCase
       thicknesses = Cdo.thicknessOfLevels(:in => ifile)
       assert_equal(targetThicknesses,thicknesses)
     end
+    def test_readCdf
+      input = "-settunits,days  -setyear,2000 -for,1,4"
+      cdfFile = Cdo.copy(:options =>"-f nc",:in=>input)
+      cdf     = Cdo.readCdf(cdfFile)
+      assert_equal(['lon','lat','time','for'],cdf.var_names)
+    end
   end
 
 end