gphys 1.4.3.2 → 1.5.0

data/.gitignore

@@ -1,3 +1,9 @@
+*.[oa]
+*~
+*.so
+*.log
+Makefile
+ChangeLog
 /.bundle/
 /.yardoc
 /Gemfile.lock
@@ -5,4 +11,4 @@
 /coverage/
 /pkg/
 /spec/reports/
-/tmp/
+/tmp/

data/Rakefile

@@ -1,2 +1,37 @@
-require "bundler/gem_tasks"
+# -* coding: utf-8 -*-
+require 'rake/testtask'
+require 'rake/extensiontask'
+require 'rake/packagetask'
+begin
+  require 'bundler/gem_helper'  # instead of 'bundler/gem_tasks' -> need manual
+                                # calls of install_tasks (see below)
+rescue LoadError
+  puts 'If you want to create gem, You must install Bundler'
+end
 
+# manual calls of install_tasks to support multiple gemspec files
+Bundler::GemHelper.install_tasks(name: "gphys")
+Bundler::GemHelper.install_tasks(name: "gphys-bigmem")
+
+require './lib/numru/gphys/version.rb'
+def version
+  NumRu::GPhys::VERSION
+end
+
+task :default => :test
+task :test => :compile
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
+  t.test_files = FileList['test/test_*.rb'].exclude('test/test_assoccoords.rb')
+end
+
+Rake::ExtensionTask.new do |ext|
+  ext.name = 'gphys_ext'
+  ext.ext_dir = 'ext/numru/gphys'
+  ext.lib_dir = 'lib/numru'
+end
+
+Rake::PackageTask.new('gphys', "#{version}") do |t|
+  t.need_tar_gz = true
+  t.package_files.include `git ls-files`.split("\n")
+end

data/bin/gpview

@@ -45,10 +45,14 @@ if you want to know more description, please read
 
 :--wsn [1-4]:
   set work staion number. each number represent output device:
-  1 : X window.
-  2 : PS file. (named dcl.ps) 
-  3 : Tcl/Tk file.
-  4 : GTK Windows (depend on dcl-5.3)
+  * 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.
@@ -94,6 +98,9 @@ if you want to know more description, please read
 :--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
 
@@ -225,7 +232,7 @@ if you want to know more description, please read
 :--udsfmt [strings]:
   change contour label format. see UDCNTR/DCL manual for the format.
 
-== EXAMPLES
+= EXAMPLES
 
 For a single GPhys variable, 
 
@@ -240,6 +247,7 @@ For a single GPhys variable,
     % 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
@@ -254,59 +262,62 @@ For multiple GPhys variables,
     % gpview --var temp,lon=130:150 data?.nc 
     % gpview --anim t --var temp,lon=130:150 data*.nc 
 
-
-== 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)
-
 =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)
+#
 #################################################
 require "getoptlong"        # for option_parse
 require "numru/ggraph"      # ggraph library
@@ -726,6 +737,7 @@ parser.set_options(
                    ['--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],
@@ -838,7 +850,11 @@ 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
 
@@ -935,6 +951,7 @@ while ARGV[0] do
   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)

data/{dim_op.c → ext/numru/gphys/dim_op.c}

@@ -14,7 +14,8 @@
 #  define RARRAY_LEN(ary) (RARRAY(ary)->len)
 #endif
 
-#ifndef HAVE_NA_SHAPE_T
+/* for compatibility for NArray and NArray with big memory patch */
+#ifndef NARRAY_BIGMEM
 typedef int na_shape_t;
 #endif
 
@@ -904,7 +905,9 @@ cell_integ_irreg(obj, f, z, zdim, nzbound, ccell, w)
     }
 
     // main loop
