gphys 1.1.1 → 1.2.2

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/ChangeLog

@@ -1,3 +1,224 @@
+Fri Mar  2  2012  T Horinouchi
+	* gphys-1.2.2 released (cvs tag gphys-1_2_2)
+Tue Feb 28  2012  R Mizuta
+	* lib/numru/gphys/unumeric.rb: not to use Date#to_datetime
+	  + fix for "proleptic_gregorian" calendar. 
+Mon Feb 27  2012  T Horinouchi
+        * (Added Mar 2) I thought I did the following, but it has not been
+	  released:
+	  * gphys-1.2.2 released (cvs tag gphys-1_2_2)
+	* lib/numru/varraygrib.rb : changed to explicitly raise LoadError
+	  if rb-GRIB is not available and VArrayGrib::use_rb_grib is called.
+	* lib/numru/ggraph.rb : altered the recently commited test :
+	  reduced the numbder of figs; added cliping to polar stereo etc.
+	* lib/numru/gphys/assoccoords.rb : debug
+	* lib/numru/gphys/unumeric.rb: (for Ruby 1.8) not to use 
+	  Date#to_datetime if not defined.
+Sun Feb 26  2012  S Otsuka
+	* lib/numru/dclext.rb
+	  * bugfix in color_bar
+	* lib/numru/ggraph.rb
+	  * bugfix of map_axes for itr == 10
+Fri Feb 24  2012  S Otsuka
+	* lib/numru/dclext.rb
+	  * bugfix in color_bar for itr >= 10
+	* lib/numru/ggraph.rb
+	  * test of color_bar for itr = 13..15 and 20..23
+Thu Feb 23  2012  T Horinouchi
+	* gphys-1.2.1 released (cvs tag gphys-1_2_1)
+Tue Feb 21  2012  T Horinouchi
+	* install.rb: added again
+Tue Feb 21  2012  T Horinouchi
+	* gphys-1.2.0 released (cvs tag gphys-1_2_0)
+Tue Feb 21  2012  T Horinouchi
+	* lib/numru/gphys/grib.rb : class name changed: NumRu::Grib -->
+	  NumRu::GPhys::Grib etc
+	* lib/numru/gphys/varraygrads.rb: made gphys_grib (NumRu::GPhys::Grib)
+	  the default, supported switching between gphys_grib and rb-GRIB
+	  (external library)
+	* lib/numru/gphys/gphys_io.rb, lib/numru/gphys/gphys_grib_io.rb:
+	  Changed accordingly
+Mon Feb 20  2012  T Horinouchi
+	* gphys_grib_io.rb, gphys_io.rb, varraygrib.rb: previous changes
+	  are reverted
+	* README : updated
+Mon Feb 20  2012  S Nishizawa
+	* gphys_grib_io.rb, gphys_io.rb, varraygrib.rb: enable to switch
+	  grib library (default is the gphys grib).
+	  * to switch it use GPhys::IO.use_gphys_grib or GPhys:IO.use_rb_grib
+Mon Feb 20  2012  T Horinouchi
+	* README : added a remark on rb-GRIB
+	* lib/numru/ggraph.rb : added a colorbar in graph 34 & 36 (itr=5)
+	* lib/numru/gphys/grib.rb : not show the warning (... is obsolte).
+Mon Feb 20  2012  S Otsuka
+	* lib/numru/dclext.rb
+	  * bugfix in color_bar for itr = 5, 6
+Sun Feb 19  2012  T Horinouchi
+	* install.rb: deleted (it has been obsolete since extconf.rb
+	  was introduced years ago.)
+Sun Feb 19  2012  S Takehiro
+	* lib/numru/gphys/gphys_io.rb parse_gturl:
+	  * gturl format was changed so as to be able to use "/" 
+	    as a separater between path and variable. 
+	* bin/ : comments updated according to the change of gturl format. 
+Sun Feb 19  2012  T Horinouchi
+	* README: udpated
+	* lib/numru/gphys/coordmapping.rb: adapted the test part to Ruby 1.9
+	* lib/numru/ganalysis/histogram.rb: bugfix
+Fri Feb 17  2012  T Horinouchi
+        * lib/numru/ganalysis/met.rb: added an option to frontogenesis_func
+	* lib/numru/dclext.rb : updated the documentation part
+	* doc/ : updated
+Thu Feb 16  2012  T Horinouchi
+	* lib/numru/dclext.rb DCLExt::flow_vect_anyproj
+	  * improved not to show arrows on the baskside when the 
+	    projection is multi-valued (map projections)
+	  * added handling of NaNs
+	  * modified test part
+Wed Feb 15  2012  T Horinouchi
+	* lib/numru/ggraph.rb (separated DCLExt into the new file dclext.rb)
+	* lib/numru/dclext.rb (new file) NumRu::DCLExt is separated from
+	  lib/numru/ggraph.rb
+Wed Feb 15  2012  T Horinouchi (actually done in Dec 2011)
+        * DCLExt::flow_vect_anyproj : added option polar_thinning etc.
+Thu Feb 9  2012  S Otsuka
+	* lib/numru/ggraph.rb
+	  * In GGraph, GPhys#name will be used for the title of a diagram
+	    if GPhys#long_name is too long.
+	  * tentative workaround in GGraph#color_bar
+	* lib/numru/ganalysis/eof.rb
+	  * Load rubygems because Ruby/GSL might be installed via rubygems.
+Thu Feb 9  2012  R Mizuta
+	* lib/numru/gphys/unumeric.rb
+	  * bugfix in the method self::from_date with "360_day" calendar.
+Fri Feb 3  2012  S Otsuka
+	* lib/numru/ggraph.rb
+	  * Map projection numbers 16--19 and 34 are enabled.
+	    Additional modifications might be needed in future.
+	    (DCL 5.4.3 or later is needed to actually use these.)
+Fri Feb 3  2012  R Mizuta
+	* lib/numru/gphys/grads_gridded.rb, gphys_grads_io.rb:
+	    * fixed an error when variable names in grads ctl files 
+	      conflict with dimension names (x,y,z,t). 
+Wed Feb 1  2012  S Takehiro < S. Nishizawa
+	* bin/gpview
+	  * added --tonf option.
+	* bin/gpvect
+	  * added --tonf option.
+Tue Jan 31  2012  R Mizuta
+	* lib/numru/gphys/unumeric.rb
+	  * added support for "proleptic_gregorian" calendar. 
+	  * added check for invalid date in "360_day" calendar. 
+Tue Jan 24  2012  T Horinouchi
+	* commited some enhancement/modification made in Dec 2011
+	  * lib/numru/ganalysis/planet.rb
+	    * supported boundary condition selection for derivatives (lat_bc)
+	    * added some methods (grad_sx, grad_sy, grad_sy_cosphifact,
+	      weight_tanphi, weight_cosphi, weight_sinphi)
+	  * lib/numru/ganalysis/met.rb
+	    * added a method df_dx_vialogscale, to support numerical
+	      derivative in log-p coordinate. This is not necessarily
+	      an improvement --- it depends on inputs, but the default
+	      is tentatively changed to use it.
+	    * added new methods: z2geostrophic_wind, frontogenesis_func
+Sun Jan  8  2012 S Otsuka
+	* lib/numru/ggraph.rb:
+	  * default value of LGLOBE in map projections are changed.
+	    * when Mercator, LGLOBE becomes true only if the window is
+	      almost global.
+	  * bugfix in DCLExt#color_bar: when map projection is used
+	    in the main plot, ITR was reset when DCLExt.color_bar was called.
+Wed Jan  4  2012 S Otsuka
+	* lib/numru/gphys/varray.rb: marshal dump and load are implemented.
+Thu Dec 24  2011 S Otsuka
+	* lib/numru/ganalysis/histogram.rb: bugfix for logarithmic axes.
+Thu Dec 22  2011 S Otsuka
+	* lib/numru/ggraph.rb: log10_safe and log10_or_0 are defined
+	  in order to prevent errors when 0 is given to Math::log10.
+	  Math::log10 in color_bar-related functions are substituted
+	  with log10_or_0.
+	* lib/numru/ganalysis/histogram.rb: bugfix of default window.
+Wed Dec  14  2011  T Horinouchi
+	* lib/numru/ggraph.rb: Supported vector drawing in any projection
+	  (esp. map projection!). It requires a new (yet to come) version
+	  of NArrayMiss -- it depends on NArrayMiss#valid? with argument(s).
+	  * New methods:
+	    * DCLExt::flow_vect_anyproj : flow_vect on any DCL projection.
+	      Arrows drawn by this method are properly directed locally
+	      (consistent with the local coordinate). Their lengths are
+	      proportional to those of the data given. (currently not yet
+	      tested with the tranformations 5 and 6, which I'm not used to).
+	    * DCLExt::unit_vect_single : for DCLExt::flow_vect_anyproj.
+	      Draws only one arrow to express the scaling (by default,
+	      upward oriented.)
+          * Default change:
+	    * GGraph::vector : changed to use flow_vect_anyproj if
+	      the current projection number is >= 2. (the method to use
+	      can be switched by the new option "flow_vect_anyproj")
+
+Mon Dec  12  2011  T Horinouchi
+	* lib/numru/interpolate.rb: debug of mouse_cut: up to the previous
+	  version, the end point of the last line segment is not included
+	  in the sample points. (So the debug is to cover this end point.)
+	* lib/numru/interpolate.rb: debug of  coord_data_reverse :
+	  to avoid a side effect on the grid of self.
+	* lib/numru/interpolate.rb: Added a new method dcl_fig_cut,
+	  which is separated from mouse_cut for use cases without
+	  mouse click.
+Fri Dec  9  2011  S Otsuka
+	* lib/numru/ggraph.rb: xreverse and yreverse will be true
+	  when the unit of an axis is compatible with that specified
+	  as an option (previously xreverse/yreverse became true
+	  only when the unit was exactly the same).
+Fri Dec  2  2011  T Horinouchi
+	* lib/numru/gphys/gphys.rb: added a new method shape_coerce_full
+	  (similar to shape_coerce but possibly expands by replication)
+	* lib/numru/interpolate.rb: added a new method coord_data_reverse
+	  (reverses the main data (i.e., the dependent variable) and one of the
+	  coordinates (an independent variable) through interpolation.)
+Thu Dec  1  2011  T Horinouchi
+	* lib/numru/interpolate.rb, interpo.c: Supported a behavior
+	  not to make extrapolation outside the original grid.
+	  Changed the default behavior to this one.
+	* lib/numru/interpolate.rb: added a new class method
+	  GPhys::extrapolation=(extrapo), where extrapo is true or
+	  false --- the default behavior is false, as noted above.
+Tue Nov 29  2011  S Nishizawa
+	* lib/numru/grib.rb: print message to inform that this grib library is obsoluted.
+	* lib/numru/varraygrib: change to find rb-grib library first.
+Sun Nov 20  2011  S Takehiro
+	* bin/gpview: option --eddy implemented.
+	* bin/gpvect: option --eddy implemented.
+Fri Nov 11  2011  T Horinouchi
+	* lib/numru/ggraph.rb: added 'xloglabelall' and
+	  'yloglabelall' to the options of GGraph::axes (to show 
+	  lavels for all log-level tick marks)
+Thu Nov 03  2011  S Takehiro
+	* bin/gpview: option --time_ax implemented.
+Fri Oct 28  2011  S Otsuka
+	* lib/numru/ganalysis/histogram.rb:
+	  * support for itr=2, 3, and 4 in GGraph#histogram.
+Tue Oct 18  2011  T Horinouchi
+	* lib/numru/ganalysis/planet.rb : 
+	  * Changed method name: get_lonlat --> get_lambda_phi. 
+	  * method get_lambda_phi: added an optional argument 
+	    err_raise (default:true). Changed the order of outputs.
+	    Added doc.
+	* lib/numru/interpolate.rb: minor reformating of documentation
+	* lib/numru/gphys/axis.rb: Axis#cyclic_extendible?: debug
+Mon Oct 17  2011  T Horinouchi
+	* lib/numru/ganalysis/planet.rb : find_lon_lat_dims: Refined the 
+	  criteria
+Fri Oct 14  2011  T Horinouchi
+	* lib/numru/gphys/derivative.rb: added a new method deriv2nd
+	* lib/numru/derivative.rb: added a new method deriv2nd
+	  (2nd derivative covering uniform grids)
+Sun Sep 04 2011  S Otsuka
+	* When max and min of an axis are the same integer value,
+	  window values become invalid.
+Thu Aug 18  2011  T Horinouchi
+	* lib/numru/interpolate.rb: mouse_cut: added optional arguments
+	  line_type & line_index, whose default values are 1 & 1,respectively.
 Mon Aug 15  2011  T Horinouchi
 	* gphys-1.1.1 released (cvs tag gphys-1_1_1)
 Thu Aug 11  2011  T Horinouchi

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in gphys.gemspec
+gemspec

data/LICENSE.txt

@@ -1,34 +1,22 @@
-GPhys is copyrighted free software by Takeshi Horinouchi and
-GFD Dennou Club (http://www.gfd-dennou.org/).
+Copyright (c) 2012 Eriko Nishimoto
 
-Copyright 2011 (C) Takeshi Horinouchi and GFD Dennou Club
-(http://www.gfd-dennou.org/) All rights reserved.
+MIT License
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
-
-THIS SOFTWARE IS PROVIDED BY GFD DENNOU CLUB AND CONTRIBUTORS ``AS IS'' 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GFD DENNOU CLUB OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation
-are those of the authors and should not be interpreted as representing
-official policies, either expressed or implied, of Takeshi Horinouchi
-and GFD Dennou Club.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -1,33 +1,30 @@
+= GPhys -- a class of multi-dimensional Gridded Physical quantities
 
-GPhys -- a class of multi-dimensional Gridded Physical quantities
+== Description and general information
+See http://ruby.gfd-dennou.org/products/gphys/
 
-by T Horinouchi
-2003/05/14
+== Licence
+See LICENSE.txt
 
-* DESCRIPTION
+== Dependent libraries 
 
-To be written. 
-See http://ruby.gfd-dennou.org/workshop200303/horinout/ (in Japanese).
+As of GPhys 1.2.0. 
 
-* INSTALL
+Dependent libraries and their versions (required or recommended):
+* Ruby 1.8 or 1.9
+* NArray: 0.5.7 or later
+* NumRu::Misc : 0.1.0 or later
+* NumRu::Units : 1.7 or later
+* NArrayMiss : 1.2.4 or later
+* RubyNetCDF : 0.6.6 or later
+* RubyDCL : 1.6.1 or later
+* Ruby-FFTW3 : 0.3 or later
+* RubyGSL : 1.14 or later
 
-# ruby extconf.rb && make && make install
-# ruby ./install.rb
+Recommended libraries:
+* Ruby-LAPACK : 1.5 or later (used for efficiency if installed)
 
-* SAMPLE PROGRAMS
-
-Each library file has a sample program part, which is invoked by
-directly feeding the file to Ruby. For example
-
-% cd lib/numru/
-% ruby ggraph.rb
-
-% cd lib/numru/gphys
-% ruby gphys.rb
-% ruby gphys_netcdf_io.rb
-
-Sample programs are also found in the
-
-   ./sample
-
-diredtory.
+Optional dependent libraries:
+* rb-GRIB : 0.2.0 or later (used if installed and explicitly specified.
+  Needed to read GRIB2 data. But rb-GRIB 0.2.0 is experimental, so it
+  is not recommended. Wait for a future version.)

data/README.md

@@ -0,0 +1,29 @@
+# Gphys
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'gphys'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install gphys
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,56 +1 @@
-require 'rake/gempackagetask'
-
-NAME = 'gphys'
-VER = '1.1.1'
-
-PKG_FILES = FileList[
-  '**',
-  'bin/**/*',
-  'doc/**/*',
-  'lib/**/*',
-  'sample/**/*',
-  'test/**/*',
-  'testdata/**/*'
-]
-
-spec = Gem::Specification.new do |s|
-  s.name             = NAME
-  s.version          = VER
-  s.authors           = ["Takeshi Horinouchi", "Ryo Mizuta",\
-    "Daisuke Tsukahara", "Seiya Nishizawa", "Shin-ichi Takehiro"]
-  s.email            = ['eriko@gfd-dennou.org']
-  s.homepage         = 'http://www.gfd-dennou.org/arch/ruby/products/gphys/'
-  s.licenses         = ["GFD Dennou Club"]
-  s.platform         = Gem::Platform::RUBY
-  s.summary          = %q{a multi-purpose class to handle Gridded Physical quantities}
-  s.description      = %q{comprehensive library for self-descriptive gridded physical data (in NetCDF, GrADS, or on memory) with graphicsgraphicsgraphicsgraphics.}
-
-  s.files            = PKG_FILES.to_a
-  s.require_paths    = ['lib']
-  s.test_files = Dir.glob("test/*")
-  s.bindir    = 'bin'
-  s.executables = ['gdir_client','gpaop','gpcut','gplist'\
-    ,'gpmaxmin','gpvect','grads2nc_with_gphys','gdir_server'\
-    ,'gpcat','gpedit','gpmath','gpprint','gpview']
-
-  s.has_rdoc         = false
-  #s.extra_rdoc_files = ['README']
-
-  s.required_ruby_version = Gem::Requirement.new(">= 1.6")
-
-  s.add_runtime_dependency(%q<narray>, [">= 0"])
-  s.add_runtime_dependency(%q<numru-misc>, [">= 0.0.4"])
-  s.add_runtime_dependency(%q<numru-units>, [">= 1.5"])
-  s.add_runtime_dependency(%q<narray_miss>, [">= 0"])
-  s.add_runtime_dependency(%q<ruby-netcdf>, [">= 0.5.2"])
-  s.add_runtime_dependency(%q<ruby-dcl>, [">= 1.2.1"])
-  s.add_runtime_dependency(%q<fftw3>, [">= 0.2"])
-
-  s.extensions << "extconf.rb"
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-  pkg.need_tar = true
-end
-
+require "bundler/gem_tasks"

data/bin/gpaop

@@ -20,7 +20,7 @@ by the following  command formats.
 
   % gpaop -f func [options] gturl1 gturl2 ...
 
-Format of 'gturl*' is 'path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]'
+Format of 'gturl*' is 'path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]'
 
   % gpaop -f func --var varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]] [options] gtfile1 gtfile2 ...
 
@@ -55,6 +55,7 @@ Usage Examples
   2005/08/21  S Takehiro (created)
   2005/08/23  S Takehiro (common methods to gp* commandmoved to gpcommon.rb)
   2010/03/10  Y SASAKI (change help block into RD format)
+  2012/02/19  S Takehiro (description for gturl format updated)
 
 =end
 

data/bin/gpcut

@@ -10,7 +10,7 @@ gpcut - Extract, slicing and thinning a GPhys variable.
 
 = USAGE 
 
-   % gpcut [options] path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
+   % gpcut [options] path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
 
 = OPTIONS
 
@@ -30,6 +30,7 @@ gpcut - Extract, slicing and thinning a GPhys variable.
   2005/08/21  S Takehiro (global attributes copied to the output file)
   2005/08/23  S Takehiro (common methods to gp* command moved to gpcommon.rb)
   2010/03/10  Y SASAKI (change help block into RD format)
+  2012/02/19  S Takehiro (description for gturl format updated)
 
 =end
 
@@ -41,7 +42,7 @@ require "getoptlong"
 
 #------------------------ Default Settings ------------------------
 Output_default = 'gphys.nc'
-URLfmt = "path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
+URLfmt = "path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
 
 #---------------------- Option Configuration ----------------------
 parser = GetoptLong.new(

data/bin/gpedit

@@ -8,7 +8,7 @@
   
 = USAGE
 
-  % gpedit [options] path@[varname:var_attr=...][varname|+global_attr]
+  % gpedit [options] path[@|/][varname:var_attr=...][varname|+global_attr]
 
 = EXAMPLES
 
@@ -23,6 +23,7 @@
 "
 =  HISTORY
 
+   2012/02/19  S Takehiro (gturl format updated)
    2010/03/10  Y SASAKI (change help block into RD format)
    2007/07/18  Y. Morikawa  'gpattr' is renamed to 'gpedit'
    2006/09/29  Y. Morikawa  A value looks like numeric is treated as a numerical value
@@ -142,8 +143,11 @@ def parse_gturl_for_attr(gturl)
   if /(.*)@(.*)/ =~ gturl
     file = $1
     var = $2
+  elsif /(.*)\/(.*)/ =~ gturl
+    file = $1
+    var = $2
   else
-    url_error "'@' between path & variable is not found"
+    url_error "'[@|/]' between path & variable is not found"
   end
   if /(.*):(.*)/ =~ var
     var_name = var.split(":")[0]

data/bin/gpmath

@@ -6,7 +6,7 @@ gpmath - operating a mathematical function to a GPhys variable.
 
 = USAGE
 
-  % gpmath [options] path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
+  % gpmath [options] path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
 
 = OPTIONS
  
@@ -33,6 +33,7 @@ gpmath - operating a mathematical function to a GPhys variable.
   2005/08/21  S Takehiro (global attributes copied to the output file)
   2005/08/23  S Takehiro (common methods to gp* command moved to gpcommon.rb)
   2010/03/10  Y SASAKI (change help block into RD format)
+  2012/02/19  S Takehiro (description for gturl format updated)
 
 =end
 
@@ -44,7 +45,7 @@ require "getoptlong"
 
 #------------------------ Default Settings ------------------------
 Output_default = 'gphys.nc'
-URLfmt = "path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
+URLfmt = "path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
 
 #---------------------- Option Configuration ----------------------
 parser = GetoptLong.new(

data/bin/gpmaxmin

@@ -6,7 +6,7 @@ gpmaxmin - printing maximum and minimum values of a GPhys variable.
 
 = USAGE
 
-   % gpmaxmin [options] path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
+   % gpmaxmin [options] path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
 
 = OPTIONS
 
@@ -26,6 +26,7 @@ gpmaxmin - printing maximum and minimum values of a GPhys variable.
   2005/08/23  S Takehiro (common methods to gp* command moved to gpcommon.rb)
   2006/03/07  M Nakano (USAGE Typo fixed)
   2010/03/10  Y SASAKI (change help block into RD format)
+  2012/02/19  S Takehiro (description for gturl format updated)
 
 =end
 
@@ -36,7 +37,7 @@ include NumRu
 require "getoptlong"
 
 #------------------------ Default Settings ------------------------
-URLfmt = "path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
+URLfmt = "path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]"
 print_maxdefault=5
 
 #---------------------- Option Configuration ----------------------

data/bin/gpprint

@@ -18,7 +18,7 @@ texts with line feeding to avoid long lines and are made to stdout.
  
 where the format of the url is 
 
-     path@varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
+     path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
 
 = EXAMPLES
 
@@ -35,6 +35,7 @@ where the format of the url is
   2005/08/10  S Takehiro (utilize internal function for printing help message)
   2005/08/23  S Takehiro (common methods to gp* command moved to gpcommon.rb)
   2010/03/10  Y SASAKI (change help block into RD format)
+  2012/02/19  S Takehiro (description for gturl format updated)
 
 =end
 ##################################################