cdo 1.0.1 → 1.0.2

data/ChangeLog

@@ -0,0 +1,3 @@
+1.0.0 2011-12-14: initial version 
+1.0.1 2011-12-15: bugix release
+1.0.2 2012-01-11: return NetCDF/NArray (optional)

data/README.rdoc

@@ -59,6 +59,6 @@ Cdo.rb makes use of the GPLv2D License, see COPYING
 
 Author::   Ralf Mueller <stark.dreamdetective@gmail.com>
 Requires:: CDO version 1.5.x
-License::  Copyright 2011 by Ralf Mueller
+License::  Copyright 2011-2012 by Ralf Mueller
            Released under GPLv2 license.  See the COPYING
            file included in the distribution.

data/gemspec

@@ -2,9 +2,9 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdo"
-  s.version           = '1.0.1'
+  s.version           = '1.0.2'
   s.platform          = Gem::Platform::RUBY
-  s.files             = ["lib/cdo.rb"] + ["gemspec","COPYING","README.rdoc"]
+  s.files             = ["lib/cdo.rb"] + ["gemspec","COPYING","README.rdoc","ChangeLog"]
   s.test_file         = "test/test_cdo.rb"
   s.description       = "Easy access to the Climate Data operators"
   s.summary           = "Easy access to the Climate Data operators"

data/lib/cdo.rb

@@ -1,9 +1,24 @@
 require 'pp'
 
+# Copyright (C) 2011-2012 Ralf Mueller, ralf.mueller@zmaw.de
+# See COPYING file for copying and redistribution conditions.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
 # ==============================================================================
 # CDO calling mechnism
 module Cdo
-  State = {}
+  State = {
+    :debug => false,
+    :returnArray => false
+  }
   @@CDO = ENV['CDO'].nil? ? '/usr/bin/cdo' : ENV['CDO']
 
   # Only operators with documentation are accessible vie the build-in help.
@@ -11,12 +26,60 @@ module Cdo
   @@undocumentedOperators = %w[geopotheight pressure_fl pressure_hl]
   @@addOperators          = %w[boundaryLevels thicknessOfLevels]
 
+  private
+  def Cdo.call(cmd)
+    if (State[:debug])
+      puts '# DEBUG ====================================================================='
+      puts cmd
+      puts '# DEBUG ====================================================================='
+      puts IO.popen(cmd).read
+    else
+      system(cmd + ' 1>/dev/null 2>&1 ')
+    end
+  end
+  def Cdo.run(cmd,ofile=nil,options='',returnArray=false)
+    cmd = "#{@@CDO} -O #{options} #{cmd} "
+    case ofile
+    when $stdout
+      cmd << " 2>/dev/null"
+      return IO.popen(cmd).readlines.map {|l| l.chomp.strip}
+    when nil
+      ofile = Tempfile.new("Cdo.rb").path
+    end
+    cmd << "#{ofile}"
+    call(cmd)
+    if State[:returnArray] or returnArray
+      return NetCDF.open(ofile)
+    else
+      return ofile
+    end
+  end
+
+  public
   def Cdo.Debug=(value)
     State[:debug] = value
   end
   def Cdo.Debug
     State[:debug]
   end
+  def Cdo.returnArray=(value)
+    if value
+      begin
+        require "numru/netcdf"
+        include NumRu
+        State[:returnArray] = true
+
+      rescue LoadError
+        warn "Could not load ruby's netcdf bindings. Please install it."
+        raise
+      end
+    else
+      State[:returnArray] = value
+    end
+  end
+  def Cdo.returnArray
+    State[:returnArray]
+  end
 
   # test if @@CDO can be used
   def Cdo.checkCdo
@@ -28,13 +91,11 @@ module Cdo
       puts IO.popen(@@CDO + " -V").readlines
     end
   end
-
   def Cdo.setCdo(cdo)
     puts "Will use #{cdo} instead of #@@CDO" if Cdo.Debug
     @@CDO = cdo
   end
 
-
   def Cdo.getOperators
     cmd       = @@CDO + ' 2>&1'
     help      = IO.popen(cmd).readlines.map {|l| l.chomp.lstrip}
