RubyGems - gphys - Versions diffs - 1.5.3 → 1.5.4 - Mend

gphys 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/ChangeLog +45 -0
data/bin/gpview +1 -1
data/bin/gpview~ +973 -0
data/lib/numru/ganalysis/eof.rb +10 -6
data/lib/numru/ggraph.rb +9 -9
data/lib/numru/gphys/assoccoords.rb +4 -1
data/lib/numru/gphys/gphys.rb +3 -0
data/lib/numru/gphys/varray.rb +1 -1
data/lib/numru/gphys/version.rb +1 -1
metadata +4 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13c32ab65077429fc0f5c4799d6986e2cb672dfa
-  data.tar.gz: b6cd30441caba1b246ae90b6ae9b8f090364cbce
+  metadata.gz: 1341ed41033b2f8c5e07671a4c0e541e0135ef73
+  data.tar.gz: 69b01da241605e1337df420e4d48ff8cce4ba561
 SHA512:
-  metadata.gz: cc75b8a323b972ace9a8b0beb53fbedf8165409d9613f655bfaf08090c751fa8c4b594f09d51c53b8592a4c9b3be85e32447792cb78bf3ab7f94772aea3d78b2
-  data.tar.gz: c25b9805785e96f88ecf47e37855169cc4efecc29520d3df74da9385d57c811bd5de44c8f684fdcdc9cf5657972e69338c6699e906a90099f040d517ba5b9725
+  metadata.gz: 694f55d83e1ec6a41d25af18f6cbc415b9462e7391a041e4b78f12d2681116ca6dbb74ee61c22aa4756bdc968af55e4e16da81c21685115e8ea30394e2d6ab30
+  data.tar.gz: 8cebe5a572e40ab3e1c1b9c98b759e21570a3397abe911206e2c61c7e083d7c623e09060167187979b1302a089df6c26190ab6a1425867dd72e1b2f4034e3da6

data/ChangeLog CHANGED

@@ -1,3 +1,48 @@
+2018-03-04  Takeshi Horinouchi
+To release version 1.5.4 (git tag v1.5.4)
+M	lib/numru/gphys/version.rb
+2018-03-04  Takeshi Horinouchi
+a minor enhancement (on recognition of longitude and latitude)
+M	lib/numru/ganalysis/eof.rb
+2018-03-02  Takeshi Horinouchi
+a revision to go around a bug of NArray
+M	lib/numru/ganalysis/eof.rb
+2018-02-20  Takeshi Horinouchi
+minor improvement
+M	lib/numru/gphys/varray.rb
+2018-02-01  Takeshi Horinouchi
+changed to use GPhys#rank_len_ne_1
+M	bin/gpview
+2018-02-01  Takeshi Horinouchi
+added a new method GPhys#rank_len_ne_1
+M	lib/numru/gphys/gphys.rb
+2018-02-01  Takeshi Horinouchi
+slightly changed an error message
+M	lib/numru/gphys/assoccoords.rb
+2018-02-01  Takeshi Horinouchi
+Enhanced argument check.
+M	lib/numru/gphys/assoccoords.rb
+2018-01-26  Takeshi Horinouchi
+fixed the bug in the previous commit
+M	lib/numru/ggraph.rb
 2018-01-26  Takeshi Horinouchi
 updated the years

data/bin/gpview CHANGED

@@ -942,7 +942,7 @@ while ARGV[0] do
       # judge draw kind
       unless kind_of_fig
-        gp_rank = g.rank
+        gp_rank = g.rank_len_ne_1
         if ($OPT_mark)
           kind_of_fig = "mark"
         elsif ($OPT_line || gp_rank == 1)

data/bin/gpview~ ADDED

