cdp 0.0.6 → 0.0.7

data/gemspec

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdp"
-  s.version           = '0.0.6'
+  s.version           = '0.0.7'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdp.rb"] + ["gemspec"]
   s.test_file         = "test/test_cdp.rb"

data/lib/cdp.rb

@@ -35,7 +35,6 @@ module Cdp
 
   # compute the experiments from the data directories and link the corresponding files
   def Cdp.splitFilesIntoExperiments(files,exp='exp')
-    gridFile = files.pop
     experiments = files.map {|f| File.basename(File.dirname(f))}.uniq.sort_by {|f| f.length}.reverse
     # take the larges part of the filenames as experiment name if the files are in
     # the current directory
@@ -60,7 +59,7 @@ module Cdp
       experimentAnalyzedData[experiment] = []
     }
 
-    [gridFile,experimentFiles,experimentAnalyzedData]
+    [experimentFiles,experimentAnalyzedData]
   end
 
   # compute area weights from an area variable
@@ -94,142 +93,4 @@ module Cdp
       end
     end
   end
-
-  # split data file with global grid into 2 separate files with northern and
-  # southern hemisphere grid
-  # TODO: currently ICON cell variable are supported only
-  def Cdp.splitHemisphere(iFilename,varname,lon,lat,dim='2d')
-    iFile  = NetCDF.open(iFilename)
-    unless iFile.var_names.include?(varname)
-      warn "Could not find #{varname} in #{iFilename}"
-      raise IOError
-    end
-    lats      = iFile.var(lat).get
-    var       = iFile.var(varname)
-    varDims   = var.dim_names
-    varValues = var.get_with_miss
-    splittedDim = varDims[0]
-
-    # compute location indices and corresponding values
-    nhIndeces = (lats>0.0).where
-    shIndeces = (lats<0.0).where
-
-    case varValues.shape.size 
-    when 3 
-      varValuesNH = varValues[nhIndeces,true,true]
-      varValuesSH = varValues[shIndeces,true,true]
-    when 2
-      varValuesNH = varValues[nhIndeces,true]
-      varValuesSH = varValues[shIndeces,true]
-    when 1
-      varValuesNH = varValues[nhIndeces]
-      varValuesSH = varValues[shIndeces]
-    end
-
-    # create output
-    iBaseFilename = File.basename(iFilename)
-    nhFile,shFile = "nh_#{iBaseFilename}","sh_#{iBaseFilename}"
-    [nhFile,shFile].each_with_index {|file,i|
-      puts "Creating '#{file}' ...."
-      indeces = [nhIndeces,shIndeces][i]
-      oFile   = NetCDF.create(file)
-
-      # create data definitions
-      iFile.each_dim {|dim| 
-        pp dim.name
-        if splittedDim == dim.name
-          oFile.def_dim(dim.name,indeces.size)
-        else
-          oFile.def_dim(dim.name,dim.length)
-        end
-      }
-
-      #  copy attributes
-      iFile.each_var {|var|
-        next unless ([varname] + varDims + [lon,lat] + [lon,lat].map {|c| c+"_vertices"}).flatten.include?(var.name)
-        newvar = oFile.def_var( var.name, var.ntype, var.dim_names )
-        var.each_att{|att| newvar.put_att( att.name, att.get )}
-      }
-      oFile.enddef
-      iFile.each_var {|var| 
-        next unless ([varname] + varDims + [lon,lat] + [lon,lat].map {|c| c+"_vertices"}).flatten.include?(var.name)
-        case var.name 
-        when varname
-          case varDims.size
-          when 3
-            oFile.var(var.name).put(var.get[indeces,true,true])
-          when 2
-            oFile.var(var.name).put(var.get[indeces,true])
-          end
-        when 'p_ice_concSum'
-          oFile.var(var.name).put(var.get[indeces,true])
-        when 'cell_area'
-          oFile.var(var.name).put(var.get[indeces])
-        when lon,lat
-          oFile.var(var.name).put(var.get[indeces])
-        when lon+'_vertices',lat+'_vertices'
-          oFile.var(var.name).put(var.get[true,indeces])
-        else
-          oFile.var(var.name).put(var.get)
-        end
-      }
-      oFile.close
-    }
-
-    [nhFile,shFile]
-  end
-  def Cdp.splitICONHemisphere(iFilename,varname,lon,lat)
-    iFile     = NetCDF.open(iFilename)
-    lats      = iFile.var(lat).get
-    iceValues = iFile.var(varname).get_with_miss
-
-    # compute location indices and corresponding values
-    nhIndeces   = (lats>0.0).where
-    shIndeces   = (lats<0.0).where
-    iceValuesNH = iceValues[nhIndeces,true,1..-1]
-    iceValuesSH = iceValues[shIndeces,true,1..-1]
-
-
-    # create output
-    nhFile,shFile = "nh_#{iFilename}","sh_#{iFilename}"
-    [nhFile,shFile].each_with_index {|file,i|
-      puts "Creating '#{file}' ...."
-      indeces = [nhIndeces,shIndeces][i]
-      f = NetCDF.create(file)
-      iFile.each_dim {|dim| 
-        next if ['clon','clat','ncells'].include?(dim.name) or 
-        f.def_dim(dim.name,dim.length)
-      }
-      ["clon","clat","ncells"].each {|hdim| 
-        f.def_dim(hdim,indeces.size)
-      }
-
-      iFile.each_var{|var|
-        a      = {var.name => var.dim_names}
-        newvar = f.def_var( var.name, var.ntype, var.dim_names )
-        var.each_att{|att| newvar.put_att( att.name, att.get )}
-      }
-      f.enddef
-      iFile.each_var{|var| 
-        #puts var.name
-        case var.name 
-        when varname
-          f.var(var.name).put(var.get[indeces,true,true])
-        when 'p_ice_concSum'
-          f.var(var.name).put(var.get[indeces,true])
-        when 'cell_area'
-          f.var(var.name).put(var.get[indeces])
-        when lon,lat
-          f.var(var.name).put(var.get[indeces])
-        when lon+'_vertices',lat+'_vertices'
-          f.var(var.name).put(var.get[true,indeces])
-        else
-          f.var(var.name).put(var.get)
-        end
-      }
-      f.close
-    }
-
-    [nhFile,shFile]
-  end
 end