@@ -46,29 +107,6 @@ module Cdo
       help[help.index("Operators:")+1].split
     end
   end
-  def Cdo.call(cmd)
-    if (State[:debug])
-      puts '# DEBUG ====================================================================='
-      puts cmd
-      puts '# DEBUG ====================================================================='
-      puts IO.popen(cmd).read
-    else
-      system(cmd + ' 1>/dev/null 2>&1 ')
-    end
-  end
-  def Cdo.run(cmd,ofile=nil,options='')
-    cmd = "#{@@CDO} -O #{options} #{cmd} "
-    case ofile
-    when $stdout
-      cmd << " 2>/dev/null"
-      return IO.popen(cmd).readlines.map {|l| l.chomp.strip}
-    when nil
-      ofile = Tempfile.new("Cdo.rb").path
-    end
-    cmd << "#{ofile}"
-    call(cmd)
-    return ofile
-  end
 
   # Call an operator chain without checking opeartors
   def Cdo.chainCall(chain,*args)
@@ -87,8 +125,29 @@ module Cdo
     end
   end
 
+  def Cdo.method_missing(sym, *args, &block)
+    # args is expected to look like [opt1,...,optN,:in => iStream,:out => oStream] where
+    # iStream could be another CDO call (timmax(selname(Temp,U,V,ifile.nc))
+    puts "Operator #{sym.to_s} is called" if State[:debug]
+    if getOperators.include?(sym.to_s) or @@undocumentedOperators.include?(sym.to_s)
+      io = args.find {|a| a.class == Hash}
+      args.delete_if {|a| a.class == Hash}
+      if /(diff|info|show|griddes)/.match(sym)
+        run(" -#{sym.to_s} #{io[:in]} ",$stdout)
+      else
+        opts = args.empty? ? '' : ',' + args.reject {|a| a.class == Hash}.join(',')
+        run(" -#{sym.to_s}#{opts} #{io[:in]} ",io[:out],io[:options],io[:returnArray])
+      end
+    else
+      warn "Operator #{sym.to_s} not found"
+    end
+  end
+
+  #==================================================================
+  # Addional operotors:
+  #------------------------------------------------------------------
   def Cdo.boundaryLevels(args)
-    ilevels         = Cdo.showlevel(:in => args[:in]).map(&:to_f)
+    ilevels         = Cdo.showlevel(:in => args[:in])[0].split.map(&:to_f)
     bound_levels    = Array.new(ilevels.size+1)
     bound_levels[0] = 0
     (1..ilevels.size).each {|i| 
@@ -106,25 +165,9 @@ module Cdo
     }
     delta_levels
   end
-
-  def Cdo.method_missing(sym, *args, &block)
-    # args is expected to look like [opt1,...,optN,:in => iStream,:out => oStream] where
-    # iStream could be another CDO call (timmax(selname(Temp,U,V,ifile.nc))
-    puts "Operator #{sym.to_s} is called" if State[:debug]
-    if getOperators.include?(sym.to_s) or @@undocumentedOperators.include?(sym.to_s)
-      io = args.find {|a| a.class == Hash}
-      args.delete_if {|a| a.class == Hash}
-      if /(info|show|griddes)/.match(sym)
-        run(" -#{sym.to_s} #{io[:in]} ",$stdout)
-      else
-        opts = args.empty? ? '' : ',' + args.reject {|a| a.class == Hash}.join(',')
-        run(" -#{sym.to_s}#{opts} #{io[:in]} ",io[:out],io[:options])
-      end
-    else
-      warn "Operator #{sym.to_s} not found"
-    end
-  end
 end
+
+# Helper module for easy temp file handling
 module MyTempfile
   require 'tempfile'
   @@_tempfiles           = []

data/test/test_cdo.rb

@@ -1,8 +1,9 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'test/unit'
 require 'cdo'
+require 'pp'
 
-class TestJobQueue < Test::Unit::TestCase
+class TestCdo < Test::Unit::TestCase
 
   DEFAULT_CDO_PATH = '/usr/bin/cdo'
   def setup
