iconPlot 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df59cf8fcb883833c0355e39533c5da8e3075d25
-  data.tar.gz: 8346f47771d4ce6573732e64986e928a05eb9878
+  metadata.gz: 721ca643ed23cd01c6f21a952ed38eee1ea291d6
+  data.tar.gz: 451c4f7948551d45b9f5ccd535cf197ebcbeb402
 SHA512:
-  metadata.gz: 6b0086f6cb9c924a88b124b560298971805f810437da1bd3b0682f3339aca3bc7a36af54ae8d5f976df00710cc7aa951e50061b483de699b605dde68593187b9
-  data.tar.gz: 25de6154c6143f65914063ae23a1e4096e57fbae0e4c5636bed530f456c5f8e8206186e0b254de92a436d19feebcc16f30e6388232ae51a7f53cc0259a553c3f
+  metadata.gz: c08f50348bda047c4425777138502005cf78f94113de4586c8384eb27aa8dd4fcda764eb78c9eb792194bd3b2fb0e7750efb3cdfcb9c6341bfb9ea67442b9549
+  data.tar.gz: ceb46c6e875d0efef1beffb5eabd33e0c4eb88f0af8d8dfeeed6125c20e122878e033ab4ed0480bfef28ccaf4a76d912c279d5b8735d4d61bd04ac423aa94074

data/gemspec

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 spec = Gem::Specification.new do |s|
   s.name              = "iconPlot"