data/test/test_cdp.rb

@@ -35,15 +35,14 @@ class TestCdp < Test::Unit::TestCase
 
   def test_splitFiles
     files = []
-    files << '../A/a' << '../A/aa' << '../B/b' << '../B/bb' << 'gridfile'
-    grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
-    assert_equal('gridfile',grid)
+    files << '../A/a' << '../A/aa' << '../B/b' << '../B/bb'
+    exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
     assert_equal(exp['A'],['../A/a','../A/aa'])
     assert_equal(exp['B'],['../B/b','../B/bb'])
-    files << 'a' << 'aa' << 'b' << 'bb' << 'gridfile'
+    files << 'a' << 'aa' << 'b' << 'bb'
     grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
     assert_equal('exp',exp.keys[0])
-    files << './a' << './aa' << './b' << './bb' << './gridfile'
+    files << './a' << './aa' << './b' << './bb'
     grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
     assert_equal('exp',exp.keys[0])
     grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files,'test')
@@ -65,32 +64,4 @@ class TestCdp < Test::Unit::TestCase
     weights = Cdp.maskedAreaWeights("cell_area",ICONGRID,"wet_c",ICONMASK,WEIGHTS,true)
     assert_equal(WEIGHTS,weights)
   end
-  def test_split_sphere
-    # one timesteps
-    Cdp.splitHemisphere(ICONOCE,"ELEV",'clon','clat')
-    return
-    # with missing values
-    Cdo.debug = true
-    maskedOce = Cdo.div(:input => "-selname,T #{ICONOCE} -selname,wet_c #{ICONOCE}")
-    Cdp.splitHemisphere(maskedOce,"T",'clon','clat')
-    maskedOce = Cdo.div(:input => "-selname,ELEV #{ICONOCE} -sellevidx,1 -selname,wet_c #{ICONOCE}")
-    Cdp.splitHemisphere(maskedOce,"ELEV",'clon','clat')
-
-    # 10 timesteps
-    Cdp.splitHemisphere(ICONOCEL,"ELEV",'clon','clat')
-    Cdp.splitHemisphere(ICONOCEL,"T",'clon','clat')
-    # with missing values
-    Cdo.debug = true
-    maskedOce = Cdo.div(:input => "-selname,T #{ICONOCEL} -selname,wet_c #{ICONOCEL}")
-    Cdp.splitHemisphere(maskedOce,"T",'clon','clat')
-    maskedOce = Cdo.div(:input => "-selname,ELEV #{ICONOCEL} -sellevidx,1 -selname,wet_c #{ICONOCEL}")
-    Cdp.splitHemisphere(maskedOce,"ELEV",'clon','clat')
-  end
-  def test_split_icon_sphere
-
-    # one timesteps
-    elev = Cdo.selname("ELEV",:input => ICONOCEL)
-    pp Cdo.infov(:input => elev)
-    Cdp.splitICONHemisphere(elev,"ELEV",'clon','clat')
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cdo