gphys 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1921300d74726704bca4bba00ebaa9b46081ae24
-  data.tar.gz: 4c9344000f180c1405877496eb6492304d74b73d
+  metadata.gz: 13c32ab65077429fc0f5c4799d6986e2cb672dfa
+  data.tar.gz: b6cd30441caba1b246ae90b6ae9b8f090364cbce
 SHA512:
-  metadata.gz: 386eca1431a75db9af349d1739b661b2a59b24df4f8b4f38df8ac9cbb87f27f2960dc944bce3bdb3c88a16d9ba7750cefa5913e363cb576d5ae9f4699e49b1d4
-  data.tar.gz: 4d0a3d04f2312aefd778e68241ee5a0ad323a0488bdfbfd136f0651755c2233a1693ddc2e141e8949bb5e5bd4a679f7ed8197273015207dfc105352bd0174b82
+  metadata.gz: cc75b8a323b972ace9a8b0beb53fbedf8165409d9613f655bfaf08090c751fa8c4b594f09d51c53b8592a4c9b3be85e32447792cb78bf3ab7f94772aea3d78b2
+  data.tar.gz: c25b9805785e96f88ecf47e37855169cc4efecc29520d3df74da9385d57c811bd5de44c8f684fdcdc9cf5657972e69338c6699e906a90099f040d517ba5b9725

data/ChangeLog

@@ -1,3 +1,113 @@
+2018-01-26  Takeshi Horinouchi
+updated the years
+
+M	LICENSE.txt
+
+2018-01-26  Takeshi Horinouchi
+To release ver.1.5.3
+
+M	lib/numru/gphys/version.rb
+
+2018-01-26  Takeshi Horinouchi
+regression_line : added options annot_cor and annot_r2
+
+M	lib/numru/ggraph.rb
+
+2018-01-26  Takeshi Horinouchi
+Changed to use first2Dreally & first1Dreally where appropriate
+
+M	lib/numru/ggraph.rb
+
+2018-01-26  Takeshi Horinouchi
+Added new mehotds: firstNDreally, first1Dreally, first2Dreally etc
+
+M	lib/numru/gphys/gphys.rb
+
+2018-01-26  Takeshi Horinouchi
+Made the following methods class methods of GPhys (in addition to being private methods as before): c_running_mean, c_running_mean_2D, c_bin_mean, c_bin_sum
+
+M	ext/numru/gphys/dim_op.c
+
+2017-12-25  Takeshi Horinouchi
+bug fix
+
+M	lib/numru/gphys/gphys_dim_op.rb
+
+2017-12-23  Takeshi Horinouchi
+write_grid: To handle (avoid) multiple output of associated coordinates
+
+M	lib/numru/gphys/gphys_netcdf_io.rb
+
+2017-12-23  Takeshi Horinouchi
+	modified:   lib/numru/gphys/gphys_netcdf_io.rb
+runnin_mean : Changed the default boundary condition to nil (automatic selection among BC_SIMPLE & BC_CYCLIC)
+
+M	lib/numru/gphys/gphys_dim_op.rb
+
+2017-12-14  Takeshi Horinouchi
+Merge branch 'master' of dennou-k.gfd-dennou.org:/GFD_Dennou_Club/ftp/arch/ruby/products/gphys/git_repos/gphys
+
+2017-12-14  Takeshi Horinouchi
+added a new method GPhys#running_mean_2D, which is good for data with missing.
+
+M	ext/numru/gphys/dim_op.c
+M	lib/numru/gphys/gphys_dim_op.rb
+
+2017-12-14  Takeshi Horinouchi
+bug fix
+
+M	lib/numru/gphys/axis.rb
+
+2017-12-14  Takeshi Horinouchi
+updated gemspec file
+
+M	gphys.gemspec
+
+2017-07-15  Satoki Tsujino
+bug fix (bi and bj in lib/numru/gphys/grads_gridded.rb).
+
+M	lib/numru/gphys/grads_gridded.rb
+
+2017-07-14  Takeshi Horinouchi
+bug fix (thanks to dvdvlop emails from Tsujino&Otobe san on 2017-0714)
+
+M	lib/numru/gphys/grads_gridded.rb
+
+2017-07-07  Takeshi Horinouchi
+Merge remote-tracking branch 'origin/master'
+
+2017-07-07  Takeshi Horinouchi
+bug fix
+
+M	lib/numru/dclext.rb
+
+2017-06-07  takepiro
+* bin/gpview: int option bug fixed.
+* bin/gpprint: options added.
+
+M	bin/gpprint
+M	bin/gpview
+
+2017-05-20  Takeshi Horinouchi
+further update
+
+M	lib/numru/dclext.rb
+
+2017-05-16  Takeshi Horinouchi
+Added a new method Axis#nearest_index
+
+M	lib/numru/gphys/axis.rb
+
+2017-05-16  Takeshi Horinouchi
+complement to the previous commit
+
+M	lib/numru/dclext.rb
+
+2017-05-07  Takeshi Horinouchi
+DCLExt::ue_linear_levels : added handling of NaN
+
+M	lib/numru/dclext.rb
+
 2017-04-17  Takeshi Horinouchi
 1.5.1 --> 1.5.2
 
@@ -137,8 +247,7 @@ M	ext/numru/gphys/ext_init.c
 2016-06-08  Takeshi Horinouchi
 file renamed (git mv)
 
-D	ext/numru/gphys/mesh_resample.c
-A	ext/numru/gphys/quad_mesh_sample.c
+R100	ext/numru/gphys/mesh_resample.c	ext/numru/gphys/quad_mesh_sample.c
 
 2016-06-08  Takeshi Horinouchi
 created an efficient quadrilateral mesh resampler
@@ -403,18 +512,12 @@ move extension files to ext/numru/gphys/
 
 extension files should be located in "ext/" directory.
 
