cdo 1.2.0 → 1.2.1

data/gemspec

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdo"
-  s.version           = '1.2.0'
+  s.version           = '1.2.1'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdo.rb"] + ["gemspec","COPYING","README.rdoc","ChangeLog"]
   s.test_file         = "test/test_cdo.rb"

data/lib/cdo.rb

@@ -17,7 +17,7 @@ require 'open3'
 # CDO calling mechnism
 module Cdo
 
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 
   State = {
     :debug       => false,
@@ -73,39 +73,63 @@ module Cdo
                         else
                           help[(help.index("Operators:")+1)..help.index(help.find {|v| v =~ /CDO version/}) - 2].join(' ').split
                         end
+  end
 
-    
+  def Cdo.hasError(cmd,retvals)
+    if (State[:debug])
+      puts("RETURNCODE: #{retvals[:returncode]}")
+    end
+    if ( 0 != retvals[:returncode] )
+      puts("Error in calling:")
+      puts(">>> "+cmd+"<<<")
+      puts(retvals[:stderr])
+      return true
+    else
+      return false
+    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
+    stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
+
+    {
+      :stdout => stdout.read,
+      :stderr => stderr.read,
+      :returncode => wait_thr.value.exitstatus
+    }
   end
-  def Cdo.run(cmd,ofile='',options='',returnCdf=false,force=nil,returnArray=nil)
+  def Cdo.run(cmd,ofile='',options='',returnCdf=false,force=nil,returnArray=nil,returnMaArray=nil)
     cmd = "#{@@CDO} -O #{options} #{cmd} "
     case ofile
     when $stdout
-      stdin, stdout, stderr, status =  Open3.popen3(cmd)
-      retval = stdout.read.split($/).map {|l| l.chomp.strip}
-      pp stderr.read
-      return retval
+      retvals = Cdo.call(cmd)
+      unless hasError(cmd,retvals)
+        return retvals[:stdout].split($/).map {|l| l.chomp.strip}
+      else
+        raise ArgumentError,"CDO did NOT run successfully!"
+      end
     else
       force = State[:forceOutput] if force.nil?
       if force or not File.exists?(ofile.to_s)
         ofile = MyTempfile.path if ofile.nil?
         cmd << "#{ofile}"
-        call(cmd)
+        retvals = call(cmd)
+        if hasError(cmd,retvals)
+          raise ArgumentError,"CDO did NOT run successfully!"
+        end
       else
         warn "Use existing file '#{ofile}'" if Cdo.debug
       end
     end
     if not returnArray.nil?
       Cdo.readArray(ofile,returnArray)
+    elsif not returnMaArray.nil?
+      Cdo.readMaArray(ofile,returnMaArray)
     elsif returnCdf or State[:returnCdf]
       Cdo.readCdf(ofile)
     else
@@ -130,15 +154,15 @@ module Cdo
       if @@outputOperatorsPattern.match(sym)
         run(" -#{sym.to_s}#{opts} #{io[:input]} ",$stdout)
       else
-        run(" -#{sym.to_s}#{opts} #{io[:input]} ",io[:output],io[:options],io[:returnCdf],io[:force],io[:returnArray])
+        run(" -#{sym.to_s}#{opts} #{io[:input]} ",io[:output],io[:options],io[:returnCdf],io[:force],io[:returnArray],io[:returnMaArray])
       end
     else
-      warn "Operator #{sym.to_s} not found"
+      raise ArgumentError,"Operator #{sym.to_s} not found"
     end
   end
   def Cdo.loadCdf
     begin
-      require "numru/netcdf"
+      require "numru/netcdf_miss"
       include NumRu
     rescue LoadError
       warn "Could not load ruby's netcdf bindings. Please install it."
@@ -244,16 +268,30 @@ module Cdo
       # return the data array
       filehandle.var(varname).get
     else
-      warn "Cannot find variable '#{varname}'"
-      raise ArgumentError
+      raise ArgumentError, "Cannot find variable '#{varname}'"
     end
   end
 
-  def Cdo.selindexlist(args)
-    
+  def Cdo.readMaArray(iFile,varname)
+    filehandle = Cdo.readCdf(iFile)
+    if filehandle.var_names.include?(varname)
+      # return the data array
+      filehandle.var(varname).get_with_miss
+    else
+      raise ArgumentError,"Cannot find variable '#{varname}'"
+    end
   end
-
-  def Cdo.plot(args)
+  def Cdo.help(operator=nil)
+    if operator.nil?
+      puts Cdo.call([@@CDO,'-h'].join(' '))[:stderr]
+    else
+      operator = operator.to_s unless String == operator.class
+      if Cdo.operators.include?(operator)
+        puts Cdo.call([@@CDO,'-h',operator].join(' '))[:stdout]
+      else
+        puts "Unknown operator #{operator}"
+      end
+    end
   end
 end
 

data/test/test_cdo.rb

@@ -232,7 +232,55 @@ class TestCdo < Test::Unit::TestCase
     pressure = Cdo.stdatm(0,1000,:options => '-f nc -b F64',:returnArray => 'P')
     assert_equal("1013.25 898.543456035875",pressure.flatten.to_a.join(' '))
   end
+  def test_returnMaArray
+    Cdo.debug = true
+    topo = Cdo.topo(:options => '-f nc',:returnMaArray => 'topo')
+    assert_equal(-1890.0,topo.mean.round)
+    bathy = Cdo.setrtomiss(0,10000,
+        :input => Cdo.topo(:options => '-f nc'),:returnMaArray => 'topo')
+    assert_equal(-3386.0,bathy.mean.round)
+    oro = Cdo.setrtomiss(-10000,0,
+        :input => Cdo.topo(:options => '-f nc'),:returnMaArray => 'topo')
+    assert_equal(1142.0,oro.mean.round)
+    bathy = Cdo.remapnn('r2x2',:input => Cdo.topo(:options => '-f nc'), :returnMaArray => 'topo')
+    assert_equal(-4298.0,bathy[0,0])
+    assert_equal(-2669.0,bathy[1,0])
+    ta = Cdo.remapnn('r2x2',:input => Cdo.topo(:options => '-f nc'))
+    tb = Cdo.subc(-2669.0,:input => ta)
+    withMask = Cdo.div(:input => ta+" "+tb,:returnMaArray => 'topo')
+    assert(-8.0e+33 > withMask[1,0])
+    assert(0 < withMask[0,0])
+    assert(0 < withMask[0,1])
+    assert(0 < withMask[1,1])
+  end
 
+  def test_errorException
+    Cdo.debug = true
+    # stdout operators get get wrong input
+    assert_raise ArgumentError do
+      Cdo.showname(:input => '-for,d')
+    end
+    # non-existing operator
+    assert_raise ArgumentError do
+      Cdo.neverDefinedOperator()
+    end
+    # standard opertor get mis-spelled value
+    assert_raise ArgumentError do
+      Cdo.remapnn('r-10x10')
+    end
+    # standard operator get unexisting operator as input stream
+    assert_raise ArgumentError do
+      Cdo.remapnn('r10x10',:input => '-99topo')
+    end
+    # missing input stream
+    assert_raise ArgumentError do
+      Cdo.setname('setname')
+    end
+    # missing input stream for stdout-operator
+    assert_raise ArgumentError do
+      Cdo.showname
+    end
+  end
 
   if 'thingol' == `hostname`.chomp  then
     def test_readCdf
@@ -248,6 +296,16 @@ class TestCdo < Test::Unit::TestCase
       ifile = '/home/ram/data/examples/EH5_AMIP_1_TSURF_1991-1995.nc'
       assert_equal([192, 96, 10],Cdo.readArray(Cdo.seltimestep('1/10',:input => ifile), 'tsurf').shape)
     end
+    def test_doc
+      Cdo.debug = true
+      Cdo.help(:remap)
+      Cdo.help(:infov)
+      Cdo.help(:topo)
+      Cdo.help(:notDefinedOP)
+      Cdo.help
+    end
+
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies: []
 description: Easy access to the Climate Data operators
 email: stark.dreamdetective@gmail.com