-  s.version           = '0.0.9'
+  s.version           = '0.1.0'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/iconPlot.rb"] + ["gemspec"] + ["bin/nclsh"] + Dir.glob("lib/*ncl")
   s.executables       << 'nclsh'

data/lib/iconPlot.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'cdo'
 require 'extcsv'
 require 'shellwords'
+require 'parallel'
 
 class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug,:isIcon)
   VERSION = '0.0.4'
@@ -9,13 +10,15 @@ class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug
   def initialize(*args)
     super(*args)
     
+    cdoPath = ENV['CDO'].nil? ? 'cdo' : ENV['CDO']
+
     defaults = {
       :caller  => Gem.bin_path('iconPlot','nclsh'),
       :plotter => Gem.find_files("icon_plot.ncl")[0],
       :libdir  => File.dirname(Gem.find_files("icon_plot.ncl")[0]),
       :otype   => 'png',
       :display => 'sxiv',
-      :cdo     => ENV['CDO'].nil? ? 'cdo' : ENV['CDO'],
+      :cdo     => Cdo.new(cdo: cdoPath),
       :isIcon  => true,
       :debug   => false
     }
@@ -41,7 +44,12 @@ class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug
     cmd << " -altLibDir=#{self.libdir} #{varIdent} -iFile=#{ifile} -oFile=#{ofile} -oType=#{self.otype}"
     cmd << " -isIcon" if self.isIcon
     cmd << " -DEBUG"  if self.debug
-    opts.each {|k,v| cmd << " -"<< [k,v].join('=') }
+    opts.each {|k,v| 
+      v = '"'+v+'"' if (:tStrg == k and not ['"',"'"].include?(v.strip[0]))
+      v = 'True' if v == true
+      v = 'False' if v == false
+      cmd << " -"<< [k,v].join('=')
+    }
     puts cmd if self.debug
     out = IO.popen(cmd).read
     puts out if self.debug
@@ -67,8 +75,8 @@ class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug
       warn "Variable cannot be found!"
       exit -1
     end
-    Cdo.debug = true
-    unit = Cdo.showunit(:input => "-selname,#{varname} #{ifile}").first
+    self.cdo.debug = true
+    unit = self.cdo.showunit(:input => "-selname,#{varname} #{ifile}").first
     ExtCsvDiagram.plot_xy(icon,"datetime",varname,
                           "ICON: #{operation} on #{varname} (file:#{ifile})", # Change title here
                         :label_position => 'below',:skipColumnCheck => true,
@@ -85,7 +93,7 @@ class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug
   def scatterPlot(ifile,ofile,xVarname,yVarname,opts={})
     # is there a variable which discribes different regions in the ocean
     regionVar = opts[:regionVar].nil? ? 'rregio_c' : opts[:regionVar]
-    hasRegion = Cdo.showname(:input => ifile).join.split.include?(regionName)
+    hasRegion = self.cdo.showname(:input => ifile).join.split.include?(regionName)
     unless hasRegion
       warn "Variable '#{regionName}' for showing regions is NOT found in the input '#{ifile}'!"
       warn "Going on without plotting regions!"
@@ -100,7 +108,7 @@ class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug
     FileUtils.rm(file) if File.exists?(file)
   end
   def show(*files)
-    files.flatten.each {|file| out = IO.popen("#{self.display} #{file} &").read; puts out if self.debug }
+    Parallel.map(files.flatten) {|file| out = IO.popen("#{self.display} #{file}").readlines; puts out.join if self.debug }
   end
   def defaultPlot(ifile,ofile,opts={})
     show(scalarPlot(ifile,ofile,'T',opts))
@@ -115,8 +123,8 @@ class IconPlot < Struct.new(:caller,:plotter,:libdir,:otype,:display,:cdo,:debug
 
     # read the date
     IO.popen("echo 'date|time|depth|#{varname}' > #{dataFile}")
-    Cdo.debug = true
-    Cdo.outputkey('date,time,level,value', 
+    self.cdo.debug = true
+    self.cdo.outputkey('date,time,level,value', 
                   :input => "-#{operation} -selname,#{varname} #{ifile} >>#{dataFile} 2>/dev/null")
 
     # postprocessing for correct time values

data/lib/icon_plot.ncl

@@ -25,19 +25,38 @@
   else
   ; --- Use the configuration file from the commandline option
     if ( isvar("configFile") ) then
-      if (isfilepresent(configFile)) then
-        print("Found configfile:"+configFile)
-        loadscript(configFile)
+      print(configFile)
+      print(""+configFile)
+      if("6.2.1" .eq. get_ncl_version()) then
+        if (fileexists(configFile)) then
+          print("Found configfile:"+configFile)
+          loadscript(configFile)
+        else
+          print("Could NOT find configfile:"+configFile)
+          exit()
+        end if
       else
-        print("Could NOT find configfile:"+configFile)
-        exit()
+        if (isfilepresent(configFile)) then
+          print("Found configfile:"+configFile)
+          loadscript(configFile)
+        else
+          print("Could NOT find configfile:"+configFile)
+          exit()
+        end if
       end if
     else
   ; --- Use the default config file
       CONFIGFILE = getenv("HOME")+"/.icon_plot.rc"
-      if (isfilepresent(CONFIGFILE)) then
-        print("Found configfile:"+CONFIGFILE)
-        loadscript(CONFIGFILE)
+      if("6.2.1" .eq. get_ncl_version()) then
+        if (fileexists(CONFIGFILE)) then
+          print("Found configfile:"+CONFIGFILE)
+          loadscript(CONFIGFILE)
+        end if
+      else
+        if (isfilepresent(CONFIGFILE)) then
+          print("Found configfile:"+CONFIGFILE)
+          loadscript(CONFIGFILE)
+        end if
       end if
     end if
   end if
@@ -142,6 +161,7 @@
     print("; hovCut        : plot hovmoeller diagram, input is 'levIndex' and 'hovLC' 'hovRC'")
     print("; hovLC, hovRC  : start and end point of a section for hovCut - currently same longitude allowed only,")
     print(";                 the Northern and Southern values are used as plotting boundaries; switches to hovCut")
+    print("; makeYLinear   : enforce to linearize the yaxis of section and hovmoeller plots (default:False)")
     print("; mapLine       : (logical) draws continent lines on the plot (foreground/transparent)")
     print("; maskName      : variable to mask with. maskName is expected NOT to have time dimension")
     print(";                  'maskName=" + dq + "none" + dq + "' is same as default (no mask variable)")
@@ -161,6 +181,7 @@
     print("; markCells     : mark cell centers with dots")
     print("; showNcd       : display NDC Grid to find Normalized Device Coordinates on the plot")
     print("; k2c           : if True, perform Kelvin2Celsius shift (default:True)")
+    print("; remapOperator : interpolation operator for internal lonlat representation of icon grid (remapnn,remapcon[default])")
     print(";")
     print("; ATMOSPHERE STUFF:")
     print("; atmLev        : chooses vertical plot levels for atmosphere input (h: height,p:pressure,m:modellevel,default:p)")
@@ -231,6 +252,7 @@
   if (.not. isvar("withLines"))      withLines      = True            end if
   if (.not. isvar("withLineLabels")) withLineLabels = False           end if
   if (.not. isvar("k2c"))            k2c            = True            end if
+  if (.not. isvar("remapOperator"))  remapOperator  = "remapcon"      end if
   if (.not. isvar("isIcon"))         isIcon         = False           end if
 
   if (.not.isvar("mapType"))      mapType      = "lonlat"        end if
@@ -244,6 +266,7 @@
   if (.not.isvar("centerLon"))    centerLon    = -30.            end if
   if (.not.isvar("centerLat"))    centerLat    =  20.            end if
   if (.not.isvar("satDist"))      satDist      =  20.            end if
+  if (.not.isvar("makeYLinear"))  makeYLinear  = False            end if
   if (.not.isvar("mapLine"))      mapLine      = True            end if
   if (.not.isvar("resolution"))   resolution   = "r90x45"        end if
   if (.not.isvar("vecRefLength")) vecRefLength = 8.0             end if
@@ -399,14 +422,12 @@
     else
       ; perform some remapping to a regular grid because ncl cannot draw vector
       ; from unstructured grids
-      ; TODO addVars=(/ "PS","PHIS"/)
-      operator = "remapnn"
-      remapFilename = setRemapFilename(iFile,iType,resolution,atmLev,operator)
+      remapFilename = setRemapFilename(iFile,iType,resolution,atmLev,remapOperator)
       print("remapFilename:"+remapFilename)
       if (.not. checkRemappedFile(iFile,remapFilename,ivarname,iType,atmLev,atmPLevs,atmHLevs) ) then
         addVars=(/""/)
-        print("PERFORM remapnn again!")
-        remapForVecPlot(iFile,remapFilename,resolution,useMask,plotMode,DEBUG,addVars,operator)
+        print("PERFORM "+remapOperator+" again!")
+        remapForVecPlot(iFile,remapFilename,resolution,useMask,plotMode,DEBUG,addVars,remapOperator)
       end if
       rFile = addfile( remapFilename+".nc", "r" )
     end if
@@ -570,7 +591,7 @@
     drawNDCGrid(wks)
   end if
 
-  ResC = setDefaultResource(True,withLines,withLineLabels,fillMode,mapType)
+  ResC = setDefaultResource(True,withLines,withLineLabels,fillMode,mapType,makeYLinear)
 
   if (.not. userColors) setDefaultColors(ResC,minVar,maxVar,DEBUG) end if
 
@@ -695,8 +716,8 @@
         ;plotGrid(wks,plot,var,coords(1,:),bounds,File,ResC,DEBUG)
         boundslon = bounds(0,:,:)
         boundslat = bounds(1,:,:)
-        pres = plotGrid_62(wks,plot,var,boundslon,boundslat)
-        gsid = gsn_add_polygon(wks,plot,ndtooned(boundslon),ndtooned(boundslat),pres)
+        presGrid = plotGrid_62(wks,plot,var,boundslon,boundslat)
+        gsid = gsn_add_polygon(wks,plot,ndtooned(boundslon),ndtooned(boundslat),presGrid)
         ; }}}
         ;=======================================================================================
       end if
@@ -747,7 +768,7 @@
     end if
     points   = ispan(0,secPoints-1,1)*1.0
 
-    res  = setDefaultSectionResource(points,secPoints,secLC,secRC,withLines,withLineLabels)
+    res  = setDefaultSectionResource(points,secPoints,secLC,secRC,withLines,withLineLabels,makeYLinear)
     setAutomaticPlotCaptions(res,plotMode,varName,File,iFile,timeStep,levIndex,iType,atmLev,k2c)
     setLevels(selMode,res,minVar,maxVar,scaleLimit,numLevs,DEBUG)
     setSectionVertLabel(res,iType,atmLev)

data/lib/icon_plot_lib.ncl

@@ -907,7 +907,7 @@ end
 ;---------------------------------------------------------------
 ; Create a default NCL resource
 undef("setDefaultResource")
-function setDefaultResource(verticallabelbar,withLines,withLineLabels,fillmode,maptype)
+function setDefaultResource(verticallabelbar,withLines,withLineLabels,fillmode,maptype,makeYLinear)
 begin
   resource                          = True
   resource@gsnMaximize              = False
@@ -960,11 +960,14 @@ begin
   resource@mpGreatCircleLinesOn = True
   resource@stMinArrowSpacingF   = 0.001
 
+  ; linearize y axis if desired ===============================================
+  resource@gsnYAxisIrregular2Linear = makeYLinear
+
   return resource
 end
 ;---------------------------------------------------------------
 undef("setDefaultSectionResource")
-function setDefaultSectionResource(points,secpoints,seclc,secrc,withLines,withLineLabels)
+function setDefaultSectionResource(points,secpoints,seclc,secrc,withLines,withLineLabels,makeYLinear)
 begin
   resource                              = True;           plot mods desired
   resource@gsnFrame                     = False;                don't turn page yet
@@ -986,7 +989,8 @@ begin
   resource@lbLabelAutoStride            = True;          nice label bar label stride
   resource@gsnSpreadColors              = True;          use full range of colormap
   resource@lbOrientation                = "vertical";    vertical label bar
-  resource@pmLabelBarOrthogonalPosF     = -0.05;         move label bar closer to plot
+  resource@pmLabelBarOrthogonalPosF     = -0.04;         move label bar closer to plot
+  resource@lbTitleString      = "kg/m^3"
   resource@lbTitlePosition              = "Bottom"
 ;   resource@gsnYAxisIrregular2Log      = True
 
@@ -1007,6 +1011,10 @@ begin
 
 ; lines/labels inside the plot ================================================
   setLineAndLineLabels(resource,withLines,withLineLabels)
+
+  ; linearize y axis if desired ===============================================
+  resource@gsnYAxisIrregular2Linear = makeYLinear
+
   return resource
 end
 ;---------------------------------------------------------------
@@ -1018,7 +1026,7 @@ begin
   resource@vcVectorDrawOrder  = "Postdraw"
   resource@vcFillArrowWidthF  = 12.0
   resource@lbOrientation      = "Vertical"
-  resource@lbTitleString      = "C"
+  resource@lbTitleString      = "kg/m^3"
   resource@lbTitlePosition    = "Left"
   resource@cnInfoLabelOn      = False
   resource@lbTitleFontHeightF = 0.02
@@ -1031,7 +1039,7 @@ undef("setDefaultColors")
 procedure setDefaultColors(resource,minval,maxval,debug)
 begin
 ; white is color 135
-  if ((minval*maxval) .LT. 0.0) then ; data goes fro positiv to negative or vs.
+  if ((minval*maxval) .LT. 0.0) then ; data goes from positiv to negative or vs.
     if (abs(maxval) .GT. abs(minval)) then
       resource@gsnSpreadColorStart = 135  - toint(126*(abs(minval)/abs(maxval)))
       resource@gsnSpreadColorEnd   = 255
@@ -1194,7 +1202,7 @@ end
 undef("setSectionVertLabel")
 procedure setSectionVertLabel(resource,itype,atmlev)
 begin
-  resource@lbTitleString     = "[C]"
+  resource@lbTitleString     = "[kg/m^3]"
   label = ""
   reversYAxis = True
   if (itype .eq. "atm") then
@@ -1324,10 +1332,10 @@ undef("checkMinMaxVar")
 procedure checkMinMaxVar(minvar,maxvar)
 begin
   if ( (.not. ismissing(minvar)) .and. (.not. ismissing(maxvar)) ) then
-  if ( minvar .gt. maxvar ) then
-    print("minVar has to be larger than maxVar")
-    exit
-  end if
+    if ( minvar .gt. maxvar ) then
+      print("minVar has to be larger than maxVar")
+      exit
+    end if
   end if
 end
 ;---------------------------------------------------------------
@@ -1359,6 +1367,12 @@ begin
     lonlat = str_split(variable@coordinates," ")
     lon    = lonlat(0)
     lat    = lonlat(1)
+    ; check for real names of coordinate; order is not pre-defines
+    lonIsLon = str_match(lon,"lon")
+    if (ismissing(lonIsLon)) then
+      lon = lonlat(1)
+      lat = lonlat(0)
+    end if
   else
     lon = "lon"
     lat = "lat"
@@ -1930,24 +1944,26 @@ begin
    "cnFillColors" : colors
   end getvalues
   ;---All triangles less than lowest level
-  vind = ind(var .lt. levels(0))
-  if(.not.all(ismissing(vind))) then
-    gscolors(vind) = colors(0)
+  vindStart = ind(var .lt. levels(0))
+  if(.not.all(ismissing(vindStart))) then
+    gscolors(vindStart) = colors(0)
   end if
 
   ;---All triangles inbetween levels
   do i = 1, dimsizes(levels) - 1
-    vind := ind(var .ge. levels(i-1) .and. var .lt. levels(i))
-    if(.not.all(ismissing(vind))) then
-      gscolors(vind) = colors(i)
+    ;print("index = "+s)
+    ;print(dimsizes(ind(var .ge. levels(i-1) .and. var .lt. levels(i))))
+    vindMiddle = ind(var .ge. levels(i-1) .and. var .lt. levels(i))
+    if(.not.all(ismissing(vindMiddle))) then
+      gscolors(vindMiddle) = colors(i)
     end if
+    delete(vindMiddle)
   end do
 
   ;---All triangles higher than highest level
-  delete(vind)
-  vind = ind(var .ge. levels(dimsizes(levels)-1))
-  if(.not.all(ismissing(vind))) then
-    gscolors(vind) = colors(dimsizes(levels)-1)
+  vindEnd = ind(var .ge. levels(dimsizes(levels)-1))
+  if(.not.all(ismissing(vindEnd))) then
+    gscolors(vindEnd) = colors(dimsizes(levels)-1)
   end if
 
   pres@gsColors = gscolors

data/test/test_iconPlot.rb

@@ -1,52 +1,51 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require "minitest/autorun"
+require 'parallelQueue'
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require "iconPlot"
 
 class TestIconPlot < Minitest::Test
 
-  CALLER                 = "/home/ram/src/git/icon/scripts/postprocessing/tools/contrib/nclsh"
-  PLOTTER                = "/home/ram/src/git/icon/scripts/postprocessing/tools/icon_plot.ncl"
-  PLOTLIB                = "/home/ram/src/git/icon/scripts/postprocessing/tools"
+  CALLER                 = "/home/ram/src/iconPlot/contrib/nclsh"
+  PLOTTER                = "/home/ram/src/iconPlot/icon_plot.ncl"
+  PLOTLIB                = "/home/ram/src/iconPlot"
   LS                     = 'ls -crtlh'
-  OCE_PLOT_TEST_FILE     = ENV['HOME']+'/data/icon/oce.nc'
-  OCELSM_PLOT_TEST_FILE  = ENV['HOME']+'/data/icon/oce_lsm.nc'
-  OCELONG_PLOT_TEST_FILE = ENV['HOME']+'/data/icon/oceLong.nc'
-  ATM_PLOT_TEST_FILE     = ENV['HOME']+'/data/icon/atm.nc'
-  OCE_REGPLOT_TEST_FILE  = ENV['HOME']+'/data/icon/regular_oce.nc' #remapnn,r180x90
-  ATM_REGPLOT_TEST_FILE  = ENV['HOME']+'/data/icon/regular_atm.nc' #remapnn,n63 (no sections), r180x90 (with sections)
+  OCE_PLOT_TEST_FILE     = ENV['HOME']+'/local/data/icon/oce.nc'
+  OCELSM_PLOT_TEST_FILE  = ENV['HOME']+'/local/data/icon/oce_lsm.nc'
+  OCELONG_PLOT_TEST_FILE = ENV['HOME']+'/local/data/icon/oceLong.nc'
+  ATM_PLOT_TEST_FILE     = ENV['HOME']+'/local/data/icon/atm.nc'
+  OCE_REGPLOT_TEST_FILE  = ENV['HOME']+'/local/data/icon/regular_oce.nc' #remapnn,r180x90
+  ATM_REGPLOT_TEST_FILE  = ENV['HOME']+'/local/data/icon/regular_atm.nc' #remapnn,n63 (no sections), r180x90 (with sections)
   OFMT                   = 'png'
   PLOT_CMD               = 'sxiv'
   CDO                    = ENV['CDO'].nil? ? 'cdo' : ENV['CDO']
-  if 'thingol' == `hostname`.chomp
+  if 'luthien' == `hostname`.chomp
     def test_simple
       ip = IconPlot.new(CALLER,PLOTTER,PLOTLIB,OFMT,PLOT_CMD,CDO,true)
       ip.debug = true
       ofile          = 'test_icon_plot'
-      ip.show(ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_00',"T",:levIndex => 0))
-      ip.show(ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_01',"T",:levIndex => 2))
-      ip.show(ip.vectorPlot(OCE_PLOT_TEST_FILE,   ofile+'_02',"u-veloc v-veloc",:levIndex => 2))
-      ip.show(ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_03',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:mapType => "ortho"))
-      ip.show(ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_04',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:secLC => "-20,-60", :secRC => "-20,60"))
-      ip.show(ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_05',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:secLC => "-20,-60", :secRC => "-20,60",:maskName => 'wet_c'))
-      ip.show(ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_05',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:secLC => "-50,-60", :secRC => "0,60",:maskName => 'wet_c',:secMode => 'circle'))
-      ip.show(ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_06',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:maskName => 'wet_c'))
-      ip.show(ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_07',"T",:levIndex => 2,:maskName => 'wet_c'))
-      ip.isIcon = false
-      ip.show(ip.scalarPlot("remapnn_r90x45_oce.nc","reg_"+ofile,"T",:levIndex => 2,:mapType => "ortho"))
-      ip.show(ip.scalarPlot("remapnn_r90x45_oce.nc","reg_"+ofile,"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:mapType => "ortho"))
-      ip.show(ip.scalarPlot("remapnn_r90x45_oce_lsm.nc","reg_lsm_"+ofile,"T",:levIndex => 2,:mapType => "ortho",:maskName => 'wet_c'))
-      ip.show(ip.scalarPlot("remapnn_r90x45_oce_lsm.nc","reg_lsm_"+ofile,"wet_c",:mapType => "ortho"))
-      ip.show(ip.scalarPlot("remapnn_r90x45_oce_lsm.nc","reg_lsm_"+ofile,"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:mapType => "ortho",:maskName => 'wet_c'))
-      ip.show(ip.scalarPlot("remapnn_r90x45_oce_lsm.nc","reg_lsm_"+ofile,"wet_c",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:mapType => "ortho",:maskName => 'wet_c'))
+      q = ParallelQueue.new
+      q.push {ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_00',"T",:levIndex => 0) }
+      q.push {ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_01',"T",:levIndex => 2) }
+      q.push {ip.vectorPlot(OCE_PLOT_TEST_FILE,   ofile+'_02',"u-veloc v-veloc",:levIndex => 2) }
+      q.push {ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_03',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:mapType => "ortho") }
+      q.push {ip.scalarPlot(OCE_PLOT_TEST_FILE,   ofile+'_04',"T",:vecVars => "u-veloc,v-veloc",:levIndex => 2,:secLC => "-20,-60", :secRC => "-20,60") }
+      q.push {ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_05',"T",:vecVars => "u,v",:levIndex => 2,:secLC => "-20,-60", :secRC => "-20,60",:maskName => 'wet_c') }
+      q.push {ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_05',"T",:vecVars => "u,v",:levIndex => 2,:secLC => "-50,-60", :secRC => "0,60",:maskName => 'wet_c',:secMode => 'circle') }
+      q.push {ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_06',"T",:vecVars => "u,v",:levIndex => 2,:maskName => 'wet_c') }
+      q.push {ip.scalarPlot(OCELSM_PLOT_TEST_FILE,ofile+'_07',"T",:levIndex => 2,:maskName => 'wet_c') }
+
+      images = q.run
+
+      ip.show(*images)
     end
   end
-  def test_defaults
+  def _test_defaults
     p = IconPlot.new
     assert_includes(p.caller.split(File::SEPARATOR),'gems')
     assert_includes(p.plotter.split(File::SEPARATOR),'gems')
     assert_includes(p.libdir.split(File::SEPARATOR),'gems')
   end
-  def test_levelPlot
+  def _test_levelPlot
     p = IconPlot.new
     p.show( p.levelPlot(OCELONG_PLOT_TEST_FILE,'test_levelPlot_00','T',:operation => :fldmax))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iconPlot
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cdo
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Plot ICON output with ncl via Ruby