gphys 1.5.5 → 1.5.7

data/LICENSE.txt

@@ -1,7 +1,7 @@
 GPhys is copyrighted free software by Takeshi Horinouchi and
 GFD Dennou Club (http://www.gfd-dennou.org/).
 
-Copyright 2003-2018 (C) Takeshi Horinouchi and GFD Dennou Club
+Copyright 2003-2019 (C) Takeshi Horinouchi and GFD Dennou Club
 (http://www.gfd-dennou.org/) All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/bin/gpcut

@@ -18,6 +18,8 @@ gpcut - Extract, slicing and thinning a GPhys variable.
   print this message. 
 :-m dim, --mean dim
    average along dim axis (optional).
+:-s dim, --sum dim
+   sum up along dim axis (optional).
 :-e dim, --eddy dim:
   deviation from mean along dim axis (optional). 
 :-o file, --output file
@@ -34,6 +36,7 @@ gpcut - Extract, slicing and thinning a GPhys variable.
   2010/03/10  Y SASAKI (change help block into RD format)
   2012/02/19  S Takehiro (description for gturl format updated)
   2014/04/23  S Takehiro (add --eddy option)
+  2021/05/19  S Takehiro (added options --sum)
 
 =end
 
@@ -49,6 +52,7 @@ URLfmt = "path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
 
 #---------------------- Option Configuration ----------------------
 parser = GetoptLong.new(
+  ["--sum",      "-s", GetoptLong::REQUIRED_ARGUMENT],
   ["--mean",     "-m", GetoptLong::REQUIRED_ARGUMENT],
   ['--eddy',     "-e", GetoptLong::REQUIRED_ARGUMENT],
   ["--output",   "-o", GetoptLong::REQUIRED_ARGUMENT],
@@ -100,6 +104,14 @@ if ($OPT_mean)
   }
 end
 
+if ($OPT_sum)
+  dims = ($OPT_sum).split(/\s*,\s*/)
+  dims.each{|dim|
+    dim = dim.to_i if dim.to_i.to_s == dim
+    gphys = gphys.sum(dim)
+  }
+end
+
 ## deviation from mean along any axis
 if ($OPT_eddy)
   dims_eddy = ($OPT_eddy).split(/\s*,\s*/)

data/bin/gpvect

@@ -3,11 +3,11 @@
 =begin
 =NAME
 
-gpvect - drawing 2-dim vector fiels. Contour/tone of scalar field can be plotted simultaneously. 
-    
+gpvect - drawing 2-dim vector fiels. Contour/tone of scalar field can be plotted simultaneously.
+
 ==USAGE
 
-The first command form is for only vector field plotting. 
+The first command form is for only vector field plotting.
 
      % gpvect [options] gturl_x gturl_y ....
 
@@ -15,9 +15,9 @@ where the format of the gturl is
 
      path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
 
-The command loads two gphys variables in each time and draws 
-vector field whose x and y components are the first and the second argument, 
-gturl_x gturl_y. 
+The command loads two gphys variables in each time and draws
+vector field whose x and y components are the first and the second argument,
+gturl_x gturl_y.
 
 When the slice parameters are the same throughout the all Gphys
 variables, the following form can be used:
@@ -42,7 +42,7 @@ gturl_x gturl_y.
 ===GLOBAL OPTIONS
 
 :--help:
-  print this message. 
+  print this message.
 
 :--slice url:
   set the slicing parameters.
@@ -50,7 +50,7 @@ gturl_x gturl_y.
 :--wsn [1-4]:
   set work staion number. each number represent output device.
   1: X window.
-  2: PS file. (named dcl.ps) 
+  2: PS file. (named dcl.ps)
   3: Tektronix output.
   4: GTK Windows (depend on dcl-5.3)
 
@@ -59,16 +59,16 @@ gturl_x gturl_y.
 
 :--itr [1-4,5-7,10-15,20-23,30-33]:
   set axis scale. default is 1.
-  1: linear scale for x/y axis 
+  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. 
+  (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. 
+  (for 10<=itr<=33) set mapping parameters which are fed in DCL.umpcnt.
 
 :--title:
   set title of figure
@@ -76,32 +76,32 @@ gturl_x gturl_y.
 :--aspect <aspect>:
   set aspect ratio of Viewport. default is 2.0.
 
-:--noannotate:   
-  not draw annotations. 
+:--noannotate:
+  not draw annotations.
 
 :--animate/anim <dim>:
-  plot animation along <dim>. <dim> must be name of dimension. 
+  plot animation along <dim>. <dim> must be name of dimension.
 
-:--alternate, --Ga: 
+:--alternate, --Ga:
   enable to backing store.
 
-:--nowait, --Gw:   
-  not wait for any actions if animate 
+:--nowait, --Gw:
+  not wait for any actions if animate
 
-:--reverse, --Gr:      
+:--reverse, --Gr:
   plot animation reversible if animate
 
-:--smooth, --Gaw:     
+:--smooth, --Gaw:
   equal to --anlternate && --nowait
 
-:--exch:     
+:--exch:
   exchange(transpose) x/y axis.
 
 :--mean <dim>:
-  mean along axis <dim>. 
+  mean along axis <dim>.
 
 :--eddy <dim>:
-  deviation from mean along axis <dim>. 
+  deviation from mean along axis <dim>.
 
 :--m, --map <map_type>:
   plot map. itr number must be set.  this option is neglect if itr
@@ -112,7 +112,7 @@ gturl_x gturl_y.
   plot scaler field (contour,tone)
 
 :-xx:yyyy=value:
-  specify Dennou Club Library internal variable. 
+  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.
@@ -120,22 +120,22 @@ gturl_x gturl_y.
 
 ===CONTOUR/TONE OPTIONS
 
-:--shade:            
+:--shade:
   make contour and tone plot.
 
 :--noshade:
   make contour plot, without tone.
 
-:--nocont:           
+:--nocont:
   make tone plot, without contour.
 
 :--range [min:max]:
   set min/max value for contour/tone plot. min or max must be set.
 
-:--crange:   
+:--crange:
   set min/max value for contour plot. this is more dominant than --range
 
-:--srange:            
+:--srange:
   set min/max value for tone plot. this is more dominant than --interval/int
 
 :--interval,--int [num]:
@@ -149,16 +149,16 @@ gturl_x gturl_y.
   set interval value for tone plot. this is more dominant than --interval/int.
 
 :--levels:
-  set values of contour/tone levels. 
+  set values of contour/tone levels.
 
 :--clevels:
-  set values of contour levels. 
+  set values of contour levels.
 
 :--slevels:
-  set tone of contour levels. 
+  set tone of contour levels.
 
 :--patterns:
-  set each patterns for tone plot. 
+  set each patterns for tone plot.
 
 :--tone [a|e|f|b|c]:
   set tone subroutine:
@@ -188,7 +188,7 @@ gturl_x gturl_y.
 
 :--yintv <yintv>:
   interval of data sampling in y
-                            
+
 :--factor <factor>:
   (Effective only if flow_vect) scaling factor to strech/reduce the
   arrow lengths
@@ -201,39 +201,39 @@ gturl_x gturl_y.
   scale the unit vector
 
 :--ux_unit <value>:
-  (Effective only if flow_vect) length of the x direction unit vector 
+  (Effective only if flow_vect) length of the x direction unit vector
   (precedence of this option is lower than max_unit_vect)
 
 :--uy_unit <value>:
-  (Effective only if flow_vect) length of the y direction unit vector 
+  (Effective only if flow_vect) length of the y direction unit vector
   (precedence of this option is lower than max_unit_vect)
 
 :--xscale <value>:
-  (Effective only if noflow_vect) scaling of the x direction vector 
+  (Effective only if noflow_vect) scaling of the x direction vector
 
 :--yscale <value>:
-  (Effective only if noflow_vect) scaling of the y direction vector 
+  (Effective only if noflow_vect) scaling of the y direction vector
 
 
 ==EXAMPLES
 
-For the first command format, 
+For the first command format,
 
     % gpvect data.nc@vx data.nc@vy
     % gpvect data.nc@vx,lon=0 data.nc@vy,lon=0
     % gpvect --scalar data.nc@temp datax.nc@vx datay.nc@vy
     % gpvect --scalar --anim t --nocont data.nc@temp data.nc@vx data.nc@vy
 
-For the second command format, 
+For the second command format,
     % gpvect --scalar --slice lat=0 data.nc@temp data.nc@vx data.nc@vy
 
 
 ==HISTORY
 
   2007/07/02  S Takehiro (created based on gpview)
-  2007/07/04  S Takehiro (polar coodinate vector component conversion 
-                          from U to N coordinates moved to ggraph.rb) 
-  2007/07/06  S Takehiro (default title was set when --scalar option is given) 
+  2007/07/04  S Takehiro (polar coodinate vector component conversion
+                          from U to N coordinates moved to ggraph.rb)
+  2007/07/06  S Takehiro (default title was set when --scalar option is given)
   2009/09/30  S Takehiro (option --nocolorbar and --nozero implemented)
   2010/03/10  Y SASAKI (change help block into RD format)
   2010/07/16  Y SASAKI (option --clrmap implemented)
@@ -290,7 +290,7 @@ def each_along_dims(gp1, gp2, gp3, loopdim)
   if loopdim.is_a?(String)
     dimname = loopdim
   elsif
-    if loopdim < 0 
+    if loopdim < 0
       dimname = gp1.coord(gphys.rank + loopdim).name
     else
       dimname = gp1.coord(loopdim).name
@@ -300,7 +300,7 @@ def each_along_dims(gp1, gp2, gp3, loopdim)
   end
 
   loopdim_na = gp1.coord(dimname).val                      # get coord ary
-  loopdim_na = loopdim_na[-1..0] if $OPT_reverse || $OPT_Gr  # reverse  
+  loopdim_na = loopdim_na[-1..0] if $OPT_reverse || $OPT_Gr  # reverse
   loopdim_na.each { |x|
     yield( gp1.cut(dimname=>x), gp2.cut(dimname=>x), gp3.cut(dimname=>x) )
   }
@@ -318,24 +318,34 @@ def draw_setup(gp)
   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") 
+  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' => ( $OPT_cint   || $OPT_interval || $OPT_int ),
+                                    'int' => cont_interval,
                                     'min' => ( min_crange  || min_range ),
                                     'max' => ( max_crange  || max_range )
                                     )
   GGraph.set_linear_tone_options(
-                                    'int' => ( $OPT_sint   || $OPT_interval || $OPT_int ),
+                                    'int' => tone_interval,
                                     'min' => ( min_srange  || min_range ),
                                     'max' => ( max_srange  || max_range )
                                  )
@@ -346,7 +356,6 @@ def draw_setup(gp)
 
   if ( $OPT_slevels || $OPT_levels )
     $OPT_slevels=($OPT_slevels||$OPT_levels).split(',').map!{|v| v.to_f }
-    p $OPT_slevels
   end
 
   if ( $OPT_patterns )
@@ -358,8 +367,8 @@ def draw_setup(gp)
   gp_rank = gp_rank - 1 if ( $OPT_animate || $OPT_anim )
 
   raise "The rank of gphys variables must be >=2 " if (gp_rank < 2)
-  
-  if ( $OPT_scalar ) 
+
+  if ( $OPT_scalar )
     if ( !$OPT_noshade && $OPT_nocont )
       draw_flag = "nocont"
     elsif ( $OPT_noshade && !$OPT_nocont )
@@ -369,7 +378,7 @@ def draw_setup(gp)
     end
   else
     draw_flag = 'noscalar'
-  end  
+  end
 
   # similar projection
   if ($OPT_similar)
@@ -405,7 +414,7 @@ def draw_setup(gp)
 
   # vector
   if ($OPT_noflow_vect)
-    $flow_vect = false 
+    $flow_vect = false
   else
     $flow_vect = true
   end
@@ -413,13 +422,13 @@ def draw_setup(gp)
   if ($OPT_unit_vect)
     $unit_vect = true
   else
-    $unit_vect = false 
+    $unit_vect = false
   end
 
   if ($OPT_max_unit_vect)
     $max_unit_vect = true
   else
-    $max_unit_vect = false 
+    $max_unit_vect = false
   end
 
   if ($OPT_ux_unit)
@@ -462,7 +471,7 @@ def draw(gp, gpux, gpuy, draw_flag)
   case draw_flag
   when "full"
     GGraph.tone(gp,
-                true, 
+                true,
                 "title"=>$OPT_title,
                 "annotate"=>$annotate,
                 "transpose"=>$OPT_exch,
@@ -484,7 +493,7 @@ def draw(gp, gpux, gpuy, draw_flag)
 
   when "nocont"
     GGraph.tone(gp,
-                true, 
+                true,
                 "title"=>$OPT_title,
                 "annotate"=>$annotate,
                 "transpose"=>$OPT_exch,
@@ -500,8 +509,8 @@ def draw(gp, gpux, gpuy, draw_flag)
   when "noshade"
     mj = DCL.udpget('indxmj')
     mn = DCL.udpget('indxmn')
-    GGraph.contour(gp, 
-                   true, 
+    GGraph.contour(gp,
+                   true,
                    "title"    =>$OPT_title,
                    "label"    =>true,
                    "annotate"=>$annotate,
@@ -519,7 +528,7 @@ def draw(gp, gpux, gpuy, draw_flag)
   # draw vector
 
   if ($OPT_itr == '5')
-    GGraph.vector( gpux, gpuy, newframe=vnewframe, 
+    GGraph.vector( gpux, gpuy, newframe=vnewframe,
                   "title"=>$OPT_title,
                   "annotate"=>$annotate,
                   "exchange"=>$OPT_exch,
@@ -530,7 +539,7 @@ def draw(gp, gpux, gpuy, draw_flag)
                   "factor"=>$factor,
                   "unit_vect"=>$unit_vect,
                   "max_unit_vect"=>$max_unit_vect,
-                  "ux_unit"=>$ux_unit, 
+                  "ux_unit"=>$ux_unit,
                   "uy_unit"=>$uy_unit
                   )
   else
@@ -544,7 +553,7 @@ def draw(gp, gpux, gpuy, draw_flag)
                   "factor"=>$factor,
                   "unit_vect"=>$unit_vect,
                   "max_unit_vect"=>$max_unit_vect,
-                  "ux_unit"=>$ux_unit, 
+                  "ux_unit"=>$ux_unit,
                   "uy_unit"=>$uy_unit
                   )
    end
@@ -572,17 +581,17 @@ def set_vpsize( default_vp, aspect=2.0 )
   hlength =   x1 - x0
   vlength =   y1 - y0
   # center grid of viewport
-  cen_of_vp = [ x0 + hlength/2.0, y0 + vlength/2.0  ] 
+  cen_of_vp = [ x0 + hlength/2.0, y0 + vlength/2.0  ]
 
   if aspect <= 2.0
     hlength = vlength * aspect
     x0 = cen_of_vp[0] - hlength/2.0
     x1 = cen_of_vp[0] + hlength/2.0
   else
-    vlength = hlength / aspect     
+    vlength = hlength / aspect
     y0 = cen_of_vp[1] - vlength/2.0
     y1 = cen_of_vp[1] + vlength/2.0
-  end  
+  end
 
   return [ x0, x1, y0, y1 ]
 
@@ -606,7 +615,7 @@ def __split_range(range)
   else
     raise "invalid range: variable subset specification error. split range with ':'\n\n"
   end
-  
+
   return min, max
 end
 
@@ -631,7 +640,7 @@ def check_dclopts
     value = opt[4..-1].split('=')[1]
     dcl_set_params(pkg,name,value)
   }
-  
+
 end
 
 def dcl_set_params(pkg,name,value)
@@ -655,7 +664,7 @@ def dcl_set_params(pkg,name,value)
   else
     eval( "DCL.#{pkg}r#{set}(name,value.to_f)" )
   end
-  
+
 end
 
 #####################################################
@@ -736,7 +745,7 @@ end
 
 ## Print out help message
 if ($OPT_help)
-  help 
+  help
   exit(1)
 end
 
@@ -746,18 +755,18 @@ DCL::swlset('lwait', false) if ($OPT_nowait    || $OPT_Gw || $OPT_smooth || $OPT
 DCL::swlset('lalt',  true)  if ($OPT_alternate || $OPT_Ga || $OPT_smooth || $OPT_Gaw)
                                            # set backing store option
 if ($OPT_noannotate)
-  $annotate = false 
+  $annotate = false
 else
   $annotate = true
 end
 
 if ($OPT_nocolorbar)
-  $colorbar = false 
+  $colorbar = false
 else
   $colorbar = true
 end
 
-if ($OPT_tone) 
+if ($OPT_tone)
   case $OPT_tone
   when "a"
     $auto, $tonf, $tona, $toneb, $tonec = true,false,false,false
@@ -787,13 +796,17 @@ udsfmt = ($OPT_udsfmt||DCL.udqfmt())
 DCL.udsfmt(udsfmt)
 
 ## draw figure
-loopdim   = ( $OPT_animate || $OPT_anim ) 
+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
-DCL.gropn($OPT_wsn||4)
+if NumRu::DCL::DCLVERSION.to_f >= 6
+  DCL.gropn($OPT_wsn||1)
+else
+  DCL.gropn($OPT_wsn||4)
+end
 
 ## open netcdf variables
 
@@ -808,7 +821,7 @@ while ARGV[0] do
   if ( $OPT_scalar )
     gturlx = ARGV[0]
     gturlx = gturlx+','+$OPT_slice if $OPT_slice
-    
+
     gpux = GPhys::IO.open_gturl(gturlx)
     print "  Reading #{gturlx}\n"
     ARGV.shift
@@ -877,5 +890,3 @@ while ARGV[0] do
 end
 
 DCL.grcls
-
-