+    #pragma omp parallel for private(nzw,m,k,wa,wb,fa,fb,dz,wac,wbc,a,b,fi)
     for (l=0; l<n2; l++){
+        #pragma omp parallel for private(nzw,m,k,wa,wb,fa,fb,dz,wac,wbc,a,b,fi)
 	for (j=0; j<n0; j++){
 	    if (nzbound == Qnil) {
 		nzw = nz;

data/{ext_coord.c → ext/numru/gphys/ext_coord.c}

@@ -13,6 +13,16 @@
 #  define RARRAY_LEN(ary) (RARRAY(ary)->len)
 #endif
 
+/* for compatibility for NArray and NArray with big memory patch */
+#ifndef NARRAY_BIGMEM
+typedef int      na_shape_t;
+typedef int32_t  na_shape_na_t;  /* Usually same as na_shape_t, 
+                                    but to ensure the use of NA_LINT */
+#define NA_SIZE NA_LINT
+#else
+typedef na_shape_t  na_shape_na_t;  
+#endif
+
 /* cut_range : a private method for AssocCoord (used in AssocCoord#cut)
  */
 static VALUE
@@ -21,13 +31,16 @@ assoc_coord_cut_range(self, vmins, vmaxs, crds, masks, crdaxexist, orgaxlens)
      // All input variables are supposed to be Arrays
 {
     VALUE wheres, whna;  // return value (Array)
-    int nc, ic, na, ia, jlen, j, klen, k, ndimk, dimk;
-    int *lens, lentot, lenmax, *mod, *sub, **mlt, *jmlt, *dimk2a; 
-    int last_non0, l, cidx, *natype, *nomask, included, whcount;
-    int32_t **axexist, *whptr, *whbuf;
+    int nc, ic;
+    na_shape_t na, ia, jlen, j, klen, k, ndimk, dimk;
+    na_shape_t *lens, lentot, lenmax, *mod, *sub, **mlt, *jmlt, *dimk2a; 
+    na_shape_t last_non0, l, cidx, included, whcount;
+    int *natype, *nomask;
+    int32_t **axexist;
+    na_shape_na_t *whptr, *whbuf;
     double *vmax, *vmin, val, **dval;
     float   **fval;
-    int8_t **mask;
+    u_int8_t **mask;
 
     nc = RARRAY_LEN(crds);     // lengths of vmins,vmaxs,crds,masks,crdaxexist
     na = RARRAY_LEN(orgaxlens);
@@ -47,23 +60,28 @@ assoc_coord_cut_range(self, vmins, vmaxs, crds, masks, crdaxexist, orgaxlens)
 
     lentot = 1;
     lenmax = -1;
-    lens = ALLOCA_N(int,na);
+    lens = ALLOCA_N(na_shape_t,na);
     for(ia=0; ia<na; ia++){
 	lens[ia] = NUM2INT( RARRAY_PTR(orgaxlens)[ia] );
 	lentot *= lens[ia];
 	if (lens[ia] > lenmax) { lenmax = lens[ia]; }
     }
     ndimk = ( (na==1) ? 1 : (na-1) ) ;
-    mod = ALLOCA_N(int,ndimk);
-    sub = ALLOCA_N(int,ndimk);
-    mlt = ALLOCA_N(int*,nc);
+    mod = ALLOCA_N(na_shape_t,ndimk);
+    sub = ALLOCA_N(na_shape_t,ndimk);
+    mlt = ALLOCA_N(na_shape_t*,nc);
     axexist = ALLOCA_N(int32_t*,nc);
     for(ic=0; ic<nc; ic++){
-	mlt[ic] = ALLOCA_N(int,ndimk);
-	axexist[ic] = NA_PTR_TYPE( RARRAY_PTR(crdaxexist)[ic], int32_t* );
+	mlt[ic] = ALLOCA_N(na_shape_t,ndimk);
+	if ( NA_TYPE( RARRAY_PTR(crdaxexist)[ic] ) == NA_LINT ) {
+	    axexist[ic] = NA_PTR_TYPE( RARRAY_PTR(crdaxexist)[ic], int32_t* );
+	} else {
+	    rb_raise(rb_eArgError,"crdaxexist[%d] is not NArray::LINT [%s:%d]",
+		     ic,__FILE__,__LINE__);
+	}
     }
-    jmlt = ALLOCA_N(int,nc);
-    dimk2a = ALLOCA_N(int,ndimk);
+    jmlt = ALLOCA_N(na_shape_t,nc);
+    dimk2a = ALLOCA_N(na_shape_t,ndimk);
 
     /* ruby objs to C for coordinates and cut params */
 
@@ -71,7 +89,7 @@ assoc_coord_cut_range(self, vmins, vmaxs, crds, masks, crdaxexist, orgaxlens)
     vmax = ALLOCA_N(double,nc);
     dval = ALLOCA_N(double*,nc);
     fval = ALLOCA_N(float*,nc);
-    mask = ALLOCA_N(int8_t*,nc);
+    mask = ALLOCA_N(u_int8_t*,nc);
     nomask = ALLOCA_N(int,nc);
     natype = ALLOCA_N(int,nc);
     for(ic=0; ic<nc; ic++){
@@ -95,7 +113,7 @@ assoc_coord_cut_range(self, vmins, vmaxs, crds, masks, crdaxexist, orgaxlens)
     }
 
     /* prepare output objs */
-    whbuf = ALLOCA_N(int32_t,lenmax);
+    whbuf = ALLOCA_N(na_shape_na_t,lenmax);
     
     /* main loop */
     for(ia=0; ia<na; ia++){
@@ -185,9 +203,9 @@ assoc_coord_cut_range(self, vmins, vmaxs, crds, masks, crdaxexist, orgaxlens)
 		}
 	    }
 	}
-	whna = na_make_object(NA_LINT, 1, &whcount, cNArray);
+	whna = na_make_object(NA_SIZE, 1, &whcount, cNArray);
 	rb_ary_push( wheres, whna ); 
-	whptr = NA_PTR_TYPE( whna, int32_t* );
+	whptr = NA_PTR_TYPE( whna, na_shape_na_t* );
 	for(j=0; j<whcount; j++){
 	    whptr[j] = whbuf[j];
 	}

data/ext/numru/gphys/extconf.rb

@@ -0,0 +1,43 @@
+require 'mkmf'
+gem_path = nil
+
+if Gem.respond_to?(:find_files) and Gem.find_files("narray.h").length > 0
+  require "rbconfig"
+  so = RbConfig::CONFIG["DLEXT"]
+  narray_include = File.expand_path(File.dirname(Gem.find_files("narray.h")[0]))
+  narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
+else
+  gem_home=(`gem environment GEM_HOME`).chomp
+  narray_dir = Dir.glob("#{gem_home}/gems/narray-*/ext/narray").sort[-1]
+  if narray_dir
+    narray_include = narray_lib = narray_dir
+  else
+    narray_include = narray_lib = [ $sitearchdir, $vendorarchdir]
+  end
+end
+dir_config('narray', narray_include, narray_lib)
+
+require "narray"
+if NArray.const_defined?(:SUPPORT_BIGMEM) && NArray::SUPPORT_BIGMEM
+
+  case RbConfig::CONFIG["CC"]
+  when "gcc"
+    omp_opt = "-fopenmp"
+  else
+    omp_opt = nil
+  end
+  omp_opt = arg_config("--openmp", omp_opt)
+
+  omp_opt = nil if omp_opt.to_s.empty?
+
+  if omp_opt
+    $CFLAGS << " " << omp_opt
+    $DLDFLAGS << " " << omp_opt
+    warn "OpenMP support: ON"
+  else
+    warn "OpenMP support: OFF"
+    warn "if you want to enable openmp, set --openmp=compile_option"
+  end
+end
+
+create_makefile('numru/gphys_ext')

data/{interpo.c → ext/numru/gphys/interpo.c}

@@ -13,6 +13,11 @@
 #  define RARRAY_LEN(ary) (RARRAY(ary)->len)
 #endif
 
+/* for compatibility for NArray and NArray with big memory patch */
+#ifndef NARRAY_BIGMEM
+typedef int na_shape_t;
+#endif
+
 static VALUE
 interpo_do(obj, shape_to, idxmap, val_from, missval, extrapo)
      VALUE obj;
@@ -27,17 +32,17 @@ interpo_do(obj, shape_to, idxmap, val_from, missval, extrapo)
     struct NARRAY *naf;
     VALUE vm;
     int natype;
-    int *sht;  // shape to (could be size_t if NArray is changed)
-    int *shf;  // shape from (could be size_t if NArray is changed)
-    size_t cshf;
-    size_t rankf, rankt, lent;
+    na_shape_t *sht;  // shape to
+    na_shape_t *shf;  // shape from
+    na_shape_t cshf;
+    na_shape_t rankf, rankt, lent;
     double *pt, *pf;
     int nomiss;
     double vmiss;
     int extr;
-    size_t i, it, kf, j, k, l;
+    na_shape_t i, it, kf, j, k, l;
     int *mtyp;
-    size_t *dm, *dm2, *dm2f, *dm3, *dm3f, *dm4, *dm4f;
+    na_shape_t *dm, *dm2, *dm2f, *dm3, *dm3f, *dm4, *dm4f;
     int **di, nid, nic;
     double **df, *f, a;
     int *idf, idfc, *idt;
@@ -59,7 +64,7 @@ interpo_do(obj, shape_to, idxmap, val_from, missval, extrapo)
     // read argument (shape_to)
 
     rankt = RARRAY_LEN(shape_to);
-    sht = ALLOCA_N(int, rankt);
+    sht = ALLOCA_N(na_shape_t, rankt);
     for(i=0; i<rankt; i++){
 	sht[i] = NUM2INT( RARRAY_PTR(shape_to)[i] );
     }
@@ -90,13 +95,13 @@ interpo_do(obj, shape_to, idxmap, val_from, missval, extrapo)
     }
 
     mtyp = ALLOCA_N(int,    rankf);
-    dm   = ALLOCA_N(size_t, rankf);
-    dm2  = ALLOCA_N(size_t, rankf);
-    dm2f = ALLOCA_N(size_t, rankf);
-    dm3  = ALLOCA_N(size_t, rankf);
-    dm3f = ALLOCA_N(size_t, rankf);
-    dm4  = ALLOCA_N(size_t, rankf);
-    dm4f = ALLOCA_N(size_t, rankf);
+    dm   = ALLOCA_N(na_shape_t, rankf);
+    dm2  = ALLOCA_N(na_shape_t, rankf);
+    dm2f = ALLOCA_N(na_shape_t, rankf);
+    dm3  = ALLOCA_N(na_shape_t, rankf);
+    dm3f = ALLOCA_N(na_shape_t, rankf);
+    dm4  = ALLOCA_N(na_shape_t, rankf);
+    dm4f = ALLOCA_N(na_shape_t, rankf);
     di   = ALLOCA_N(int *,    rankf);
     df   = ALLOCA_N(double *, rankf);
     nid = 0;
@@ -231,13 +236,13 @@ interpo_do(obj, shape_to, idxmap, val_from, missval, extrapo)
 static void
 __interpo_find_loc_1D(N, P, n, p, vmiss, extr, ids, f)
      double *P, *p;   // INPUT
-     size_t N, n;     // INPUT
+     na_shape_t N, n;     // INPUT
      double vmiss;    // INPUT
      int extr;        // INPUT
      int *ids;        // OUTPUT
      double *f;       // OUTPUT
 {
-    size_t j;
+    na_shape_t j;
     int i, il, ir;
     int down;
 
@@ -313,13 +318,13 @@ interpo_find_loc_1D(obj, X, x, missval, extrapo)
 {
     VALUE na_ids, na_f;
     VALUE chk;
-    size_t N, n;
+    na_shape_t N, n;
     struct NARRAY *na;
     double *P, *p, vmiss;
     int extr;
     int *ids;
     double *f;
-    int shape[1];  // could be size_t if NArray is changed
+    na_shape_t shape[1];
 
     // check and unwrap the input arguments
 
@@ -375,20 +380,20 @@ interpo_find_loc_1D_MD(obj, X, x, dimc, missval, extrapo)
 {
     VALUE na_ids, na_f;
     VALUE chk;
-    size_t N, n1;
+    na_shape_t N, n1;
     struct NARRAY *na;
     double *P, *p, *p1, vmiss;
     int extr;
     int *ids, *ids1;
     double *f, *f1;
-    int *shr;  // shape of the result (could be size_t if NArray is changed)
-    int *shl;  // shape of multi-D loop (could be size_t if NArray is changed)
-    int *shx;  // shape of x (could be size_t if NArray is changed)
+    na_shape_t *shr;  // shape of the result
+    na_shape_t *shl;  // shape of multi-D loop
+    na_shape_t *shx;  // shape of x
     int dmc; // dimc
     int rank, dl, dc;
-    size_t *cshxl, *cshrl, *cshl; // cumulative shapes for looping
-    size_t fxl;    // same but only for the dimension treated here
-    size_t il, i, j, ix, ir, totl;
+    na_shape_t *cshxl, *cshrl, *cshl; // cumulative shapes for looping
+    na_shape_t fxl;    // same but only for the dimension treated here
+    na_shape_t il, i, j, ix, ir, totl;
 
     // check and unwrap the input arguments
 
@@ -423,8 +428,8 @@ interpo_find_loc_1D_MD(obj, X, x, dimc, missval, extrapo)
 
     // prepare output NArrays
 
-    shl = ALLOCA_N(int, rank-1);
-    shr = ALLOCA_N(int, rank);
+    shl = ALLOCA_N(na_shape_t, rank-1);
+    shr = ALLOCA_N(na_shape_t, rank);
     shr[0] = N;
     totl = 1;
     for(dl=0,dc=0; dl<rank-1; dl++,dc++){
@@ -433,13 +438,13 @@ interpo_find_loc_1D_MD(obj, X, x, dimc, missval, extrapo)
 	totl *= shl[dl];
     }
 
-    cshl = ALLOCA_N(size_t, rank-1);
+    cshl = ALLOCA_N(na_shape_t, rank-1);
     cshl[0] = 1;
     for(dl=1; dl<rank-1; dl++){
 	cshl[dl] = cshl[dl-1]*shl[dl-1];
     }
 
-    cshxl = ALLOCA_N(size_t, rank-1);
+    cshxl = ALLOCA_N(na_shape_t, rank-1);
     if(dmc==0) {
  	fxl = 1;
 	cshxl[0] = shx[0];
@@ -461,7 +466,7 @@ interpo_find_loc_1D_MD(obj, X, x, dimc, missval, extrapo)
 	fxl = cshxl[rank-2]*shx[rank-2];
     }
 
-    cshrl = ALLOCA_N(size_t, rank-1);
+    cshrl = ALLOCA_N(na_shape_t, rank-1);
     cshrl[0] = shr[0];
     for(dl=1; dl<rank-1; dl++){
 	cshrl[dl] = cshrl[dl-1]*shr[dl];