-D	dim_op.c
-A	ext/numru/gphys/dim_op.c
-A	ext/numru/gphys/ext_coord.c
-A	ext/numru/gphys/ext_init.c
-A	ext/numru/gphys/extconf.rb
-A	ext/numru/gphys/interpo.c
-A	ext/numru/gphys/multibitIO.c
-D	ext_coord.c
-D	ext_init.c
-D	extconf.rb
-D	interpo.c
-D	multibitIO.c
+R100	dim_op.c	ext/numru/gphys/dim_op.c
+R100	ext_coord.c	ext/numru/gphys/ext_coord.c
+R100	ext_init.c	ext/numru/gphys/ext_init.c
+R100	extconf.rb	ext/numru/gphys/extconf.rb
+R100	interpo.c	ext/numru/gphys/interpo.c
+R100	multibitIO.c	ext/numru/gphys/multibitIO.c
 
 2015-03-10  Shin-ichi Takehiro
 bin/gpview: History removes from the output of --help
@@ -920,14 +1023,10 @@ M	lib/numru/gphys/grid.rb
 2014-05-06  Takeshi Horinouchi
 Moved old tests (which do not use unit test) from test/ to test_old/
 
-D	test/eof_slp.rb
-D	test/mltbit.dat
-D	test/test_ep_flux.rb
-D	test/test_multibitIO.rb
-A	test_old/eof_slp.rb
-A	test_old/mltbit.dat
-A	test_old/test_ep_flux.rb
-A	test_old/test_multibitIO.rb
+R100	test/eof_slp.rb	test_old/eof_slp.rb
+R100	test/mltbit.dat	test_old/mltbit.dat
+R100	test/test_ep_flux.rb	test_old/test_ep_flux.rb
+R100	test/test_multibitIO.rb	test_old/test_multibitIO.rb
 
 2014-05-06  Takeshi Horinouchi
 Unit test for Axis class
@@ -1042,16 +1141,11 @@ Revert "the extention library is moved into ext/"
 
 This reverts commit 9c59f9b4131150bfbc3d7a3087af8c8f1df90c47.
 
-D	ext/ext_coord.c
-D	ext/ext_init.c
-D	ext/extconf.rb
-D	ext/interpo.c
-D	ext/multibitIO.c
-A	ext_coord.c
-A	ext_init.c
-A	extconf.rb
-A	interpo.c
-A	multibitIO.c
+R100	ext/ext_coord.c	ext_coord.c
+R100	ext/ext_init.c	ext_init.c
+R100	ext/extconf.rb	extconf.rb
+R100	ext/interpo.c	interpo.c
+R100	ext/multibitIO.c	multibitIO.c
 
 2013-04-15  Takeshi Horinouchi
 Revert "Updated extconf.rb; added $vendorarchdir to the search path etc."
@@ -1076,16 +1170,11 @@ M	.gitignore
 2013-03-28  Takeshi Horinouchi
 the extention library is moved into ext/
 
-A	ext/ext_coord.c
-A	ext/ext_init.c
-A	ext/extconf.rb
-A	ext/interpo.c
-A	ext/multibitIO.c
-D	ext_coord.c
-D	ext_init.c
-D	extconf.rb
-D	interpo.c
-D	multibitIO.c
+R100	ext_coord.c	ext/ext_coord.c
+R100	ext_init.c	ext/ext_init.c
+R100	extconf.rb	ext/extconf.rb
+R100	interpo.c	ext/interpo.c
+R100	multibitIO.c	ext/multibitIO.c
 
 2013-03-27  Takeshi Horinouchi
 (test) deleted the dummy file
@@ -1100,8 +1189,7 @@ A	tmp.txt
 2013-03-27  Takeshi Horinouchi
 Renamed the current ChangeLog to back up.
 
-A	.ChangeLog.until201303
-D	ChangeLog
+R100	ChangeLog	.ChangeLog.until201303
 
 2013-03-27  Takeshi Horinouchi
 Registered files (patterns) to ignore in the repository
@@ -4001,8 +4089,7 @@ M	lib/numru/vizshot.rb
 2006-08-31  horinout
 	* lib/numru/vizshot.rb <-- lib/numru/easyviz.rb : renamed
 
-D	lib/numru/easyviz.rb
-A	lib/numru/vizshot.rb
+R096	lib/numru/easyviz.rb	lib/numru/vizshot.rb
 
 2006-08-31  horinout
 	  * support dump_code_and_data
@@ -6179,8 +6266,7 @@ Mon Jan 10  2005   T Horinouchi (partly < D Tsukahara)
 M	ChangeLog
 A	bin/gpprint
 A	bin/gpview
-D	bin/grads2nc.rb
-A	bin/grads2nc_with_gphys
+R084	bin/grads2nc.rb	bin/grads2nc_with_gphys
 D	bin/install.rb
 M	install.rb
 

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-2017 (C) Takeshi Horinouchi and GFD Dennou Club
+Copyright 2003-2018 (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/gpprint

@@ -14,18 +14,29 @@ texts with line feeding to avoid long lines and are made to stdout.
 
 = USAGE
 
-     % gpprint url
+     % gpprint [options] url
  
 where the format of the url is 
 
      path[@|/]varname[,dimname=pos1[:pos2[:thinning_intv]][,dimname=...]]
 
+= OPTIONS
+
+:-h, --help
+   print this message.
+:-l, --long
+   print with "%f".
+:-e, --exp
+   print with "%e".
+:-f format, --fmt format
+   set print format. 
+
 = EXAMPLES
 
     % gpprint data.nc@temp
-    % gpprint data.nc@temp,lon=135.0
-    % gpprint data.nc@temp,lon=130:150,lat=0
-    % gpprint data.nc@temp,lon=130:150,lat=0:90:2
+    % gpprint -l data.nc@temp,lon=135.0
+    % gpprint -e data.nc@temp,lon=130:150,lat=0
+    % gpprint -f " %10.3f," data.nc@temp,lon=130:150,lat=0:90:2
 
 = HISTORY
 
@@ -36,6 +47,7 @@ where the format of the url is
   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)
+  2017/04/02  S Takehiro (options added)
 
 =end
 ##################################################
@@ -44,15 +56,56 @@ require "numru/gphys"
 require "numru/gphys/gpcommon"
 include NumRu
 
-#------------------------ print help message ------------------------
+require "getoptlong"
+
+#---------------------- Option Configuration ----------------------
+parser = GetoptLong.new(
+  ["--exp",      "-e", GetoptLong::NO_ARGUMENT      ],
+  ["--long",     "-l", GetoptLong::NO_ARGUMENT      ],
+  ["--fmt",      "-f", GetoptLong::REQUIRED_ARGUMENT],
+  ["--help",     "-h", GetoptLong::NO_ARGUMENT      ])
+begin
+  parser.each{|opt, arg|
+    case opt
+    when "--exp"  then eval "$OPT_exp=true"
+    when "--long" then eval "$OPT_long=true"
+    when "--fmt"  then eval "$OPT_fmt='#{arg}'"
+    when "--help" then eval "$OPT_help=true"
+    else
+      raise "must not happen"
+    end
+  }
+  rescue GetoptLong::AmbigousOption, GetoptLong::InvalidOption,
+          GetoptLong::MissingArgument, 
+          GetoptLong::NeedlessArgument => err
+    help
+    $srderr.puts err.message
+    exit 1
+end
+
+#------------------------ Help message ------------------------
+if $OPT_help then
+  help
+  exit(0)
+end
 
-help  if ARGV.length != 1 or /^-+h/ =~ ARGV[0]
+#------------------------ Help message ------------------------
 gturl = ARGV[0]
 gp = GPhys::IO.open_gturl(gturl)
 
-new_line_int = 6
+new_line_int = 5
+
 first_dim_len = (gp.shape[0]||1)
-fmt = " %g,"
+if $OPT_fmt then
+  fmt=$OPT_fmt
+elsif $OPT_exp then
+  fmt=" %e,"
+elsif $OPT_long then
+  fmt=" %f,"
+else
+  fmt=" %g,"
+end
+
 i = 1
 gp.val.each do |v| 
   printf(fmt,v)

data/bin/gpview

@@ -317,6 +317,7 @@ For multiple GPhys variables,
 #   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
@@ -397,13 +398,23 @@ def draw_setup
   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 )
                                  )

data/ext/numru/gphys/dim_op.c

@@ -31,6 +31,9 @@ enum bc_type {
 #define ID3z(i,j,k) ((i) + (j)*n0 + (k)*n0*nz)
 #define ID3c(i,j,k) ((i) + (j)*n0 + (k)*n0*nc)
 #define ID2(i,j) ((i) + (j)*n0)
+#define ID5(i,j,k,l,m) ((i) + (j)*ni + (k)*ni*nd1 + (l)*ni*nd1*no1 + (m)*ni*nd1*no1*nd2)
+#define NMax(i,j) ( (i) >= (j) ? (i) : (j) )
+#define NMin(i,j) ( (i) <= (j) ? (i) : (j) )
 
 static int
 convol_result_length(na_shape_t n1, na_shape_t wlen, int ibc)
@@ -410,6 +413,215 @@ running_mean(int argc, VALUE *argv, VALUE self)
     return vo;
 }
 
+/* Running tile (2D) mean for data with missing.
+   (if no missing, you can just run the 1D running mean twice.)
+ */
+static void 
+running_mean_2D_miss(zi, ni,nd1,no1,nd2,no2,
+                     with_w1, w1, wlen1, ibc1, with_w2, w2, wlen2, ibc2,
+                     zmiss, nminvalid, zo)
+    // IN
+    double *zi;
+    na_shape_t ni,nd1,no1,nd2,no2;  /* treated as 5D array (inner => outer) */
+    int with_w1, with_w2;
+    double *w1, *w2;
+    na_shape_t wlen1, wlen2;
+    int ibc1, ibc2;
+    double zmiss;
+    int nminvalid;
+    // OUT
+    double *zo;   //  must have been set to 0 everywhere
+{
+    na_shape_t i,j1,k1,j2,k2,m1,m2, jj1, jj2;
+    na_shape_t mstr1, mend1, mstr2, mend2;
+    na_shape_t wlhs1, wlhs2;
+    double wsum, wv;
+    int nm;
+
+    wlhs1 = (wlen1 - 1)/2;  // e.g. 7->3, 6->2
+    wlhs2 = (wlen2 - 1)/2;  // e.g. 7->3, 6->2
+
+    // < weighted running mean >
+
+    if ( !( ibc1 == BC_SIMPLE || ibc1 == BC_CYCLIC ) ) {
+	rb_raise(rb_eArgError,"Undefined boundary condision(1st D) (%d)", ibc1);
+    }
+    if ( !( ibc2 == BC_SIMPLE || ibc2 == BC_CYCLIC ) ) {
+	rb_raise(rb_eArgError,"Undefined boundary condision(2nd D) (%d)", ibc2);
+    }
+
+    for (k2=0; k2<no2; k2++) {
+        for (j2=0; j2<nd2; j2++) {
+            for (k1=0; k1<no1; k1++) {
+                for (j1=0; j1<nd1; j1++) {
+                    for (i=0; i<ni; i++) {
+                        wsum = 0.0;
+                        nm = 0;
+                        if (ibc1==BC_SIMPLE) {
+                            mstr1 = NMax(0,wlhs1-j1);
+                            mend1 = NMin(wlen1,nd1+wlhs1-j1);
+                        } else {  /* BC_CYCLIC */
+                            mstr1 = 0;
+                            mend1 = wlen1;
+                        }
+                        if (ibc2==BC_SIMPLE) {
+                            mstr2 = NMax(0,wlhs2-j2);
+                            mend2 = NMin(wlen2,nd2+wlhs2-j2);
+                        } else {  /* BC_CYCLIC */
+                            mstr2 = 0;
+                            mend2 = wlen2;
+                        }
+                        for (m2=mstr2; m2<mend2; m2++) {
+                            for (m1=mstr1; m1<mend1; m1++) {
+                                jj2 = j2-wlhs2+m2;
+                                jj1 = j1-wlhs1+m1;
+                                if (ibc1==BC_CYCLIC) {
+                                    if ( jj1 < 0 ) {
+                                        jj1 += nd1;
+                                    } else {
+                                        jj1 %= nd1;
+                                    }
+                                }
+                                if (ibc2==BC_CYCLIC) {
+                                    if ( jj2 < 0 ) {
+                                        jj2 += nd2;
+                                    } else {
+                                        jj2 %= nd2;
+                                    }
+                                }
+                                if ( zi[ID5(i,jj1,k1,jj2,k2)] != zmiss ) {
+                                    wv = 1.0;
+                                    if(with_w1){ wv *= w1[m1]; }
+                                    if(with_w2){ wv *= w2[m2]; }
+                                    zo[ID5(i,j1,k1,j2,k2)] +=
+                                        wv*zi[ID5(i,jj1,k1,jj2,k2)];
+                                    wsum += wv;
+                                    nm++;
+                                }
+                            }
+                        }
+                        if (nm >= nminvalid) {
+                            zo[ID5(i,j1,k1,j2,k2)] /= wsum;
+                        } else {
+                            zo[ID5(i,j1,k1,j2,k2)] = zmiss;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// driver of running_mean_2D_miss
+// (no-missing version is not needed)
+// 
+static VALUE
+running_mean_2D(obj, vi, dim1, len_or_wgt1, bc1, dim2, len_or_wgt2, bc2,
+                missv, nminvalid)
+    VALUE obj;
+    VALUE vi;     // input NArray
+    VALUE dim1;   // Integer 
+    VALUE len_or_wgt1;   // weight 1D NArray or Integer (length of uniform wgt)
+    VALUE bc1 ;   // boundary condition (Integer)
+    VALUE dim2;   // Integer 
+    VALUE len_or_wgt2;   // weight 1D NArray or Integer (length of uniform wgt)
+    VALUE bc2 ;   // boundary condition (Integer)
+    VALUE missv;  // missing value in vi
+    VALUE nminvalid;  // miminum count of non-missing vales
+{
+    struct NARRAY *na;
+    VALUE wgt;
+    na_shape_t *shi, wlen1, wlen2;
+    int with_w1, with_w2;
+    na_shape_t ni,nd1,no1,nd2,no2;
+    double *zi, *w1, *w2, zmiss;
+    int d1, d2, i, rank, ibc1, ibc2;
+    VALUE vo;
+    na_shape_t *sho, n1o;
+    int nminvalid_;  // miminum count of non-missing vales
+    double *zo;
+
+    // < process arguments >
+
+    if (!IsNArray(vi)) { rb_raise(rb_eArgError,"1st arg must be a NArray"); }
+    vi = na_cast_object(vi, NA_DFLOAT);
+    rank = NA_RANK(vi);
+    if (rank < 2) { rb_raise(rb_eArgError,"rank 1st arg must be >= 2"); }
+    zi = NA_PTR_TYPE(vi, double *);
+    GetNArray(vi, na);
+    shi = na->shape;
+
+    d1 = NUM2INT( dim1 );
+    d2 = NUM2INT( dim2 );
+    nminvalid_ = NUM2INT( nminvalid );
+
+    if (d1 >= d2) { rb_raise(rb_eArgError,"d1 < d2 is required"); }
+    if (d2 >= rank) { rb_raise(rb_eArgError,"d2 must be < rank"); }
+
+    with_w1 = IsNArray(len_or_wgt1);
+    if (with_w1)  {
+        wgt = len_or_wgt1;
+        if (NA_RANK(wgt)!=1){rb_raise(rb_eArgError,"wgt1 must be a 1D NArray");}
+        wgt = na_cast_object(wgt, NA_DFLOAT);
+        wlen1 = NA_TOTAL(wgt);
+        w1 = NA_PTR_TYPE(wgt, double *);
+    } else {
+        wlen1 = NUM2INT( len_or_wgt1 );
+        w1 == NULL; /* will not be used */
+    }
+
+    with_w2 = IsNArray(len_or_wgt2);
+    if (with_w2)  {
+        wgt = len_or_wgt2;
+        if (NA_RANK(wgt)!=1){rb_raise(rb_eArgError,"wgt2 must be a 1D NArray");}
+        wgt = na_cast_object(wgt, NA_DFLOAT);
+        wlen2 = NA_TOTAL(wgt);
+        w2 = NA_PTR_TYPE(wgt, double *);
+    } else {
+        wlen2 = NUM2INT( len_or_wgt2 );
+        w2 == NULL; /* will not be used */
+    }
+
+    ibc1 = NUM2INT( bc1 );
+    ibc2 = NUM2INT( bc2 );
+
+    zmiss = NUM2DBL(missv);
+
+
+    // < shape as 5D >
+
+    nd1 = shi[d1];   // length of the dim to filter
+    if (wlen1 >= nd1) {rb_raise(rb_eArgError,"filter len >= len of the dim1");}
+    nd2 = shi[d2];   // length of the dim to filter
+    if (wlen2 >= nd1) {rb_raise(rb_eArgError,"filter len >= len of the dim2");}
+
+    ni = no1 = no2 = 1;
+    for (i=0; i<d1; i++) {
+	ni *= shi[i];   // total lengths of dims before d
+    }
+    for (i=d1+1; i<d2; i++) {
+	no1 *= shi[i];   // total lengths of dims after d
+    }
+    for (i=d2+1; i<rank; i++) {
+	no2 *= shi[i];   // total lengths of dims after d
+    }
+
+    // < initialize the NArray to ruturn >
+
+    sho = shi; // Limited to shape conserved cases
+    vo = na_make_object(NA_DFLOAT, rank, sho, cNArray);
+    GetNArray(vo, na);
+    na_clear_data(na);
+    zo = NA_PTR_TYPE(vo, double *);
+
+    // < do the job >
+    running_mean_2D_miss(zi, ni,nd1,no1,nd2,no2,
+                         with_w1, w1, wlen1, ibc1, with_w2, w2, wlen2, ibc2,
+                         zmiss, nminvalid_, zo);
+
+    return vo;
+}
+
 static void 
 bin_mean_nomiss(zi,n0,n1,n2, len, zo)
     // IN
@@ -1209,10 +1421,15 @@ init_gphys_dim_op()
 
     cGPhys = rb_define_class_under(mNumRu, "GPhys", rb_cObject);
     rb_define_private_method(cGPhys, "c_running_mean", running_mean, -1);
+    rb_define_private_method(cGPhys, "c_running_mean_2D", running_mean_2D, 9);
+    rb_define_singleton_method(cGPhys, "c_running_mean", running_mean, -1);
+    rb_define_singleton_method(cGPhys, "c_running_mean_2D", running_mean_2D, 9);
 
     cVArray = rb_define_class_under(mNumRu, "VArray", rb_cObject);
     rb_define_private_method(cVArray, "c_bin_mean", bin_mean, -1);
     rb_define_private_method(cVArray, "c_bin_sum", bin_sum, -1);
+    rb_define_singleton_method(cGPhys, "c_bin_mean", bin_mean, -1);
+    rb_define_singleton_method(cGPhys, "c_bin_sum", bin_sum, -1);
 
     rb_define_private_method(cVArray, "c_cum_sum", cum_sum, 2);
     rb_define_singleton_method(cGPhys, "c_cell_integ_irreg", 

data/gphys.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|test_old|sample|testdata)/})
   spec.extensions << "ext/numru/gphys/extconf.rb"
 
-  spec.post_install_message = "Thanks for installing! You can add extra libraries (i.e., ruby-lapack, rb-grib) to enjoy powerful calculating and handling datasets."
+  spec.post_install_message = "Thanks for installing! You can add extra libraries (i.e., ruby-lapack, rb-gsl) to enjoy powerful calculating and handling datasets."
 
   spec.required_ruby_version = Gem::Requirement.new(">= 1.8")
 
@@ -37,8 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency(%q<ruby-netcdf>, [">= 0.6.6"])
   spec.add_runtime_dependency(%q<ruby-dcl>, [">= 1.6.1"])
   spec.add_runtime_dependency(%q<ruby-fftw3>, [">= 0.3"])
-  #spec.add_runtime_dependency(%q<gsl>, [">= 1.14"])
-  spec.add_runtime_dependency(%q<rb-gsl>, [">= 1.14"])
+  #spec.add_runtime_dependency(%q<rb-gsl>, [">= 1.14"])
   #spec.add_runtime_dependency(%q<ruby-lapack>, [">= 1.5"])
   #spec.add_development_dependency(%q<rb-grib>, [">= 0.2.0"])
 end

data/lib/numru/dclext.rb

@@ -927,6 +927,11 @@ module NumRu
     # * 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 !min || ( min.is_a?(Float) && min.nan? )|| !max || ( max.is_a?(Float) && max.nan? )
+        return [0.0]
+      end
+
       if dx > 0
         dz = dx.to_f
       else
@@ -1219,7 +1224,8 @@ module NumRu
         # draw frame, tick lines, and labels
         if fmt
           cfmt_bk = DCL::uyqfmt
-          DCL::uysfmt(fmt)
+          #DCL::uysfmt(fmt)
+          DCL::uspset('cyfmt',fmt)
         end
 
         DCL::usyaxs(axside)
@@ -1232,14 +1238,16 @@ module NumRu
         DCL::uxaxdv("b",1,index) if !inf0
         DCL::uxaxdv("t",1,index) if !inf1
 
-        DCL::uysfmt(cfmt_bk) if fmt
+        #DCL::uysfmt(cfmt_bk) if fmt
+        DCL::uspset('cyfmt',cfmt_bk) if fmt
 
       else  ## landscape ##
 
         # draw frame, tick lines, and labels
         if fmt
           cfmt_bk = DCL::uxqfmt
-          DCL::uxsfmt(fmt)
+          #DCL::uxsfmt(fmt)
+          DCL::uspset('cxfmt',fmt)
         end
 
         DCL::usxaxs(axside)
@@ -1252,7 +1260,8 @@ module NumRu
         DCL::uyaxdv("l",1,index) if !inf0
         DCL::uyaxdv("r",1,index) if !inf1
 
-        DCL::uxsfmt(cfmt_bk) if fmt
+        #DCL::uxsfmt(cfmt_bk) if fmt
+        DCL::uspset('cxfmt',cfmt_bk) if fmt
       end
 
       DCLExt.color_bar_title_units(vxmin, vxmax, vymin, vymax, portrait, voff, 

data/lib/numru/ggraph.rb

@@ -47,7 +47,7 @@ require "numru/dclext"
   * ((<next_map>))
     Set the option values effective only in the next call of ((<map>))
   * ((<line>))
-    Plot a poly-line by selecting the first dimension (with GPhys#first1D)
+    Plot a poly-line by selecting the first dimension
     if (({gphys})) is more than 2D.
   * ((<set_line>))
     Change the default option values for ((<line>)).
@@ -66,7 +66,7 @@ require "numru/dclext"
   * ((<tone_and_contour>))
     Calls ((<tone>)) and ((<contour>)) successively. 
   * ((<contour>))
-    Contour plot by selecting the first 2 dimensions (with GPhys#first2D)
+    Contour plot by selecting the first 2 dimensions
     if (({gphys})) is more than 3D.
   * ((<set_contour>))
     Set options for contour in general.
@@ -84,7 +84,7 @@ require "numru/dclext"
     is effective only for the next call of ((<contour>)).
   * ((<tone>))
     Color tone or shading by selecting the first 2 dimensions
-    (with GPhys#first2D) if (({gphys})) is more than 3D.
+    if (({gphys})) is more than 3D.
   * ((<color_bar >)) Color bar
   * ((<set_tone_levels>))
     Set tone levels for ((<tone>)) explicitly by values.
@@ -511,7 +511,7 @@ library if you like.
     * see ((<map>)).
 
 ---line(gphys, newframe=true, options=nil)
-    Plot a poly-line by selecting the first dimension (with GPhys#first1D)
+    Plot a poly-line by selecting the first dimension
     if (({gphys})) is more than 2D.
 
     ARGUMENTS
@@ -742,7 +742,7 @@ library if you like.
     * Requires numru-misc-0.0.6 or later.
 
 ---contour(gphys, newframe=true, options=nil)
-    Contour plot by selecting the first 2 dimensions (with GPhys#first2D)
+    Contour plot by selecting the first 2 dimensions
     if (({gphys})) is more than 3D.
 
     Contour levels are determined as follows:
@@ -858,7 +858,7 @@ library if you like.
 
 ---tone(gphys, newframe=true, options=nil)
     Color tone or shading by selecting the first 2 dimensions
-    (with GPhys#first2D) if (({gphys})) is more than 3D.
+    if (({gphys})) is more than 3D.
 
     Tone levels are determined as follows:
     * Tone levels are set in this method if not set by
@@ -1905,7 +1905,7 @@ module NumRu
       ['mean', nil, 'An Array to be pathed to the GPhys#mean method to take mean of the data before plotting (order applied: slice -> cut -> mean)']
     )
 
-    def data_prep_2D(gps, newframe, opts)
+    def data_prep_2D(gps, newframe, opts, len1ok: false)
       opend_here = []
       gps.collect!{|gp| 
         if gp.is_a?(String)
@@ -1921,7 +1921,11 @@ module NumRu
           end
         end
         gp = gp.mean(*opts['mean']) if opts['mean']
-        gp = gp.first2D
+        if len1ok
+          gp = gp.first2D
+        else
+          gp = gp.first2Dreally
+        end
         gp = gp.transpose(1,0) if opts['transpose'] || opts['exchange']
         if opts['xintv'] || opts['yintv']
           gp = gp.copy
@@ -1981,7 +1985,7 @@ module NumRu
       [xd, yd, closer, *gps]
     end
 
-    def data_prep_1D(gphys, opts)
+    def data_prep_1D(gphys, opts, len1ok: false)
       gp = gphys
       if gp.is_a?(String)
         gp = GPhys::IO.str2gphys(gp) 
@@ -1998,7 +2002,11 @@ module NumRu
         end
       end
       gp = gp.mean(*opts['mean']) if opts['mean']
-      gp = gp.first1D
+      if len1ok
+        gp = gp.first1D
+      else
+        gp = gp.first1Dreally
+      end
       window = ( @@next_fig['window'] if @@next_fig ) || @@fig['window']
       window = ( window ? window.dup : [nil, nil, nil, nil])
       max = opts['max']; min = opts['min']
@@ -2016,7 +2024,7 @@ module NumRu
       [xd, yd, closer, gp, window]
     end        
 
-    def data_prep_1D2(fx, fy, opts)
+    def data_prep_1D2(fx, fy, opts, len1ok: false)
       gpx = fx
       gpy = fy
       to_close = Array.new
@@ -2043,18 +2051,26 @@ module NumRu
         end
       end
       gpx = gpx.mean(*opts['mean']) if opts['mean']
-      gpx = gpx.first1D
+      if len1ok
+        gpx = gpx.first1D
+      else
+        gpx = gpx.first1Dreally
+      end
 
       gpy = gpy[*opts['slice']] if opts['slice']
       if (cut = opts['cut'])  # substitution, not ==
         if cut.is_a?(Array) 
           gpy = gpy.cut(*cut) 
         else
-          gpy = gpy.cut(cut) 
+          gpy = gpy.cut(cut)
         end
       end
       gpy = gpy.mean(*opts['mean']) if opts['mean']
-      gpy = gpy.first1D
+      if len1ok
+        gpy = gpy.first1D
+      else
+        gpy = gpy.first1Dreally
+      end
 
       [gpx, gpy, closer]
     end        
@@ -2256,7 +2272,7 @@ module NumRu
         @@next_mark = nil
       end
       opts = @@mark_options.interpret(options)
-      x, y, closer, gp, window = data_prep_1D(gphys, opts)
+      x, y, closer, gp, window = data_prep_1D(gphys, opts, len1ok: true)
       if newframe
         fig(x, y, {'window'=>window})
         axes_or_map_and_ttl(gp, opts, x, y)
@@ -3230,6 +3246,8 @@ module NumRu
       ['x_given_y', false, 'If false (default), regress y for given x. If true, x given y.'],
       ['annot_slope', nil, 'Whether to show the slope on the right margin. nil: show when itr=1,4, do not show when itr=2,3; true: show; false: not show'],
       ['annot_intercept', false, '[Meaningful only when itr=1 (linear scaling plot)] if true, show the intercept on the right margin'],
+      ['annot_cor', false, 'Whether to show correlation coefficient on the right margin.'],
+      ['annot_r2', false, 'Whether to show squared correlation coefficient on the right margin.'],
       ['limit', false, 'If true, regression line is shown only over the range between max and min of the independent variable. If false, regression line is written over the whole range of the independent variable'],
       ['clip', true, "If true, use DCL's clipping not to show the line outside the viewport"],
       ['index', 1, 'line index'],
@@ -3289,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 = linear_regression(xs,ys)
+        a,b,r2 = linear_regression(xs,ys)
         if opts["limit"]
           xr[0] = x.min
           xr[1] = x.max
@@ -3300,7 +3318,7 @@ module NumRu
         yrs = a + b*xrs
         yr = !ylog ? yrs : NMath::exp(yrs)
       else
-        a,b = linear_regression(ys,xs)
+        a,b,r2 = linear_regression(ys,xs)
         if opts["limit"]
           yr[0] = y.min
           yr[1] = y.max
@@ -3318,6 +3336,8 @@ module NumRu
 
       ai = opts['annot_intercept'] || opts['annot_intercept'].nil? && itr==1
       as = opts['annot_slope'] || opts['annot_slope'].nil? && (itr==1 or itr==4)
+      ac = opts['annot_cor']
+      ar2 = opts['annot_r2']
       if as && ai 
         if y_given_x
           annot = ["regr  y=a+bx:", 
@@ -3326,6 +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
         annotate(annot, @@nannot)
       elsif as  
         if y_given_x
@@ -3333,10 +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
         annotate(annot, @@nannot)
       end
 
-      [a,b]
+      [a,b,r2]
     end
   end
 
@@ -3347,7 +3371,9 @@ module NumRu
     my = y.mean
     b = cxy/cxx
     a = my - b*mx
-    [a,b]
+    cyy, ndiv = NMMath.covariance(y,y)
+    r2 = cxy/Math.sqrt(cxx*cyy)
+    [a,b,r2]
   end
 
   def linear_reg_slope_error(x,y,a,b)

data/lib/numru/gphys/axis.rb

@@ -600,7 +600,7 @@ module NumRu
 	 self
       end
       def get_aux(name)
-	 @aux[name]
+	 @aux && @aux[name]
       end
       def aux_names
 	 @aux ? @aux.keys : []
@@ -890,7 +890,25 @@ module NumRu
       end
       private :_cut_
 
-      def _minloc_(a)  # private to be used in _cut_ 
+      # Find index nearest to loc
+      #
+      # * loc (Numeric, Date, DateTime)
+      #
+      # Return value: the index (Integer)
+      def nearest_index(loc)
+        if loc.class <= Date
+          loc = UNumeric.from_date(loc,pos.units,self.pos.get_att('calendar')).val
+        end
+        ax = self.pos.val
+        if cyclic_extendible?
+          dx, base = _cyclic_dx(ax-loc, modulo)
+        else
+          dx = (ax-loc).abs
+        end
+        idx = _minloc_(dx)
+      end
+
+      def _minloc_(a)  # private to be used in nearest_index (for cut etc)
         # Developper's MEMO: Such a method should be supported in NArray
         minloc = 0  # initialization
         for i in 0...(a.length-1)   # here, do not assume monotonic
@@ -1158,7 +1176,16 @@ if $0 == __FILE__
 
    p "## test join (cell)"
    axcel_c2 = Axis.new(true).set_cell(xc+10,xb+10)
+   axcel_c2.set_aux('aux1',xc*10)
    axcel_c2.set_pos_to_center
    jax = Axis.join([axcel_c,axcel_c2])
    p jax, jax.name, jax.pos.val.to_a, jax.cell_bounds.val.to_a
+
+   p "## test neaest index"
+   loc = 1.1
+   p axpt, loc, axpt.nearest_index(loc)
+   xc.put_att("modulo",[10.0])
+   axpt_cyc = Axis.new().set_pos(xc)
+   loc = -8.5
+   p axpt_cyc, axpt_cyc.modulo, loc, axpt.nearest_index(loc)
 end

data/lib/numru/gphys/gphys.rb

@@ -805,7 +805,7 @@ module NumRu
       ## For graphics -->
       def first3D
 	raise "rank less than 3" if rank < 3
-	self[true,true,*([0]*(rank-3))]
+	self[true,true,true,*([0]*(rank-3))]
       end
       def first2D
 	raise "rank less than 2" if rank < 2
@@ -815,6 +815,31 @@ module NumRu
 	raise "rank less than 1" if rank < 1
 	self[true,*([0]*(rank-1))]
       end
+      def firstNDreally(nd)
+        sh = shape_current
+        n = 0
+        sel = sh.map do |len|
+          if len > 1 && n < nd
+            n += 1
+            true
+          else
+            0
+          end
+        end
+        if n<nd
+          raise "Invalid shape #{sh} (not really #{nd}D or greater): # of dims with len>1 is fewer than #{nd}"
+        end
+        self[*sel]
+      end
+      def first3Dreally
+        firstNDreally(3)
+      end
+      def first2Dreally
+        firstNDreally(2)
+      end
+      def first1Dreally
+        firstNDreally(1)
+      end
       ## <-- For graphics
 
       def coerce(other)

data/lib/numru/gphys/gphys_dim_op.rb

@@ -20,15 +20,16 @@ module NumRu
     # * len_or_wgt : If Integer, specifies the length; if 1D NArray,
     #   specifies the weight (e.g., NArray[1.0, 2.0, 1.0] for
     #   the 1-2-1 smooting)
-    # * bc (Integer; optional) : Speficy one of the folloing:
-    #   * GPhys::BC_SIMPLE (default) : Averaging is trucated at the boundaries
+    # * bc (Integer; optional) : Specify one of the following:
+    #   * nil (default) : choose BC_SIMPLE or BC_CYCLIC automatically
+    #   * GPhys::BC_SIMPLE : Averaging is truncated at the boundaries
     #     (the number of grid points used is reduced near the boundaries).
     #     The shape of the object is conserved.
     #   * GPhys::BC_CYCLIC : Cyclic boundary condition. Shape conserved.
     #   * GPhys::BC_TRIM : Grids near the boundaries are trimmed to
     #     secure the number of grid points to average.
     #     Shape not conserved; length along the dim is reduced by (len-1).
-    # * nminvalid (Integer; optional; defualt=1): 
+    # * nminvalid (Integer; optional; default=1): 
     #   This parameter is used only when the data have missing.
     #   Minimum number of grid points needed for averaging.
     #   Must be from 1 to len.
@@ -40,15 +41,23 @@ module NumRu
     # * If the length of the running mean is even number, fewer
     #   grid points are used from the "left" side; e.g.,
     #   If len is 6, result[2] is a mean over self[0]..self[5].
-    # * Regardless the na_type of self, double is used for avaraging, so:
+    # * Regardless the na_type of self, double is used for averaging, so:
     # * This method does not support complex numbers.
     # 
-    def running_mean(dim, len_or_wgt=nil, bc=BC_SIMPLE, nminvalid=1)
+    def running_mean(dim, len_or_wgt=nil, bc=nil, nminvalid=1)
 
       #< process arguments >
 
       dim = dim_index(dim)  # to handle String or negative specification
 
+      if bc.nil?
+        if axis(dim).cyclic_extendible?
+          bc=BC_CYCLIC
+        else
+          bc=BC_SIMPLE
+        end
+      end
+
       case len_or_wgt
       when nil
         raise ArgumentError, "You need to specify the length (Integer) or the weight (1D NArray) as the 2nd argument"
@@ -95,6 +104,78 @@ module NumRu
 
     end
 
+    # Running mean along two dimensions (with optional weight specification).
+    #
+    # This method would be needed for data with missing. If the data
+    # has no missing, you should apply running_mean consecutively
+    # along the two dimensions you want, which will be faster and efficient.
+    # 
+    # However, if the data have missing, the results are not the same.
+    # That's why this method is needed.
+    # 
+    # ARGUMENTS
+    # * dim1 (Integer or String) : a dimension to apply the running mean
+    # * dim2 (Integer or String) : another dimension to apply the running mean
+    #   (dim1 must be smaller than dim2)
+    # * len_or_wgt1 : If Integer, specifies the length of running mean for dim1.
+    #   If 1D NArray, it specifies the weight (e.g., NArray[1.0, 2.0, 1.0] for
+    #   the 1-2-1 smoothing)
+    # * len_or_wgt2 : as len_or_wgt1 but for dim2.
+    # * bc1 (Integer or nil; optional) : Specify one of the following for dim1:
+    #   * nil : choose BC_SIMPLE or BC_CYCLIC automatically
+    #   * GPhys::BC_SIMPLE : Averaging is truncated at the boundaries
+    #     (the number of grid points used is reduced near the boundaries).
+    #     The shape of the object is conserved.
+    #   * GPhys::BC_CYCLIC : Cyclic boundary condition. Shape conserved.
+    # * bc2 : as bc1 but for dim2.
+    # * nminvalid (Integer; optional; default=1): 
+    #   Minimum number of grid points needed to define the running mean
+    #   (it is the number of valid data in the 2-dimensional tile).
+    #
+    def running_mean_2D(dim1, dim2, len_or_wgt1, len_or_wgt2,
+                        bc1=nil, bc2=nil,
+                        nminvalid=1)
+
+      dim1 = dim_index(dim1)  # to handle String or negative specification
+      dim2 = dim_index(dim2)  # to handle String or negative specification
+
+      if bc1.nil?
+        if axis(dim1).cyclic_extendible?
+          bc1=BC_CYCLIC
+        else
+          bc1=BC_SIMPLE
+        end
+      end
+      if bc2.nil?
+        if axis(dim2).cyclic_extendible?
+          bc2=BC_CYCLIC
+        else
+          bc2=BC_SIMPLE
+        end
+      end
+
+      vi = self.val
+      if vi.is_a?(NArray)
+        # Just for convenience.
+        self.running_mean(dim1, len_or_wgt1, bc1, nminvalid).running_mean(dim2, len_or_wgt2, bc2, nminvalid)
+      end
+      
+      if (vi.typecode > NArray::DFLOAT)
+        raise("This method supports only real or integer data")
+      end 
+      if vi.is_a?(NArrayMiss)
+        vi, missval = nam2na_missval(vi)
+        vo = c_running_mean_2D(vi, dim1,len_or_wgt1,bc1, dim2,len_or_wgt2,bc2,
+                missval, nminvalid)
+        vo = NArrayMiss.to_nam(vo, vo.ne(missval) )
+      else
+        raise("This method accepts only data with missing. If not, you should apply running_mean twice for dim1 & dim2, respectively")
+      end
+
+      vvo = VArray.new( vo, self.data, self.name )  # Inherit name & attrs
+      GPhys.new( self.grid, vvo )
+    end
+
     # Binning along a dimension (mean)
     # 
     # The values are averaged every "len" grids; unlike running_mean
@@ -199,7 +280,7 @@ module NumRu
         acs = Array.new
         assoccoordnames.each do |nm|
           ac = assoc_coord_gphys(nm)
-          acs.push(ac) if !ac.dimnames.include?(dimname)
+          acs.push(ac) if !ac.axnames.include?(dimname)
         end
         newgrid.set_assoc_coords(acs) if acs.length > 0
       end

data/lib/numru/gphys/gphys_netcdf_io.rb

@@ -428,6 +428,7 @@ module NumRu
 	  newaxes.push( newax )
 	}
         if acnms = grid_or_gphys.assoccoordnames
+          (nms = file.var_names) and acnms -= nms
           acnms.each{|nm| 
             acgp = grid_or_gphys.assoc_coord_gphys(nm)
             VArrayNetCDF.write(file, acgp.data, nil, acgp.axnames)

data/lib/numru/gphys/grads_gridded.rb

@@ -919,7 +919,7 @@ EOS
 
         imax, jmax = isize.to_i, jsize.to_i
         dx, dy = dx.to_f, dy.to_f
-        bi, bj = (iref.to_i)-1, (jref.to_i)-1
+        bi, bj = iref.to_f-1.0, jref.to_f-1.0
         by, bx = latref.to_f, lonref.to_f
         sy,sx = struelat.to_f, slon.to_f
         sy2, = ntruelat.to_f
@@ -932,8 +932,11 @@ EOS
         unless sx.abs < 180
           raise "parameter for standard is invalid"
         end
-        unless 0 < sy.abs && sy.abs < sy2.abs && sy2.abs < 90 && sy*sy2>0
-          raise "parameter for standard is invalid"
+        if sy.abs > 90
+          raise "Invalid PDEF (in control file): |struelat|>90"
+        end
+        if sy2.abs > 90
+          raise "Invalid PDEF (in control file): |ntruelat|>90"
         end
         bx = bx*PI/180
         by = by*PI/180

data/lib/numru/gphys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gphys
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Takeshi Horinouchi
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -112,20 +112,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rb-gsl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.14'
 description: Comprehensive library for self-descriptive gridded physical data (in
   NetCDF, GrADS, or on memory) with graphics. This version works with Ruby 2.0.
 email:
@@ -642,7 +628,7 @@ licenses:
 - BSD-2-Clause
 metadata: {}
 post_install_message: Thanks for installing! You can add extra libraries (i.e., ruby-lapack,
-  rb-grib) to enjoy powerful calculating and handling datasets.
+  rb-gsl) to enjoy powerful calculating and handling datasets.
 rdoc_options: []
 require_paths:
 - ext
@@ -659,7 +645,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A multi-purpose class to handle Gridded Physical quantities