@@ -0,0 +1,973 @@
+#!/usr/bin/env ruby
+##################################################
+=begin
+= NAME
+gpview - quick viewer for the values of a variable specified by a gtool4-type URL.
+(1) for 1-dimensional variable, make line plot.
+(2) for 2-dimensional variable, make contour/tone plot.
+(3) for 3/more-dimensional variable, make contour/tone plot,
+    select first 2D. possible to make animation.
+= USAGE
+The first command form is
+    % gpview [options] gturl1 gturl2 gturl3 ...
+where the format of the gturl is
+    path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
+The second commnad form is
+    % gpview --var url [options] gtfile1 gtfile2 ...
+where the format of the url is
+    varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
+= OPTIONS
+if you want to know more description, please read
+  http://ruby.gfd-dennou.org/products/gphys/doc/gpview.html
+== GLOBAL OPTIONS
+:--help:
+  print this message.
+:--var url:
+  set the variable name and slicing parameters.
+:--wsn [1-4]:
+  set work staion number. each number represent output device:
+  * for dcl-6,
+     1 : X window
+     2.: PDF file (named dcl.pdf).
+  * for dcl-5-?,
+     1 : X window,
+     2 : PS file. (named dcl.ps)
+     3 : Tektronix terminal
+     4 : GTK Windows
+:--clrmap [1-]:
+  set colormap to draw tone/contour.
+:--itr [1-4,5-7,10-15,20-23,30-33]:
+  set axis scale. default is 1.
+  1 : linear scale for x/y axis
+  2 : linear scale for x , log scale for y axis
+  3 : log scale for x , linear scale for y axis
+  4 : log scale for x/y axis
+:--similar [simfac,vxoff,vyoff]:
+  (for 5<=itr<=7) set similarity parameters which are fed in DCL.grssim.
+:--map_axis [uxc,uyc,rot]:
+  (for 10<=itr<=33) set mapping parameters which are fed in DCL.umpcnt.
+:--map_radius <radius>:
+  (for itr>=20) set clipping radius (degree) around the tangential point.
+  Deafault=90.
+:--xcoord [xcoord]
+  name of x-coordinate (use for associate coordinates)
+:--ycoord [ycoord]
+  name of y-coordinate (use for associate coordinates)
+:--title:
+  set title of figure
+:--aspect <aspect>:
+  set aspect ratio of Viewport. default is 2.0.
+:--noannotate:
+  not draw annotations.
+:--animate/anim <dim>:
+  plot animation along <dim>. <dim> must be name of dimension.
+:--alternate, --Ga:
+  enable to backing store.
+:--nowait, --Gw:
+  not wait for any actions if animate
+:--delay <number>:
+  wait <number> seconds for each new page drawing of animation
+:--reverse, --Gr:
+  plot animation reversible if animate
+:--smooth, --Gaw:
+  equal to --anlternate && --nowait
+:--exch:
+  exchange(transpose) x/y axis.
+:--mean <dim>:
+  mean along axis <dim>.
+:--stddev <dim>:
+  standard deviation along axis <dim>.
+:--eddy <dim>:
+  deviation from mean along axis <dim>.
+:--diff:
+  calculate the difference of two variables.
+  you must provide two gturls whose size and dimension are same.
+:--m, --map <map_type>:
+  plot map. itr number must be set.  this option is neglect if itr
+  number is 1-4.  abailable map type is coast_world, border_world,
+  plate_world, state_usa, coast_japan, pref_japan
+:--operation <math_func>:
+  operation of the specified math function on the data.
+  <math_func> should be a math function with one argument
+  such as log10, sqrt, sin, etc.
+:--time_ax [nil|false|h|ymd]:
+  specify type of calendar-type time axis:
+    nil   (=> auto slection)
+    false (=> do not use the time axis even if
+              the units of the axis is a time one with since field)
+    "h"   (=> like nil, but always use the hour-resolving datetime_ax method
+              in dclext_datetime_ax.rb)
+    "ymd" (=> like "h" but for y-m-d type using DCL.uc[xy]acl)
+:-xx:yyyy=value:
+  specify Dennou Club Library internal variable.
+  'xx' is a package name prefix of DCL (eg. sg=>sgpack).
+  'yy' is a variable name of DCL.
+  'value' is a value of the DCL variable.
+== LINE/MARK OPTIONS
+:--line:
+  make line plot forced. (about first 1D)
+:--mark:
+  make mark plot forced. (about first 1D)
+:--index:
+  set DCL line index, which set the color/thickness of the line
+  primitive. please see DCL documents.
+:--type:
+  set line type.
+:--range [min:max]
+  set min/max value for line plot. min or max must be set.
+:--overplot
+  set number of lines on each figure.
+:--overplot_color, --Opc
+  multiple lines are distinguished with color rather than line type.
+== CONTOUR/TONE OPTIONS
+:--shade:
+  make contour and tone plot.
+:--noshade:
+  make contour plot, without tone.
+:--nocont:
+  make tone plot, without contour.
+:--range [min:max]:
+  set min/max value for contour/tone plot. min or max must be set.
+:--crange:
+  set min/max value for contour plot. this is more dominant than --range
+:--srange:
+  set min/max value for tone plot. this is more dominant than --interval/int
+:--interval,--int [num]:
+  set interval value for contour/tone plot. set the number of lines if
+  you set negative value.
+:--cint:
+  set interval value for contour plot. this is more dominant
+  than --interval/int
+:--sint:
+  set interval value for tone plot. this is more dominant than --interval/int.
+:--levels:
+  set values of contour/tone levels.
+:--clevels:
+  set values of contour levels.
+:--slevels:
+  set tone of contour levels.
+:--patterns:
+  set each patterns for tone plot.
+:--tone [a|e|f|b|c]:
+  set tone subroutine:
+    a (=> tone routine is selected automatically depending on the datasize)
+    e (=> DCL.uetone is used)
+    f (=> DCL.uetonf is used)
+    b (=> DCL.uetonb is used)
+    c (=> DCL.uetonc is used)
+:--nocolorbar:
+  do not draw color bar
+:--nozero:
+  do not draw zero contour
+:--udsfmt [strings]:
+  change contour label format. see UDCNTR/DCL manual for the format.
+= EXAMPLES
+For a single GPhys variable,
+    % gpview data.nc@temp
+    % gpview data.nc@temp,lon=130:150,lat=0:90:2
+    % gpview --nocont data.nc@temp,lon=130:150,lat=0
+    % gpview --noshade data.nc@temp,lon=130:150,lat=0
+    % gpview --mean lon data.nc@temp,lon=130:150,lat=0
+    % gpview --exch data.nc@temp,lon=130:150,lat=0
+    % gpview --animate lon data.nc@temp,lon=130:150
+    % gpview --animate lon --alternate data.nc@temp
+    % gpview --smooth lon data.nc@temp,lon=130:150
+    % gpview --levels 0,10,20,30 --pattern 30999,40999,50999,60999,70999 data.nc@temp
+    % gpview --overplot=3 --anim t data.nc@temp,lon=0
+    % gpview --overplot=3 --Opc --anim t data.nc@temp,lon=0
+    % gpview --mark data.nc@temp,lon=0,lat=0
+    % gpview --operation log10 data.nc@temp,lon=0
+    % gpview --time_ax false data.nc@temp,lon=0,lat=0
+Example to set DCL internal variable,
+    % gpview -ud:lmsg=false --itr 5 --exch data.nc@temp,lon=0
+For multiple GPhys variables,
+    % gpview data1.nc@temp data2.nc@temp
+    % gpview data1.nc@temp,lon=130:150 data2.nc@temp,lon=150:170
+    % gpview --overplot=3 --anim t data.nc@temp,lon=0 data.nc@temp,lon=10
+    % gpview --var temp,lon=130:150 data?.nc
+    % gpview --anim t --var temp,lon=130:150 data*.nc
+=end
+#
+# = HISTORY
+#
+#   2004/12/14  D Tsukahara && T Horinouti(parse_gturl)
+#   2005/01/08  D Tsukahara (add option --exch and able to invalid value)
+#   2005/01/09  D Tsukahara (add option --animate, smooth, alternate, index )
+#   2005/01/10  D Tsukahara (transpose axis with attr "positive:down" ,
+#                            abailable loopsense_flag. )
+#   2005/01/10  D Tsukahara (implement GGraph::color_bar, and margin_info,
+#                            which file name, date, and toolname. )
+#   2005/01/11  D Tsukahara ( 1. write document about OPTIONS.
+#                             2. add many options. more info please see document. )
+#   2005/01/23  S Takehiro  (add option --similar, map_axis)
+#   2005/02/09  D Tsukahara && M Nakano (add option --reverse, --Gr, --map)
+#   2005/02/10  D Tsukahara (change option parser (getopts => getoptlong))
+#   2005/02/24  D Tsukahara (apply --range for line plot)
+#   2005/06/15  S Takehiro (add option --levels, --clevels, --slevels, --patterns)
+#   2005/06/17  S Takehiro (missing_value attribute setting removed)
+#   2005/06/22  S Takehiro (debug, clipping control added to GGraph::annotate)
+#   2005/06/23  S Takehiro (debug, option --title implemented)
+#   2005/07/15  S Takehiro (option --noannotate implemented)
+#   2005/08/07  S Takehiro (option --overplot implemented)
+#   2005/08/09  S Takehiro && T Horinouchi (add option --help and help function.
+#                                             URL information corrected. )
+#   2005/08/23  S Takehiro (multiple Gphys variables plotting
+#                            and option --var implemented)
+#   2005/08/23  S Takehiro (common methods to gp* command moved to gpcommon.rb)
+#   2005/10/30  S Takehiro (option --animate recoverd)
+#   2005/10/31  S Takehiro (option --smooth bug fixed)
+#   2006/03/07  M Nakano (option --int bug fixed)
+#   2007/10/03  S Takehiro (option --nocolorbar implemented)
+#   2008/04/03  S Takehiro (option --nozero implemented)
+#   2008/12/14  S Takehiro (option --mark implemented)
+#   2010/03/10  Y SASAKI (change help block into RD format)
+#   2011/01/14  T Tanigawa && S Takehiro (option --operation implemented)
+#   2011/11/04  S Takehiro (option --time_ax implemented)
+#   2011/11/20  S Takehiro (option --eddy implemented)
+#   2012/02/19  S Takehiro (description for gturl format updated)
+#   2013/01/29  T Tanigawa && S Takehiro (calculation of aspect ratio
+#                                         of viewport improved)
+#   2013/01/29  S Nishizawa && S Takehiro (sequential operation implemented)
+#   2014/02/21  Y Naito && S Takehiro (implement DCL internal variable setting,
+#                                      add option --udsfmt)
+#   2014/02/21  S Noda && S Takehiro (add option --stddev)
+#   2014/02/23  S Takehiro (option --tonf is changed to --tone)
+#   2014/03/05  S Takehiro (add option --map_radius)
+#   2014/03/10  Y Kawai && S Takehiro (setting labels for contours)
+#   2014/04/06  S Takehiro (option --map_radius bug fix)
+#   2014/06/27  S Nishizawa && S Takehiro (add options --xcoord, --ycoord)
+#   2014/11/28  H Kashimura && S Takehiro (add option --diff, --tone bug fix)
+#   2014/11/28  Y O Takahashi && S Takehiro (add option --overplot_color, --Opc)
+#   2015/03/10  S Takehiro (History removes from the output of --help option)
+#   2015/09/05  Y O Takahashi && S Takehiro (add option --delay)
+#   2015/09/06  Y O Takahashi && S Takehiro (defalt wsn number changed)
+#   2017/06/07  S Takehiro (int option bug fix)
+#
+#################################################
+require "getoptlong"        # for option_parse
+require "numru/ggraph"      # ggraph library
+require "numru/gphys/gpcommon"
+include NumRu
+#####################################################
+## Default param.
+VIEWPORT = [0.15,0.85,0.2,0.55]
+URLfmt = "path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
+#####################################################
+def GGraph::annotate(str_ary)
+  lclip = DCL.sgpget('lclip')
+  DCL.sgpset('lclip',nil)
+  lnum = 0
+  str_ary.each{ |str|lnum += 1 }
+    charsize = 0.7 * DCL.uzpget('rsizec1')
+  dvx = 0.01
+  dvy = charsize*1.5
+  raise TypeError,"Array expected" if ! str_ary.is_a?(Array)
+  vxmin,vxmax,vymin,vymax = DCL.sgqvpt
+  vx = 0.70
+  vy = 0.045 + (lnum-1)*dvy
+  str_ary.each{|str|
+    DCL::sgtxzv(vx,vy,str,charsize,0,-1,1)
+    vy -= dvy
+  }
+  DCL.sgpset('lclip',lclip)
+  nil
+end
+def each_along_dims(gphys, loopdim)
+  raise ArgumentError,"1st argument must be an GPhys." if !gphys.is_a?(GPhys)
+  if loopdim.is_a?(String)
+    dimname = loopdim
+  elsif
+    if loopdim < 0
+      dimname = gphys.coord(gphys.rank + loopdim).name
+    else
+      dimname = gphys.coord(loopdim).name
+    end
+  else
+    raise ArgumentError,"loopdims must consist of Integer and/or String"
+  end
+  loopdim_na = gphys.coord(dimname).val                      # get coord ary
+  loopdim_na = loopdim_na[-1..0] if $OPT_reverse || $OPT_Gr  # reverse
+  loopdim_na.each { |x|
+    yield( gphys.cut(dimname=>x) )
+  }
+end
+def draw_setup
+  # set missing value
+  DCLExt.gl_set_params('lmiss'=>true)
+  # fontsize
+  DCL.sgpset('lcntl', false)
+#  DCL.uzfact(0.7)
+  DCL.sgpset('lfull', true)               # use full area in the window
+  DCL.sgpset('lfprop',true)               # use proportional font
+  DCL.uscset('cyspos', 'B' )              # move unit y axis
+  # viewport size
+  GGraph.set_fig('viewport'=>$VIEWPORT)
+  GGraph.set_fig( 'itr'=>($OPT_itr == nil) ? 1 : $OPT_itr.to_i )
+  GGraph.set_fig("xrev"=>"units:mb,units:hPa,units:millibar,positive:down",
+                 "yrev"=>"units:mb,units:hPa,units:millibar,positive:down")
+  # set options
+  min_range,  max_range  = __split_range($OPT_range)
+  min_crange, max_crange = __split_range($OPT_crange)
+  min_srange, max_srange = __split_range($OPT_srange)
+  if ( $OPT_cint   || $OPT_interval || $OPT_int )
+    cont_interval = ( $OPT_cint   || $OPT_interval || $OPT_int ).to_f
+  else
+    cont_interval = nil
+  end
+  if ( $OPT_sint   || $OPT_interval || $OPT_int )
+    tone_interval =  ( $OPT_sint   || $OPT_interval || $OPT_int ).to_f
+  else
+    tone_interval = nil
+  end
+  GGraph.set_linear_contour_options(
+                                    'int' => cont_interval,
+                                    'min' => ( min_crange  || min_range ),
+                                    'max' => ( max_crange  || max_range )
+                                    )
+  GGraph.set_linear_tone_options(
+                                    'int' => tone_interval,
+                                    'min' => ( min_srange  || min_range ),
+                                    'max' => ( max_srange  || max_range )
+                                 )
+  if ( $OPT_clevels || $OPT_levels )
+    $OPT_label=($OPT_clevels || $OPT_levels).split(',')
+    $OPT_clevels=($OPT_clevels || $OPT_levels).split(',').map!{|v| v.to_f }
+  end
+  if ( $OPT_slevels || $OPT_levels )
+    $OPT_slevels=($OPT_slevels||$OPT_levels).split(',').map!{|v| v.to_f }
+  end
+  if ( $OPT_patterns )
+    $OPT_patterns=$OPT_patterns.split(',').map!{|v| v.to_f }
+  end
+  # similar projection
+  if ($OPT_similar)
+    if /([\d\-.]*),([\d\-.]*),([\d\-.]*)/ =~ $OPT_similar
+      similar=[$1.to_f,$2.to_f,$3.to_f]
+    elsif /([\d\-.]*),([\d\-.]*)/ =~ $OPT_similar
+      similar=[$1.to_f,$2.to_f,0]
+    elsif /([\d\-.]*)/ =~ $OPT_similar
+      similar=[$1.to_f,0,0]
+    end
+    GGraph.set_fig('similar'=>similar)
+  end
+  # similar projection
+  if ($OPT_map_axis)
+    if /([\d\-.]*),([\d\-.]*),([\d\-.]*)/ =~ $OPT_map_axis
+      map_axis=[$1.to_f,$2.to_f,$3.to_f]
+    elsif /([\d\-.]*),([\d\-.]*)/ =~ $OPT_map_axis
+      map_axis=[$1.to_f,$2.to_f,0]
+    elsif /([\d\-.]*)/ =~ $OPT_similar
+      map_axis=[$1.to_f,0,0]
+    end
+    GGraph.set_fig('map_axis'=>map_axis)
+  end
+  # clipping parameter
+  if ( $OPT_map_radius )
+    map_radius=$OPT_map_radius.to_f
+  else
+    map_radius=90.0
+  end
+  GGraph.set_fig('map_radius'=>map_radius)
+  # map
+  if ( $OPT_m || $OPT_map)
+    map_type = "coast_world"     if $OPT_m
+    map_type = $OPT_map          if $OPT_map
+    GGraph::set_map(map_type=>true)
+  end
+  # time axis
+  if ($OPT_time_ax)
+    $OPT_time_ax = false if $OPT_time_ax == "false"
+    GGraph.set_axes('time_ax'=>$OPT_time_ax)
+  end
+end
+def draw(gp, draw_flag)
+  # draw hontai
+  case draw_flag
+  when "line"
+    if ( $Overplot == 1 )
+      GGraph.line(gp,
+                  true,
+                  "title"=>$OPT_title,
+                  "index"=>($OPT_index||1),
+                  "type" =>($OPT_type ||1),
+                  "exchange"=>$OPT_exch,
+                  "annotate"=>$annotate,
+                  "min" => __split_range($OPT_range)[0],
+                  "max" => __split_range($OPT_range)[1]
+                  )
+    elsif ( $OPT_overplot_color || $OPT_Opc )
+      GGraph.line(gp,
+                  false,
+                  "title"=>$OPT_title,
+                  "index"=>($OPT_index.to_i+$Overplot*10),
+                  "type" =>($OPT_type ||1),
+                  "exchange"=>$OPT_exch,
+                  "annotate"=>$annotate,
+                  "min" => __split_range($OPT_range)[0],
+                  "max" => __split_range($OPT_range)[1]
+                  )
+    else
+      GGraph.line(gp,
+                  false,
+                  "title"=>$OPT_title,
+                  "index"=>($OPT_index||1),
+                  "type" =>($OPT_type ||$Overplot),
+                  "exchange"=>$OPT_exch,
+                  "annotate"=>$annotate,
+                  "min" => __split_range($OPT_range)[0],
+                  "max" => __split_range($OPT_range)[1]
+                  )
+    end
+    if ( $Overplot < $Overplot_max )
+      $Overplot += 1
+    else
+      $Overplot = 1
+    end
+  when "mark"
+    if ( $Overplot == 1 )
+      GGraph.mark(gp,
+                  true,
+                  "title"=>$OPT_title,
+                  "index"=>($OPT_index||1),
+                  "type" =>($OPT_type ||1),
+                  "exchange"=>$OPT_exch,
+                  "annotate"=>$annotate,
+                  "min" => __split_range($OPT_range)[0],
+                  "max" => __split_range($OPT_range)[1]
+                  )
+    else
+      GGraph.mark(gp,
+                  false,
+                  "title"=>$OPT_title,
+                  "index"=>($OPT_index||1),
+                  "type" =>($OPT_type ||$Overplot),
+                  "exchange"=>$OPT_exch,
+                  "annotate"=>$annotate,
+                  "min" => __split_range($OPT_range)[0],
+                  "max" => __split_range($OPT_range)[1]
+                  )
+    end
+    if ( $Overplot < $Overplot_max )
+      $Overplot += 1
+    else
+      $Overplot = 1
+    end
+  when "full"
+    GGraph.tone(gp,
+                true,
+                "title"=>$OPT_title,
+                "annotate"=>$annotate,
+                "transpose"=>$OPT_exch,
+                "levels"=>$OPT_slevels,
+                "patterns"=>$OPT_patterns,
+                "auto"=>$auto,
+                "tonf"=>$tonf,
+                "tonb"=>$tonb,
+                "tonc"=>$tonc,
+                "xcoord"=>$OPT_xcoord,
+                "ycoord"=>$OPT_ycoord
+                )
+    GGraph.contour(gp,
+		   false,
+		   "transpose"=>$OPT_exch,
+		   "levels"=>$OPT_clevels,
+		   "nozero"=>$OPT_nozero,
+                   "label"=>$OPT_label,
+                   "xcoord"=>$OPT_xcoord,
+                   "ycoord"=>$OPT_ycoord
+		   )
+  when "nocont"
+    GGraph.tone(gp,
+                true,
+                "title"=>$OPT_title,
+                "annotate"=>$annotate,
+                "transpose"=>$OPT_exch,
+                "levels"=>$OPT_slevels,
+                "patterns"=>$OPT_patterns,
+                "auto"=>$auto,
+                "tonf"=>$tonf,
+                "tonb"=>$tonb,
+                "tonc"=>$tonc,
+                "xcoord"=>$OPT_xcoord,
+                "ycoord"=>$OPT_ycoord
+                )
+  when "noshade"
+    mj = DCL.udpget('indxmj')
+    mn = DCL.udpget('indxmn')
+    GGraph.contour(gp,
+                   true,
+                   "title"    =>$OPT_title,
+                   "annotate"=>$annotate,
+		   "transpose"=>$OPT_exch,
+                   "levels"=>$OPT_clevels,
+                   "nozero"=>$OPT_nozero,
+                   "label"=>$OPT_label,
+                   "xcoord"=>$OPT_xcoord,
+                   "ycoord"=>$OPT_ycoord
+                   )
+  end
+  # color bar
+  if ( ( draw_flag == "full") || ( draw_flag == "nocont") ) && $colorbar
+    GGraph::color_bar(
+                      "left"      => true,
+                      "landscape" => true
+                      )
+  end
+end
+def set_vpsize( default_vp, aspect=2.0 )
+  raise "#{aspect} must be a positive Numeric" if (aspect.to_f <= 0.0)
+  aspect = aspect.to_f
+  # default viewport
+  x0 = default_vp[0]; x1 = default_vp[1]
+  y0 = default_vp[2]; y1 = default_vp[3]
+  # viewport size
+  hlength =   x1 - x0
+  vlength =   y1 - y0
+  # center grid of viewport
+  cen_of_vp = [ x0 + hlength/2.0, y0 + vlength/2.0  ]
+  if aspect <= hlength / vlength
+    hlength = vlength * aspect
+    x0 = cen_of_vp[0] - hlength/2.0
+    x1 = cen_of_vp[0] + hlength/2.0
+  else
+    vlength = hlength / aspect
+    y0 = cen_of_vp[1] - vlength/2.0
+    y1 = cen_of_vp[1] + vlength/2.0
+  end
+  return [ x0, x1, y0, y1 ]
+end
+def __split_range(range)
+  if /(.*):(.*)/ =~ range
+    if $1 == ""
+      min = nil
+    else
+      min = $1.to_f
+    end
+    if $2 == ""
+      max = nil
+    else
+      max = $2.to_f
+    end
+  elsif range == nil
+    min = max = nil
+  else
+    raise "invalid range: variable subset specification error. split range with ':'\n\n"
+  end
+  return min, max
+end
+def check_dclopts
+  indices = []
+    ARGV.each_index{|i|
+    if /^-(.)(.):(.*)=(.*)/ =~ ARGV[i]
+      indices << i
+    end
+    }
+  dclopts = []
+    indices.reverse_each{|i|
+    dclopts << ARGV[i]
+    ARGV.slice!(i)
+    }
+  dclopts.each{|opt|
+    pkg = opt[1..2]
+    name = opt[4..-1].split('=')[0]
+    value = opt[4..-1].split('=')[1]
+    dcl_set_params(pkg,name,value)
+  }
+end
+def dcl_set_params(pkg,name,value)
+  set = 'stx'
+  case name
+  when /^c/i
+    eval( "DCL.#{pkg}c#{set}(name,value.to_s)" )
+  when /^l/i
+    if /(.*)(T|t)(.*)/ =~ value
+      eval( "DCL.#{pkg}l#{set}(name,true)" )
+    else
+    if /(.*)(F|f)(.*)/ =~ value
+      eval( "DCL.#{pkg}l#{set}(name,false)" )
+    else
+      raise "value of logical parameter must include 't' or 'f'"
+    end
+    end
+  when /^[i-n]/i
+    eval( "DCL.#{pkg}i#{set}(name,value.to_i)" )
+  else
+    eval( "DCL.#{pkg}r#{set}(name,value.to_f)" )
+  end
+end
+#####################################################
+###++++++           Main Routine            ++++++###
+## options for DCL
+check_dclopts
+## parse options
+parser = GetoptLong.new
+parser.set_options(
+                   ###    global option   ###
+                   ['--var',                      GetoptLong::REQUIRED_ARGUMENT],
+                   ['--wsn',                      GetoptLong::REQUIRED_ARGUMENT],
+                   ['--clrmap',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--itr',                      GetoptLong::REQUIRED_ARGUMENT],
+                   ['--similar',                  GetoptLong::REQUIRED_ARGUMENT],
+                   ['--map_axis',                 GetoptLong::REQUIRED_ARGUMENT],
+                   ['--map_radius',               GetoptLong::REQUIRED_ARGUMENT],
+                   ['--xcoord',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--ycoord',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--title',                    GetoptLong::REQUIRED_ARGUMENT],
+                   ['--aspect',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--anim',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--animate',                  GetoptLong::REQUIRED_ARGUMENT],
+                   ['--noannotate',               GetoptLong::NO_ARGUMENT],
+                   ['--alternate',                GetoptLong::NO_ARGUMENT],
+                   ['--Ga',                       GetoptLong::NO_ARGUMENT],
+                   ['--nowait',                   GetoptLong::NO_ARGUMENT],
+                   ['--Gw',                       GetoptLong::NO_ARGUMENT],
+                   ['--smooth',                   GetoptLong::NO_ARGUMENT],
+                   ['--Gaw',                      GetoptLong::NO_ARGUMENT],
+                   ['--delay',                    GetoptLong::REQUIRED_ARGUMENT],
+                   ['--exch',                     GetoptLong::NO_ARGUMENT],
+                   ['--reverse',                  GetoptLong::NO_ARGUMENT],
+                   ['--Gr',                       GetoptLong::NO_ARGUMENT],
+                   ['--mean',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--stddev',                   GetoptLong::REQUIRED_ARGUMENT
+],
+                   ['--eddy',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--diff',                     GetoptLong::NO_ARGUMENT],
+                   ['--map',                      GetoptLong::REQUIRED_ARGUMENT],
+                   ['--m',                        GetoptLong::NO_ARGUMENT],
+                   ['--operation',                GetoptLong::REQUIRED_ARGUMENT],
+                   ['--time_ax',                  GetoptLong::REQUIRED_ARGUMENT],
+                   ###     line/mark option    ###
+                   ['--line',                     GetoptLong::NO_ARGUMENT],
+                   ['--mark',                     GetoptLong::NO_ARGUMENT],
+                   ['--index',                    GetoptLong::REQUIRED_ARGUMENT],
+                   ['--type',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--overplot',                 GetoptLong::REQUIRED_ARGUMENT],
+                   ['--overplot_color',           GetoptLong::NO_ARGUMENT],
+                   ['--Opc',                      GetoptLong::NO_ARGUMENT],
+                   ### tone or cont option ###
+                   ['--nocont',                   GetoptLong::NO_ARGUMENT],
+                   ['--noshade',                  GetoptLong::NO_ARGUMENT],
+                   ['--range',                    GetoptLong::REQUIRED_ARGUMENT],
+                   ['--crange',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--srange',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--interval',                 GetoptLong::REQUIRED_ARGUMENT],
+                   ['--int',                      GetoptLong::REQUIRED_ARGUMENT],
+                   ['--cint',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--sint',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--levels',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--clevels',                  GetoptLong::REQUIRED_ARGUMENT],
+                   ['--slevels',                  GetoptLong::REQUIRED_ARGUMENT],
+                   ['--patterns',                 GetoptLong::REQUIRED_ARGUMENT],
+                   ['--tone',                     GetoptLong::REQUIRED_ARGUMENT],
+                   ['--udsfmt',                   GetoptLong::REQUIRED_ARGUMENT],
+                   ['--nocolorbar',               GetoptLong::NO_ARGUMENT],
+                   ['--nozero',                   GetoptLong::NO_ARGUMENT],
+                   ['--help',                     GetoptLong::NO_ARGUMENT]
+#                   ['--version',                  GetoptLong::NO_ARGUMENT]  # to be defined
+                   )
+begin
+  parser.each_option do |name, arg|
+    eval "$OPT_#{name.sub(/^--/, '').gsub(/-/, '_')} = '#{arg}'"  # strage option value to $OPT_val
+  end
+rescue
+  help
+  raise
+end
+## Print out help message
+if ($OPT_help)
+  help
+  exit(1)
+end
+## set some figure option
+DCL::swlset('lwait', false) if ($OPT_nowait    || $OPT_Gw || $OPT_smooth || $OPT_Gaw)
+                                           # set wait or nowait
+DCL::swlset('lalt',  true)  if ($OPT_alternate || $OPT_Ga || $OPT_smooth || $OPT_Gaw)
+                                           # set backing store option
+if ($OPT_noannotate)
+  $annotate = false
+else
+  $annotate = true
+end
+$Overplot_max = ( $OPT_overplot.to_i || 1 )
+$Overplot = 1
+if ($OPT_nocolorbar)
+  $colorbar = false
+else
+  $colorbar = true
+end
+if ($OPT_tone)
+  case $OPT_tone
+  when "a"
+    $auto, $tonf, $tonb, $tonc = true,false,false,false
+  when "e"
+    $auto, $tonf, $tonb, $tonc = false,false,false,false
+  when "f"
+    $auto, $tonf, $tonb, $tonc = false,true,false,false
+  when "b"
+    $auto, $tonf, $tonb, $tonc = false,false,true,false
+  when "c"
+    $auto, $tonf, $tonb, $tonc = false,false,false,true
+  else
+    raise "The value of option --tone should be 'a','e','f','b' or 'c'."
+  end
+else
+  $auto, $tonf, $tonb, $tonc = true,false,false,false
+end
+## decide VIEWPORT
+$VIEWPORT = set_vpsize( VIEWPORT, ($OPT_aspect||2.0) )
+## tune the size of axis parameters.
+DCL.uzfact(0.7)
+## set the format of contour labels.
+udsfmt = ($OPT_udsfmt||DCL.udqfmt())
+DCL.udsfmt(udsfmt)
+## draw figure
+loopdim   = ( $OPT_animate || $OPT_anim )
+loopdim = loopdim.to_i if loopdim.to_i.to_s == loopdim
+### set colormap
+DCL.sgscmn($OPT_clrmap||1)
+## open work station
+if NumRu::DCL::DCLVERSION.to_f >= 6
+  DCL.gropn($OPT_wsn||1)
+else
+  DCL.gropn($OPT_wsn||4)
+end
+## open netcdf variables
+while ARGV[0] do
+  gturl = ARGV[0]
+  gturl = gturl+'@'+$OPT_var if $OPT_var
+  gp = GPhys::IO.open_gturl(gturl)
+  print "  Reading #{gturl}\n"
+  ARGV.shift
+  ## for case of calculating difference of two gphys object
+  if ($OPT_diff)
+    raise "--diff option must be used with even numbers (2, 4, 6,...) of gturls" if ARGV[0] == nil
+    prev_gturl = gturl
+    gturl = ARGV[0]
+    gturl = gturl+'@'+$OPT_var if $OPT_var
+    print "  Reading #{gturl}\n"
+    gp = gp - GPhys::IO.open_gturl(gturl)
+    print "  Taking difference: #{prev_gturl} - #{gturl}\n"
+    gturl = prev_gturl+" - "+gturl
+    ARGV.shift
+  end
+  ## mean along any axis
+  if ($OPT_mean)
+    dims_mean = ($OPT_mean).split(/\s*,\s*/)
+    dims_mean = dims_mean.map{|dim| dim.to_i.to_s == dim ? dim.to_i : dim}
+  end
+  ## standard deviation along any axis
+  if ($OPT_stddev)
+    dims_stddev = ($OPT_stddev).split(/\s*,\s*/)
+    dims_stddev = dims_stddev.map{|dim| dim.to_i.to_s == dim ? dim.to_i : dim}
+  end
+  ## deviation from mean along any axis
+  if ($OPT_eddy)
+    dims_eddy = ($OPT_eddy).split(/\s*,\s*/)
+    dims_eddy = dims_eddy.map{|dim| dim.to_i.to_s == dim ? dim.to_i : dim}
+  end
+  GGraph.margin_info($0, gturl) if $annotate  # draw margin infomation
+  draw_setup                                  # determine figure kind
+  kind_of_fig = nil
+  proc = Proc.new do |g|
+      ## mean along any axis
+      if ($OPT_mean)
+        dims_mean.each{|dim|
+          g = g.mean(dim)
+        }
+      end
+      ## standard deviation along any axis
+      if ($OPT_stddev)
+        dims_stddev.each{|dim|
+          g = g.stddev(dim)
+        }
+      end
+      ## deviation from mean along any axis
+      if ($OPT_eddy)
+        dims_eddy.each{|dim|
+          g = g.eddy(dim)
+        }
+      end
+      ## operation of a mathematical function
+      if ($OPT_operation)
+        eval "g = g.#{$OPT_operation}"
+      end
+      # judge draw kind
+      unless kind_of_fig
+        gp_rank = g.rank
+        if ($OPT_mark)
+          kind_of_fig = "mark"
+        elsif ($OPT_line || gp_rank == 1)
+          kind_of_fig = "line"
+        elsif (!$OPT_line && gp_rank >= 2) && !$OPT_noshade && $OPT_nocont
+          kind_of_fig = "nocont"
+        elsif (!$OPT_line && gp_rank >= 2) && $OPT_noshade && !$OPT_nocont
+          kind_of_fig = "noshade"
+        elsif (!$OPT_line && gp_rank >= 2) && !$OPT_noshade && !$OPT_nocont
+          kind_of_fig = "full"
+        end
+      end
+      draw(g, kind_of_fig)
+  end
+  if loopdim           # animation
+    each_along_dims(gp, loopdim){|gp_subset|
+      proc.call(gp_subset)
+      sleep($OPT_delay.to_f) if ($OPT_delay && !DCL::swlget('lwait'))
+    }
+  else
+    proc.call(gp)
+  end
+end
+DCL.grcls

data/lib/numru/ganalysis/eof.rb CHANGED

@@ -93,10 +93,14 @@ module NumRu
         w /= w.mean
         w.reshape!(n)
       else
-        if !(opts[:disable_weight]||opts["disable_weight"]) && /^lon/ =~ new_grid.coord(0).name && /^lat/ =~ new_grid.coord(1).name
+        nc0 = new_grid.coord(0)
+        nc1 = new_grid.coord(1)
+        if !(opts[:disable_weight]||opts["disable_weight"]) &&
+           ( /^lon/ =~ nc0.name || /^degree.*_east/ =~ nc0.units.to_s ) &&
+           ( /^lat/ =~ nc1.name || /^degree.*_north/ =~ nc1.units.to_s )
           rad = NumRu::Units.new("radian")
-          nlon = new_grid.coord(0).length
-          lat = new_grid.coord(1).convert_units(rad).val
+          nlon = nc0.length
+          lat = nc1.convert_units(rad).val
           w = NArray.new(lat.typecode,nlon).fill!(1) * NMath::cos(lat).reshape(1,lat.length)
           w /= w.mean
           w.reshape!(n)
@@ -112,7 +116,8 @@ module NumRu
         index[dims1] = ind
         val = gphys[*index].val
         val.reshape!(n_lost)
-        val -= val.mean
+        vm = val.mean
+        val -= vm unless vm.nil?
         ary[true,n1] = val
         break if n1==n-1
         ind[0] += 1
@@ -125,8 +130,7 @@ module NumRu
           end
         }
       }
-      ary.mul!(w.reshape(1,n)) if w
+      ary = ary.mul!(w.reshape(1,n)) if w
       nmodes = opts[:nmodes] || opts["nmodes"] || n
       case @@EOF_engin

data/lib/numru/ggraph.rb CHANGED

@@ -3307,7 +3307,7 @@ module NumRu
       xr = NArray.sfloat(2)  # --> x ends of the regression line
       yr = NArray.sfloat(2)  # --> y ends of the regression line
       if y_given_x
-        a,b,r2 = linear_regression(xs,ys)
+        a,b,r = linear_regression(xs,ys)
         if opts["limit"]
           xr[0] = x.min
           xr[1] = x.max
@@ -3318,7 +3318,7 @@ module NumRu
         yrs = a + b*xrs
         yr = !ylog ? yrs : NMath::exp(yrs)
       else
-        a,b,r2 = linear_regression(ys,xs)
+        a,b,r = linear_regression(ys,xs)
         if opts["limit"]
           yr[0] = y.min
           yr[1] = y.max
@@ -3346,8 +3346,8 @@ module NumRu
           annot = ["regr  x=a+by:",
                    "  a=#{DCL.chval('A',a)}", "  b=#{DCL.chval('A',b)}"]
         end
-        annot.push(sprintf("r=%-.3g",Math.sqrt(r2))) if ac
-        annot.push(sprintf("r2=%-.3g",r2)) if ar2
+        annot.push(sprintf("r=%-.3g",r)) if ac
+        annot.push(sprintf("r2=%-.3g",r**2)) if ar2
         annotate(annot, @@nannot)
       elsif as
         if y_given_x
@@ -3355,12 +3355,12 @@ module NumRu
         else
           annot = ["regress x given y:", " x(y) slope: #{DCL.chval('A',b)}"]
         end
-        annot.push(sprintf("r=%-.3g",Math.sqrt(r2))) if ac
-        annot.push(sprintf("r2=%-.3g",r2)) if ar2
+        annot.push(sprintf("r=%-.3g",r)) if ac
+        annot.push(sprintf("r2=%-.3g",r**2)) if ar2
         annotate(annot, @@nannot)
       end
-      [a,b,r2]
+      [a,b,r]
     end
   end
@@ -3372,8 +3372,8 @@ module NumRu
     b = cxy/cxx
     a = my - b*mx
     cyy, ndiv = NMMath.covariance(y,y)
-    r2 = cxy/Math.sqrt(cxx*cyy)
-    [a,b,r2]
+    r = cxy/Math.sqrt(cxx*cyy)
+    [a,b,r]
   end
   def linear_reg_slope_error(x,y,a,b)

data/lib/numru/gphys/assoccoords.rb CHANGED

@@ -19,19 +19,22 @@ module NumRu
       if assoc_crds.uniq.length != assoc_crds.length
 	raise ArgumentError, "Names are not uniq: #{assoc_crds.inspect}."
       end
+      @axnames = axnames.dup
       assoc_crds.each do |gp|
 	raise(ArgumentError,"Non-GPhys included") if !gp.is_a?(GPhys)
 	if axnames.include?(gp.name)
 	  raise ArgumentError,
 	      "'#{gp.name}' overwraps an axis name #{axnames.inspect}."
 	end
+        if (gp.axnames - @axnames).length > 0
+          raise ArgumentError, "Provided assoc coord '#{gp.name}' has an axis (axes) #{gp.axnames - @axnames} not in the present object #{@axnames}"
+        end
       end
       # < some internal variables >
       @assoc_crds = Hash.new
       assoc_crds.each{|gp| @assoc_crds[gp.name] = gp}
-      @axnames = axnames.dup
       @lost_assoc_crds = nil
       # < lengths of original axes >

data/lib/numru/gphys/gphys.rb CHANGED

@@ -747,6 +747,9 @@ module NumRu
       def rank
 	@grid.rank
       end
+      def rank_len_ne_1
+	(shape_current - [1]).length
+      end
       def axis(i)
 	@grid.axis(i)
       end

data/lib/numru/gphys/varray.rb CHANGED

@@ -552,10 +552,10 @@ These methods returns a NArray (not a VArray).
 	    un0 = UNumeric.from_date(date0,to,calendar)
 	    offset = un0.to_f
 	    gp = self + offset
+	    gp.units = to
 	  else
 	    gp = myunits.convert2(self, to)
 	  end
-	  gp.units = to
 	  gp
 	else
 	  self   # returns self (no duplication)

data/lib/numru/gphys/version.rb CHANGED

@@ -1,6 +1,6 @@
 module NumRu
   class GPhys
     # Add subsubminor version while under development; remove it and advance version to release
-    VERSION = "1.5.3"
+    VERSION = "1.5.4"
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gphys
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Takeshi Horinouchi
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -129,6 +129,7 @@ executables:
 - gpprint
 - gpvect
 - gpview
+- gpview~
 - grads2nc_with_gphys
 extensions:
 - ext/numru/gphys/extconf.rb
@@ -152,6 +153,7 @@ files:
 - bin/gpprint
 - bin/gpvect
 - bin/gpview
+- bin/gpview~
 - bin/grads2nc_with_gphys
 - doc/attribute.html
 - doc/attributenetcdf.html