@@ -40,6 +41,20 @@ class TestJobQueue < Test::Unit::TestCase
     assert_equal("File format: GRIB",info[0])
 
   end
+  def test_args
+    #Cdo.Debug = true
+    #MyTempfile.setPersist(true)
+    ofile0 = MyTempfile.path
+    ofile1 = MyTempfile.path
+    ofile2 = MyTempfile.path
+    ofile3 = MyTempfile.path
+    Cdo.stdatm(0,20,40,80,200,230,400,600,1100,:out => ofile0)
+    Cdo.intlevel(0,10,50,100,500,1000,  :in => ofile0,:out => ofile1)
+    Cdo.intlevel([0,10,50,100,500,1000],:in => ofile0,:out => ofile2)
+    Cdo.sub(:in => [ofile1,ofile2].join(' '),:out => ofile3)
+    info = Cdo.infon(:in => ofile3)
+    (1...info.size).each {|i| assert_equal(0.0,info[i].split[-1].to_f)}
+  end
   def test_operator_options
     ofile = MyTempfile.path
     targetLevels = [0,10,50,100,200,400,1000]
@@ -61,6 +76,51 @@ class TestJobQueue < Test::Unit::TestCase
     Cdo.chainCall("-setname,veloc -copy",:in => "-random,r1x1",:out => ofile,:options => "-f nc")
     assert_equal(["veloc"],Cdo.showname(:in => ofile))
   end
+
+  def test_diff
+    diffv = Cdo.diffn(:in => "-random,r1x1 -random,r1x1")
+    assert_equal(diffv[1].split(' ')[4],"random")
+    assert_equal(diffv[1].split(' ')[-1],"0.53060")
+    diff  = Cdo.diff(:in => "-random,r1x1 -random,r1x1")
+    assert_equal(diff[1].split(' ')[-1],"0.53060")
+  end
+
+  def test_bndLevels
+    ofile = MyTempfile.path
+    Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:out => ofile,:options => "-f nc")
+    assert_equal([0, 50.0, 150.0, 350.0, 650.0, 1100.0, 1700.0, 2500.0, 3500.0, 4500.0, 5500.0],
+                 Cdo.boundaryLevels(:in => "-selname,T #{ofile}"))
+    assert_equal([50.0, 100.0, 200.0, 300.0, 450.0, 600.0, 800.0, 1000.0, 1000.0, 1000.0],
+                 Cdo.thicknessOfLevels(:in => ofile))
+  end
+
+  def test_returnArray
+    ofile = MyTempfile.path
+    vals = Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:out => ofile,:options => "-f nc")
+    assert_equal(ofile,vals)
+    Cdo.returnArray = true
+    vals = Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:out => ofile,:options => "-f nc")
+    assert_equal(["lon","lat","level","P","T"],vals.var_names)
+    assert_equal(276,vals.var("T").get.flatten.mean.floor)
+    Cdo.returnArray = false
+  end
+  def test_combine
+    ofile0, ofile1 = MyTempfile.path, MyTempfile.path
+    Cdo.fldsum(:in => Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:options => "-f nc"),:out => ofile0)
+    ofile1 = Cdo.fldsum(:in => "-stdatm,25,100,250,500,875,1400,2100,3000,4000,5000",:options => "-f nc")
+    Cdo.returnArray = true
+    diff = Cdo.sub(:in => [ofile0,ofile1].join(' '),:out => MyTempfile.path).var('T').get
+    assert_equal(0.0,diff.min)
+    assert_equal(0.0,diff.max)
+    Cdo.returnArray = false
+  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)
+    test_returnArray
+  end
 end
 
 #  # Calling simple operators

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2012-01-11 00:00:00.000000000 Z
 dependencies: []
 description: Easy access to the Climate Data operators
 email: stark.dreamdetective@gmail.com
@@ -23,6 +23,7 @@ files:
 - gemspec
 - COPYING
 - README.rdoc
+- ChangeLog
 - test/test_cdo.rb
 homepage: http://code.zmaw.de/projects/cdo
 licenses: