gphys 1.5.0 → 1.5.1

data/gphys.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = NumRu::GPhys::VERSION
   spec.authors           = ["Takeshi Horinouchi", "Ryo Mizuta",\
     "Daisuke Tsukahara", "Seiya Nishizawa", "Shin-ichi Takehiro"]
-  spec.email         = ["horinout@ees.hokudai.ac.jp"]
+  spec.email         = ["horinout@gfd-dennou.org"]
 
   #if spec.respond_to?(:metadata)
   #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.homepage         = 'http://www.gfd-dennou.org/arch/ruby/products/gphys/'
   spec.licenses       = ["BSD-2-Clause"]
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = Dir['{bin/*,ext/**/*[cb],lib/**/*.rb,doc/**/*,test/*.rb,testdata/*[a-z]}'].sort + %w(ChangeLog .ChangeLog.until201303 Gemfile LICENSE.txt README Rakefile gphys.gemspec)
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["ext","lib"]

data/lib/numru/dclext.rb

@@ -889,11 +889,16 @@ module NumRu
 
     #<<< uepack >>>
 
+    # options:
+    #  'min'       Numeric   minimum tone level
+    #  'max'       Numeric   maximum tone level
+    #  'nlev'      Integer   number of levels 
+    #  'interval'  Numeric   tone-level interval
+    #  'inf_max'   true/false  to set (or not) the maximum tone level to infty
+    #  'inf_min'   true/false  to set (or not) the minimum tone level to infty
+    #  'lbound'    true/false  Same as uepack param LBOUND but default is false
+    #  
     def ue_set_linear_levs(v, options=nil)
-      #  'min'       nil      minimum tone level (Numeric)
-      #  'max'       nil      maximum tone level (Numeric)
-      #  'nlev'      nil      number of levels (Integer)
-      #  'interval'  nil      tone-level interval (Numeric)
       options = @@empty_hash if !options
       raise TypeError, "options must be a Hash" if !options.is_a?(Hash)
       min = options['min']
@@ -901,13 +906,77 @@ module NumRu
       nlev = options['nlev']
       interval = options['interval']
       dx = interval || (nlev ? -nlev : 0)
-      if min || max
-        min ||= v.min
-        max ||= v.max
-        DCL.uegtla(min, max, dx)
+      inf_min = options['inf_min']
+      inf_min = false if inf_min.nil?
+      inf_min = nil if inf_min && !min  # for in-place substitution
+      inf_max = options['inf_max']
+      inf_max = false if inf_max.nil?
+      inf_max = nil if inf_max && !max  # for in-place substitution
+      lbound = options['lbound']
+      min ||= v.min
+      max ||= v.max
+      levels = ue_linear_levels(min, max, dx, lbound, inf_min, inf_max)
+      ue_set_tone_auto(levels)
+    end
+
+    # Same as level setting in uegtla but supporting extension to infinity
+    # 
+    # * inf_min  false: no extension, true: extend to -infty, nil: same
+    #   but for min is replaced by -infty, rather than extending 
+    # 
+    # * inf_max  false: no extension, true: extend to +infty, nil: same
+    #   but for max is replaced by +infty, rather than extending 
+    def ue_linear_levels(min, max, dx, lbound=false, inf_min=false, inf_max=false)
+      if dx > 0
+        dz = dx.to_f
       else
-        v = v.reshape(v.length,1) if v.rank==1
-        DCL.uegtlb(v, dx)
+        nlev = ( dx==0 ? DCL.ueiget('nlev') : [dx.abs.round, 1].max )
+        dz = DCL.rgnge( (max-min)/nlev.to_f )
+      end
+
+      zmin = DCL.irle(min/dz)*dz
+      zmax = DCL.irge(max/dz)*dz
+      n = ((zmax-zmin)/dz).round
+
+      levels = Array.new
+      for i in 0..n
+        x = ((zmin+i*dz)/dz).round * dz
+        levels.push(x)
+      end
+      if lbound
+        levels[0]  = [ levels[0],  min ].max
+        levels[-1] = [ levels[-1], max ].min
+      end
+
+      rmiss = DCL.glpget("rmiss")
+      if inf_min
+        levels.unshift(rmiss)    # extension
+      elsif inf_min.nil?
+        levels[0] = rmiss        # in-place substitusion
+      end
+      if inf_max
+        levels.push(rmiss)       # extension
+      elsif inf_max.nil?
+        levels[-1] = rmiss       # in-place substitusion
+      end
+
+      levels
+    end
+
+    # similar to uegtla/uegtlb but for levels are given
+    def ue_set_tone_auto(levels)
+      DCL.ueitlv
+      nlev = levels.length-1
+      itpat = DCL.ueiget('ITPAT')
+      iclr1 = DCL.ueiget('ICOLOR1')
+      iclr2 = DCL.ueiget('ICOLOR2')
+      (0...nlev).each do |i|
+        if nlev==1
+          ipat = (iclr2-iclr1)/2*1000+itpat
+        else
+          ipat = ((iclr2-iclr1)/(nlev-1.0)*i+iclr1).round*1000 + itpat
+        end
+        DCL.uestlv(levels[i], levels[i+1],ipat)
       end
     end
 
@@ -955,6 +1024,250 @@ module NumRu
       nil
     end
 
+    # ICOLOR in uicrgb.f:
+    Default_RGB_1D = [ DCL.isgrgb(255,0,255), DCL.isgrgb(0,0,255),
+                       DCL.isgrgb(0,255,255), DCL.isgrgb(0,255,0),
+                       DCL.isgrgb(255,255,0), DCL.isgrgb(255,0,0),
+                       DCL.isgrgb(255,0,255) ]
+
+    @@ui_shade_1_options = Misc::KeywordOptAutoHelp.new(
+      ['min', nil, 'Numeric => specifies the value corresponding to the RGB map lower end (default: minimum data value). Note that the same color is used below this value.'],
+      ['max', nil, 'Numeric => specifies the value corresponding to the RGB map upper end (default: maximum data value). Note that the same color is used above this value.'],
+      ['rgb', nil, '(Array/NArray) Specifies the color mapping. Example: [ DCL.isgrgb(0,0,0), DCL.isgrgb(255,255,255) ] for gray scale'],
+      ['place_rgb', nil, '(Array/NArray having the same length as the "rgb" value) Additional information needed only when you want to make the RGB map spaced unequally. Will be normalized, so the range does not matter. Example: "rgb"=>[ DCL.isgrgb(0,0,0), DCL.isgrgb(50,50,150), DCL.isgrgb(255,255,255) ], "place_rgb"=>[0,2,3] to set the intervals 2:1 among the 3 RGB values']
+    )
+
+    def shade_1_option_keys
+      @@ui_shade_1_options.keys
+    end
+
+    def set_ui_shade_1_options(options)
+      @@ui_shade_1_options.set(options)
+    end
+
+    @@next_ui_shade_1_options = nil
+    def next_ui_shade_1_options(options)
+      if options.is_a?(Hash)
+        @@next_ui_shade_1_options = options
+      else
+        raise TypeError,"Hash expected"
+      end
+      nil
+    end
+
+    @@ui_shade_1_called = false    # for ui_color_bar_1
+
+    # A wrapper of UIPDAT supporting options.
+    def ui_shade_1(z, options=nil)
+      if @@next_ui_shade_1_options
+        options = ( options ? @@next_ui_shade_1_options.update(options) :
+                              @@next_ui_shade_1_options )
+        @@next_ui_shade_1_options = nil
+      end
+      opt = @@ui_shade_1_options.interpret(options)
+      @@ui_shade_1_called = true
+      @@ui_shade_1_min_given = !opt["min"].nil?
+      @@ui_shade_1_max_given = !opt["max"].nil?
+      @@ui_shade_1_min = min = opt["min"] || z.min
+      @@ui_shade_1_max = max = opt["max"] || z.max
+      @@ui_shade_1_rgbs = rgbs = ( opt["rgb"] || Default_RGB_1D )
+      nrgbs = rgbs.length
+      @@ui_shade_1_levs = levs = opt["place_rgb"] || NArray.float(nrgbs).indgen!
+      raise("Length missmatch: 'rgb' & 'place_rgb'") if levs.length != nrgbs
+      DCL.uiscsq(levs,rgbs)
+      DCL.uiscrg(min,max)
+      DCL.uipdat(z)
+    end
+
+    @@ui_color_bar_1_options =  Misc::KeywordOptAutoHelp.new(
+      ["voff", nil, "how far is the bar from the viewport in the V coordinate"],
+      ["vcent",nil, "center position of the bar in the V coordinate (VX or VY)"],
+      ["vlength", 0.3, "bar length in the V coordinate"],
+      ["vwidth", 0.02, "bar width in the V coordinate"],
+      ["inffact", 1.9, "factor to change the length of triangle on the side for infinity (relative to 'vwidth')"],
+      ["landscape", false, "if true, horizonlly long (along x axes)"],
+      ["portrait", true, "if true, vertically long (along y axes)"],
+      ["top",  false, "place the bar at the top (effective if landscape)"],
+      ["left", false, "place the bar in the left (effective if portrait)"],
+      ["units", nil, "units of the axis of the color bar"],
+      ["units_voff", 0.0, "offset value for units from the default position in the V coordinate (only for 'units' != nil)"],
+      ["title", nil, "title of the color bar"],
+      ["title_voff", 0.0, "offset value for title from the default position in the V coordinate (only for 'title' != nil)"],
+      ["tickintv", 1, "0,1,2,3,.. to specify how frequently the dividing tick lines are drawn (0: no tick lines, 1: every time, 2: ever other:,...)"],
+      ["charfact", 0.9, "factor to change the label/units/title character size (relative to 'rsizel1')"],
+      ["index", nil, "index of tick lines and bar frame"],
+      ["charindex", nil, "index of labels, units, and title"],
+      ["chval_fmt", nil, "string to specify the DCL.chval format for labeling"]
+    )
+
+    def ui_color_bar_1(options=nil)
+
+      raise("ui_shade_1 has not been called") if !@@ui_shade_1_called
+
+      # < set parameters >
+
+      opt = @@ui_color_bar_1_options.interpret(options)  # to be replaced
+
+      landscape = opt["landscape"] || !opt["portrait"]
+      portrait  = !landscape
+
+      max = @@ui_shade_1_max
+      min = @@ui_shade_1_min
+
+      # < calc position >
+
+      vwidth = opt["vwidth"]
+      vlength = opt["vlength"]
+
+      vx1, vx2, vy1, vy2 = DCL.sgqvpt
+
+      if portrait
+        if !opt["left"] # right
+          voff =  opt["voff"] ||
+              DCL.uzrget('roffyr') + DCL.uzrget('pad1')*DCL::uzrget("rsizec2")
+          vxmin = vx2 + voff
+          vxmax = vx2 + voff + vwidth
+          axside = "r"
+        else # left
+          voff =  opt["voff"] ? -opt["voff"] : \
+              DCL.uzrget('roffyl') - DCL.uzrget('pad1')*DCL::uzrget("rsizec2")
+          vxmax = vx1 + voff
+          vxmin = vx1 + voff - vwidth
+          axside = "l"
+        end
+        vymin =( opt["vcent"] ? opt["vcent"]-vlength/2 : vy1 )
+        vymax =( opt["vcent"] ? opt["vcent"]+vlength/2 : vy1+vlength )
+      else  ## landscape ##
+        vxmin = (opt["vcent"] || ((vx1 + vx2) / 2)) - vlength / 2
+        vxmax = (opt["vcent"] || ((vx1 + vx2) / 2)) + vlength / 2
+        if opt["top"] # top
+          voff =  opt["voff"] ||
+               DCL.uzrget('roffxt') + DCL.uzrget('pad1')*DCL::uzrget("rsizec2")
+          vymin = vy2 + voff
+          vymax = vy2 + voff + vwidth
+          axside = "t"
+        else # bottom
+          voff =  opt["voff"] ? -opt["voff"] : \
+               DCL.uzrget('roffxb') - DCL.uzrget('pad1')*DCL::uzrget("rsizec2")
+          vymax = vy1 + voff
+          vymin = vy1 + voff - vwidth
+          axside = "b"
+        end
+      end
+
+      # apply optional parameters for axes and labels
+      index = opt["index"] || DCL::uziget("indext2")
+      index = 1 if index <= 0
+      charindex = opt["charindex"] || DCL::uziget("indexl1")
+      charindex = 1 if charindex <= 0
+      charfact = opt["charfact"]
+      charfact = 1 if charfact < 0
+      rsizel1 = charfact * DCL::uzrget("rsizel1")
+
+      axparam_bk =
+        DCLExt.uz_set_params(
+                             "indext1" => index,
+                             "indext2" => index,
+                             "indexl1" => charindex,
+                             "rsizel1" => rsizel1,
+                             "rsizet1" => vwidth*0.25,
+                             "rsizet2" => vwidth*0.4,
+                             'labelyl' => axside=="l",
+                             'labelyr' => axside=="r",
+                             'labelxb' => axside=="b",
+                             'labelxt' => axside=="t",
+                             'icentyr' => ((voff > 0) ? -1.0 : 1.0)
+                             )
+
+      if portrait
+        cbwindow = [0.0, 1.0, min, max]
+      else
+        cbwindow = [min, max, 0.0, 1.0]
+      end
+
+      DCL.grfig
+      DCL.grsvpt(vxmin,vxmax,vymin,vymax)
+      DCL.grswnd(*cbwindow)
+      DCL.grstrn(1)
+      DCL.grstrf
+
+      if portrait
+        z = NArray.to_na( [ [min,min], [max,max] ] )
+      else
+        z = NArray.to_na( [ [min,max], [min,max] ] )
+      end
+      #DCL.uiscsq(@@ui_shade_1_rgbs, @@ui_shade_1_levs)
+      #DCL.uiscrg(min,max)
+
+      DCL.uwsgxb(cbwindow[0], cbwindow[1], 2)
+      DCL.uwsgyb(cbwindow[2], cbwindow[3], 2)
+
+      DCL.uipdat(z)
+
+      fmt = opt['chval_fmt']
+
+      inf0 = @@ui_shade_1_min_given
+      inf1 = @@ui_shade_1_max_given
+
+      if portrait
+
+        # draw frame, tick lines, and labels
+        if fmt
+          cfmt_bk = DCL::uyqfmt
+          DCL::uysfmt(fmt)
+        end
+
+        DCL::usyaxs(axside)
+        if axside=="l"
+          DCL.sglnzv(vxmax,vymin,vxmax,vymax,3)
+        else
+          DCL.sglnzv(vxmin,vymin,vxmin,vymax,3)
+        end
+
+        DCL::uxaxdv("b",1,index) if !inf0
+        DCL::uxaxdv("t",1,index) if !inf1
+
+        DCL::uysfmt(cfmt_bk) if fmt
+
+      else  ## landscape ##
+
+        # draw frame, tick lines, and labels
+        if fmt
+          cfmt_bk = DCL::uxqfmt
+          DCL::uxsfmt(fmt)
+        end
+
+        DCL::usxaxs(axside)
+        if axside=="b"
+          DCL.sglnzv(vxmin,vymax,vxmax,vymax,3)
+        else
+          DCL.sglnzv(vxmin,vymin,vxmax,vymin,3)
+        end
+
+        DCL::uyaxdv("l",1,index) if !inf0
+        DCL::uyaxdv("r",1,index) if !inf1
+
+        DCL::uxsfmt(cfmt_bk) if fmt
+      end
+
+      DCLExt.color_bar_title_units(vxmin, vxmax, vymin, vymax, portrait, voff, 
+              opt['title'], opt['units'], opt['title_voff'], opt['units_voff'])
+
+      inffact = opt["inffact"]
+      if inf0
+        DCLExt.color_bar_draw_infinity_full(vxmin, vxmax, vymin, vymax, vwidth,
+                       portrait, inffact, -1, @@ui_shade_1_rgbs[0], index)
+      end
+      if inf1
+        DCLExt.color_bar_draw_infinity_full(vxmin, vxmax, vymin, vymax, vwidth,
+                       portrait, inffact, 1, @@ui_shade_1_rgbs[-1], index)
+      end
+
+      DCLExt.uz_set_params(axparam_bk)
+      DCL.uwsgxz(false)
+      DCL.uwsgyz(false)
+    end
+
     ############################################################
     # RELATIVELY INDEPENDENT OF DCL SUBLIBRARIES
     ############################################################
@@ -1639,6 +1952,9 @@ module NumRu
       if lmiss
         fx = NArrayMiss.to_nam(fx, fx.ne(rmiss)) if fx.is_a?(NArray)
         fy = NArrayMiss.to_nam(fy, fy.ne(rmiss)) if fy.is_a?(NArray)
+        mask = fx.get_mask & fy.get_mask
+        fx = fx.mask(mask)
+        fy = fy.mask(mask)
       end
 
       #< DCL scales >
@@ -1965,6 +2281,18 @@ module NumRu
       DCL.sgplzv(v3[0], v3[1], 1, index)
     end
 
+    def color_bar_draw_infinity_full(vxmin, vxmax, vymin, vymax, vwidth, portrait, inffact, sign, icolor, index)
+      sign = (sign > 0) ? 1 : -1
+      win = [vxmin, vxmax, vymin, vymax]
+      win = win[2..3] + win[0..1] if portrait
+      base = ((sign < 0) ? win[0] : win[1])
+      v3 = [[base, base + vwidth * inffact * sign, base],
+            [win[2], (win[2] + win[3]) / 2, win[3]]]
+      v3 = [v3[1], v3[0]] if portrait
+      DCL.sgtnxv(v3[0], v3[1], 455, icolor)
+      DCL.sgplzv(v3[0], v3[1], 1, index)
+    end
+
     def color_bar_title_units(vxmin, vxmax, vymin, vymax, portrait, voff, title, units, title_voff, units_voff)
       rsizel1 = DCL::uzrget('rsizel1')
       charindex = DCL::uziget('indexl1')
@@ -2510,6 +2838,7 @@ module NumRu
       nil
     end
 
+
     # Annotates line/mark type and index (and size if mark).
     # By default it is shown in the right margin of the viewport.
     #
@@ -2702,6 +3031,56 @@ if $0 == __FILE__
   DCL.glpset('lmiss',true)
 
   DCL.sldiv("y",2,2)
+
+  DCL.grfrm
+  DCL.grstrn(1)
+  DCL.grsvpt(0.1,0.8,0.2,0.9)
+  DCL.grswnd(xdeg[0],xdeg[-1],ydeg[0],ydeg[-1])
+  DCL.grstrf
+  DCLExt.ui_shade_1(u)     # full color shading
+  DCL.usdaxs
+  DCLExt.ui_color_bar_1 "landscape"=>true, 
+    "title"=>"color map", "units"=>"(any)", "voff"=>0.1
+
+  DCL.grfrm
+  DCL.grstrn(1)
+  DCL.grsvpt(0.1,0.8,0.2,0.9)
+  DCL.grswnd(xdeg[0],xdeg[-1],ydeg[0],ydeg[-1])
+  DCL.grstrf
+  DCLExt.ui_shade_1(u, "max"=>u.max*0.7,"min"=>u.min*0.7)
+  DCL.usdaxs
+  DCLExt.ui_color_bar_1  "title"=>"color map", "units"=>"(any)", "voff"=>0.07
+
+  DCL.grfrm
+  DCL.grstrn(1)
+  DCL.grsvpt(0.1,0.8,0.2,0.9)
+  DCL.grswnd(xdeg[0],xdeg[-1],ydeg[0],ydeg[-1])
+  DCL.grstrf
+  DCLExt.ui_shade_1(u, "rgb"=>[ DCL.isgrgb(0,0,0), DCL.isgrgb(105,71,140),
+                                DCL.isgrgb(255,255,255) ],
+                        "place_rgb"=>[0.0, 0.33, 1.0],
+                        "min"=>u.min, "max"=>u.max )
+  DCL.usdaxs
+  DCLExt.ui_color_bar_1 "landscape"=>true
+
+  DCL.grfrm
+  DCL.grstrn(1)
+  DCL.grsvpt(0.1,0.8,0.2,0.9)
+  DCL.grswnd(xdeg[0],xdeg[-1],ydeg[0],ydeg[-1])
+  DCL.grstrf
+  DCLExt.ui_shade_1(u,
+#      "rgb"=>[ DCL.isgrgb(0,0,0),      DCL.isgrgb(150,0,0),
+#               DCL.isgrgb(230,140,60), DCL.isgrgb(255,255,255) ]
+#      "rgb"=>[ DCL.isgrgb(0,0,0),      DCL.isgrgb(87,50,120),
+#               DCL.isgrgb(172,135,205), DCL.isgrgb(255,255,255) ]
+      "rgb"=>[ DCL.isgrgb(0,0,0),      DCL.isgrgb(61,31,139),
+               DCL.isgrgb(149,119,225), DCL.isgrgb(255,255,255) ]
+#      "rgb"=>[ DCL.isgrgb(0,0,0),      DCL.isgrgb(40,40,130),
+#               DCL.isgrgb(125,125,215), DCL.isgrgb(255,255,255) ]
+ )
+  DCL.usdaxs
+  DCLExt.ui_color_bar_1 "landscape"=>true
+
   DCL.grfrm
   DCL.grstrn(1)
   DCL.grsvpt(0.1,0.9,0.1,0.9)
@@ -2743,9 +3122,11 @@ if $0 == __FILE__
   unit_vect_info[3] = 0.0
   DCLExt.unit_vect( *unit_vect_info )
 
-=begin
   DCL.sgpset('lclip',true)
 
+  #v = NArrayMiss.to_nam(v)
+  #v.invalidation(2..6,-5..-2)
+
   for itr in [10,12]
     DCL.grfrm
     DCL.grstrn(itr)
@@ -2797,7 +3178,7 @@ if $0 == __FILE__
   vfratio, flenmax = 
     DCLExt.flow_vect_anyproj(u, v,
                                 xdeg, ydeg,
-                                1.0,1,1,true,nil,0.3)
+                                0.1,1,1,true,nil,0.3)
     #DCLExt.flow_vect_anyproj(u[true,ny/2..-1], v[true,ny/2..-1],
     #                            xdeg, ydeg[ny/2..-1])
   DCLExt.unit_vect_single(vfratio, flenmax)
@@ -2844,7 +3225,7 @@ if $0 == __FILE__
   date_to = DateTime.parse('2000-02-01 5:00')
   any_offst = 10
 
-  3.times do
+  4.times do
     DCL.grfrm
     DCL.grswnd(0.0, date_to-date_from, any_offst, date_to-date_from+any_offst)
     DCL.grsvpt(0.2, 0.8, 0.2, 0.8)
@@ -2856,7 +3237,6 @@ if $0 == __FILE__
     DCLExt.date_ax(date_from,  date_to, "yax"=>true)
     date_to = date_to >> 15*12
   end
-=end
 
   DCL.grcls