gentooboontoo-gphys 0.6.1.3 → 1.3.1.1

data/lib/numru/gphys/grib_params.rb

@@ -311,6 +311,7 @@ PARAM_CLWMR = 2153
 PARAM_O3MR = 2154
 PARAM_CIN = 2156
 PARAM_CAPE = 2157
+PARAM_VBDSF = 2166
 PARAM_HPBL = 2221
 PARAM_5WAVH = 2222
 PARAM_5WAVA = 2230
@@ -455,6 +456,71 @@ PARAM_WATV_NFLX = 4072
 PARAM_DIV_MST_FLX = 4084
 
 
+## JMA
+PARAM_BVF2 = 5132
+PARAM_SRF_UGRDM = 5136
+PARAM_SRF_VGRDM = 5137
+PARAM_SRF_TMPM = 5138
+PARAM_SRF_SPFHM = 5139
+PARAM_TSC = 5144
+PARAM_TSG = 5145
+PARAM_CWORK = 5146
+PARAM_FGLU = 5147
+PARAM_FGLV = 5148
+PARAM_ADVUA = 5151
+PARAM_VWV = 5152
+PARAM_FGSV = 5154
+PARAM_GFLX = 5155
+PARAM_UWV = 5157
+PARAM_FGSU = 5159
+PARAM_CSUSF = 5160
+PARAM_CSDSF = 5161
+PARAM_CSULF = 5162
+PARAM_CSDLF = 5163
+PARAM_ADVVA = 5165
+PARAM_FRQP = 5168
+PARAM_FRQC = 5169
+PARAM_GWDUA = 5173
+PARAM_GWDVA = 5174
+PARAM_HGTM = 5175
+PARAM_UGRDM = 5176
+PARAM_VGRDM = 5177
+PARAM_VVELM = 5178
+PARAM_TMPM = 5179
+PARAM_SPFHM = 5180
+PARAM_VTU = 5200
+PARAM_VTV = 5201
+PARAM_LTRS = 5202
+PARAM_LINT = 5203
+PARAM_DSWRF = 5204
+PARAM_DLWRF = 5205
+PARAM_USWRF = 5211
+PARAM_ULWRF = 5212
+PARAM_TTHM = 5218
+PARAM_WSMX = 5219
+PARAM_PRMX = 5220
+PARAM_ADVHR = 5222
+PARAM_MSC = 5223
+PARAM_MSG = 5224
+PARAM_MFLXB = 5230
+PARAM_MFLUX = 5231
+PARAM_ADVMR = 5236
+PARAM_OZONE = 5237
+PARAM_CNVUh = 5239
+PARAM_CNVVA = 5240
+PARAM_LRGHR = 5241
+PARAM_CNVHR = 5242
+PARAM_CNVMR = 5243
+PARAM_VDFHR = 5246
+PARAM_VDFUA = 5247
+PARAM_VDFVA = 5248
+PARAM_VDFMR = 5249
+PARAM_SWHR = 5250
+PARAM_LWHR = 5251
+PARAM_LRGMR = 5253
+
+
+
 
 NAMES_UNITS = {
   PARAM_UNKNOWN => ["unknown", "dat", nil, nil],
@@ -653,7 +719,7 @@ NAMES_UNITS = {
 #163	CSDLF	W/m2		Clear Sky downward long wave flux		
 #164	CFNSF	W/m2		Cloud forcing net solar flux		
 #165	CFNLF	W/m2		Cloud forcing net long wave flux		
-#166	VBDSF	W/m2		Visible beam downward solar flux		
+  PARAM_VBDSF => ["Visible beam downward solar flux", "VBDSF", "W/m2", nil],
 #167	VDDSF	W/m2		Visible diffuse downward solar flux		
 #168	NBDSF	W/m2		Near IR beam downward solar flux		
 #169	NDDSF	W/m2		Near IR diffuse downward solar flux		
@@ -863,6 +929,69 @@ NAMES_UNITS = {
   PARAM_DIV_MST_FLX => ["Vertical integral of divergence of moisture flux", "VIDMOF", "kg/m2/s", nil],
 
 
+## JMA
+PARAM_BVF2 => ["Square of Brunt Vaisala frequency", "BVF2", "1/s^2", nil],
+PARAM_SRF_UGRDM => ["Surface 10m zonal wind", "UGRDM", "m/s", nil],
+PARAM_SRF_VGRDM => ["Surface 10m meridional wind", "VGRDM", "m/s", nil],
+PARAM_SRF_TMPM => ["Surface 2m air temperature", "TMPM", "K", nil],
+PARAM_SRF_SPFHM => ["Surface specific humidity", "SPFHM", "kg/kg", nil],
+PARAM_TSC => ["Canopy temperature", "TSC", "K", nil],
+PARAM_TSG => ["Ground temperature", "TSG", "K", nil],
+PARAM_CWORK => ["Cloud work function", "CWORK", "J/kg", nil],
+PARAM_FGLU => ["U sfc momentum flux by long gravity wave", "FGLU", "N/m^2", nil],
+PARAM_FGLV => ["V sfc momentum flux by long gravity wave", "FGLV", "N/m^2", nil],
+PARAM_ADVUA => ["Advective zonal acceleration", "ADVUA", "m/s/day", nil],
+PARAM_VWV => ["Column total of meridional water vapor flux", "VWV", "Kg/m/s", nil],
+PARAM_FGSV => ["V sfc momentum flux by short gravity wave", "FGSV", "N/m^2", nil],
+PARAM_GFLX => ["Ground heat flux", "GFLX", "W/m^2", nil],
+PARAM_UWV => ["Column total of zonal water vapor flux", "UWV", "kg/m/s", nil],
+PARAM_FGSU => ["U sfc momentum flux by short gravity wave", "FGSU", "N/m^2", nil],
+PARAM_CSUSF => ["Clear sky upward solar flux at surface", "CSUSF", "W/m^2", nil],
+PARAM_CSDSF => ["Clear sky downward solar flux at surface", "CSDSF", "W/m^2", nil],
+PARAM_CSULF => ["Clear sky upward long wave flux at top of atm", "CSULF", "W/m^2", nil],
+PARAM_CSDLF => ["Clear sky downward long wave flux at surface", "CSDLF", "W/m^2", nil],
+PARAM_ADVVA => ["Advective meridional acceleration", "ADVVA", "m/s/day", nil],
+PARAM_FRQP => ["Frequency of precipitation", "FRQP", "%", nil],
+PARAM_FRQC => ["Frequency of cumulus precipitation", "FRQC", "%", nil],
+PARAM_GWDUA => ["Gravity wave zonal acceleration", "GWDUA", "m/s/day", nil],
+PARAM_GWDVA => ["Gravity wave meridional acceleration", "GWDVA", "m/s/day", nil],
+PARAM_HGTM => ["Mean geopotential height", "HGTM", "m", nil],
+PARAM_UGRDM => ["Mean zonal wind", "UGRDM", "m/s", nil],
+PARAM_VGRDM => ["Mean meridional wind", "VGRDM", "m/s", nil],
+PARAM_VVELM => ["Mean pressure vertical velocity", "VVELM", "Pa/s", nil],
+PARAM_TMPM => ["Mean temperature", "TMPM", "K", nil],
+PARAM_SPFHM => ["Mean specific humidity", "SPFHM", "kg/kg", nil],
+PARAM_VTU => ["Column total of TU", "VTU", "KPam/s", nil],
+PARAM_VTV => ["Column total of TV", "VTV", "KPam/s", nil],
+PARAM_LTRS => ["Evapotranspiration", "LTRS", "W/m^2", nil],
+PARAM_LINT => ["Interception loss", "LINT", "W/m^2", nil],
+PARAM_DSWRF => ["Downward solar radiation flux at surface", "DSWRF", "W/m^2", nil],
+PARAM_DLWRF => ["Downward long wave radiation flux at surface", "DLWRF", "W/m^2", nil],
+PARAM_USWRF => ["Upward solar radiation at surface", "USWRF", "W/m^2", nil],
+PARAM_ULWRF => ["Upward long wave radiation flux at surface", "ULWRF", "W/m^2", nil],
+PARAM_TTHM => ["Column total of diabatic heat", "TTHM", "W/m^2", nil],
+PARAM_WSMX => ["Surface 10m maximum surface wind", "WSMX", "m/s", nil],
+PARAM_PRMX => ["Maximum hourly precipitation", "PRMX", "mm/hour", nil],
+PARAM_ADVHR => ["Advective heating rate", "ADVHR", "K/day", nil],
+PARAM_MSC => ["Canopy water content", "MSC", "mm", nil],
+PARAM_MSG => ["Ground water content", "MSG", "mm", nil],
+PARAM_MFLXB => ["Upward mass flux at cloud base", "MFLXB", "kg/m^2/s", nil],
+PARAM_MFLUX => ["Upward mass flux", "MFLUX", "kg/m^2/s", nil],
+PARAM_ADVMR => ["Advective moistening rate", "ADVMR", "kg/kg/day", nil],
+PARAM_OZONE => ["Ozone mass mixing ratio", "OZONE", "ppm", nil],
+PARAM_CNVUh => ["Convective zonal acceleration", "CNVUh", "m/s/day", nil],
+PARAM_CNVVA => ["Convective meridional acceleration", "CNVVA", "m/s/day", nil],
+PARAM_LRGHR => ["Large scale condensation heating rate", "LRGHR", "K/day", nil],
+PARAM_CNVHR => ["Convective heating rate", "CNVHR", "k/day", nil],
+PARAM_CNVMR => ["Convective moistening rate", "CNVMR", "kg/kg/s", nil],
+PARAM_VDFHR => ["Vertical diffusion heating rate", "VDFHR", "K/day", nil],
+PARAM_VDFUA => ["Vertical diffusion zonal acceleration", "VDFUA", "m/s/day", nil],
+PARAM_VDFVA => ["Vertical diffusion meridional acceleration", "VDFVA", "m/s/day", nil],
+PARAM_VDFMR => ["Vertical diffusion moistening rate", "VDFMR", "kg/kg/day", nil],
+PARAM_SWHR => ["Solar radiative heating rate", "SWHR", "k/day", nil],
+PARAM_LWHR => ["Longwave radiative heating rate", "LWHR", "K/day", nil],
+PARAM_LRGMR => ["Large scale moistening rate", "LRGMR", "kg/kg/day", nil],
+
 nil => nil
 }
 
@@ -1268,3 +1397,69 @@ PARAMS_ECMWF_162 = {   #inconmplte
   72 => PARAM_WATV_NFLX,
   84 => PARAM_DIV_MST_FLX
 }
+
+
+PARAMS_JMA = {
+  132 => PARAM_BVF2,
+  136 => PARAM_SRF_UGRDM,
+  137 => PARAM_SRF_VGRDM,
+  138 => PARAM_SRF_TMPM,
+  139 => PARAM_SRF_SPFHM,
+  144 => PARAM_TSC,
+  145 => PARAM_TSG,
+  146 => PARAM_CWORK,
+  147 => PARAM_FGLU,
+  148 => PARAM_FGLV,
+  151 => PARAM_ADVUA,
+  152 => PARAM_VWV,
+  154 => PARAM_FGSV,
+  155 => PARAM_GFLX,
+  157 => PARAM_UWV,
+  159 => PARAM_FGSU,
+  160 => PARAM_CSUSF,
+  161 => PARAM_CSDSF,
+  162 => PARAM_CSULF,
+  163 => PARAM_CSDLF,
+  165 => PARAM_ADVVA,
+  166 => PARAM_VBDSF,
+  168 => PARAM_FRQP,
+  169 => PARAM_FRQC,
+  173 => PARAM_GWDUA,
+  174 => PARAM_GWDVA,
+  175 => PARAM_HGTM,
+  176 => PARAM_UGRDM,
+  177 => PARAM_VGRDM,
+  178 => PARAM_VVELM,
+  179 => PARAM_TMPM,
+  180 => PARAM_SPFHM,
+  200 => PARAM_VTU,
+  201 => PARAM_VTV,
+  202 => PARAM_LTRS,
+  203 => PARAM_LINT,
+  204 => PARAM_DSWRF,
+  205 => PARAM_DLWRF,
+  211 => PARAM_USWRF,
+  212 => PARAM_ULWRF,
+  218 => PARAM_TTHM,
+  219 => PARAM_WSMX,
+  220 => PARAM_PRMX,
+  222 => PARAM_ADVHR,
+  223 => PARAM_MSC,
+  224 => PARAM_MSG,
+  230 => PARAM_MFLXB,
+  231 => PARAM_MFLUX,
+  236 => PARAM_ADVMR,
+  237 => PARAM_OZONE,
+  239 => PARAM_CNVUh,
+  240 => PARAM_CNVVA,
+  241 => PARAM_LRGHR,
+  242 => PARAM_CNVHR,
+  243 => PARAM_CNVMR,
+  246 => PARAM_VDFHR,
+  247 => PARAM_VDFUA,
+  248 => PARAM_VDFVA,
+  249 => PARAM_VDFMR,
+  250 => PARAM_SWHR,
+  251 => PARAM_LWHR,
+  253 => PARAM_LRGMR,
+}

data/lib/numru/gphys/grid.rb

@@ -1,4 +1,5 @@
 require "numru/gphys/axis"
+require "numru/gphys/assoccoords"
 
 =begin
 =class NumRU::Grid
@@ -46,6 +47,18 @@ A class to handle discretized grids of physical quantities.
     RETURN VALUE
     * an Integer
 
+---coord_dim_indices(coordname)
+    Coordinate name --> dimension indices.
+
+    ARGUMENT
+    * coordname (String) : Name of a coordinate
+
+    RETURN VALUE
+    * Array of Integer or nil --
+      If the coordinate is present it is an Array 
+      containing dimension indices (If the coordinate is 1D, 
+      the lengthof the array is 1.)
+
 ---set_axis(dim_or_dimname,ax)
 
     Sets an axis.
@@ -139,15 +152,20 @@ A class to handle discretized grids of physical quantities.
     Similar to ((<cut>)), but the rank is conserved by not eliminating
     any dimension (whose length could be one).
 
----exclude(dim_or_dimname)
-    Returns a Grid in which an axis is eliminated from self.
-
-    ARGUMENTS
-    * dim_or_dimname (String or Integer) to specify an axis.
-
-    RETURN VALUE
-    * a Grid
-
+---cut_assoccoord(hasharg)
+    Cut with respect to the asscoated coordinates. Similar to cut,
+    when the argeuemnt is a Hash, but hash keys are the names of the 
+    asscoated coordinates.
+
+#---exclude(dim_or_dimname)
+#    Returns a Grid in which an axis is eliminated from self.
+#
+#    ARGUMENTS
+#    * dim_or_dimname (String or Integer) to specify an axis.
+#
+#    RETURN VALUE
+#    * a Grid
+#
 ---change_axis(dim, axis)
     Replaces an axis. (Returns a new object)
 
@@ -157,36 +175,36 @@ A class to handle discretized grids of physical quantities.
 
     RETURN VALUE
     * a Grid
-
----change_axis!(dim_or_dimname, axis)
-    Replaces an axis. (overwrites self)
+#
+#---change_axis!(dim_or_dimname, axis)
+#    Replaces an axis. (overwrites self)
+#
+#    ARGUMENTS
+#    * dim_or_dimname (String or Integer) to specify an axis.
+#    * axis (Axis)
+#
+#    RETURN VALUE
+#    * self
+#
+---insert_axis(dim, axis)
+    Inserts an axis. (non destructive; returns a new object)
 
     ARGUMENTS
-    * dim_or_dimname (String or Integer) to specify an axis.
-    * axis (Axis)
-
-    RETURN VALUE
-    * self
-
----insert_axis(dim_or_dimname, axis)
-    Inserts an axis. (Returns a new object)
-
-    ARGUMENTS
-    * dim_or_dimname (String or Integer) to specify an axis.
+    * dim (Integer) to specify the position to insert
     * axis (Axis)
 
     RETURN VALUE
     * a Grid
 
----insert_axis!(dim_or_dimname, axis)
-    Inserts an axis. (overwrites self)
-
-    ARGUMENTS
-    * dim_or_dimname (String or Integer) to specify an axis.
-    * axis (Axis)
-
-    RETURN VALUE
-    * self
+#---insert_axis!(dim_or_dimname, axis)
+#    Inserts an axis. (overwrites self)
+#
+#    ARGUMENTS
+#    * dim_or_dimname (String or Integer) to specify an axis.
+#    * axis (Axis)
+#
+#    RETURN VALUE
+#    * self
 
 ---transpose( *dims )
     Transpose.
@@ -207,20 +225,44 @@ module NumRu
       def initialize( *axes )
 	 @axes = Array.new
 	 axes.each{|ag|
-	    if ag.is_a?(Axis)
-	       @axes.push(ag)
-	    else
-	       raise ArgumentError, "each argument must be an Axis"
-	    end
+            ### commented out for the duck typing:
+            #if ag.is_a?(Axis)
+            @axes.push(ag)
+            #else
+            #   raise ArgumentError, "each argument must be an Axis"
+	    #end
 	 }
 	 @lost_axes = Array.new   # Array of String
 	 @rank = @axes.length
 	 @axnames = Array.new
 	 __check_and_set_axnames
+         @assoc_coords = nil
+      end
+
+      # * assoc_crds : an Array of GPhys
+      # 
+      def set_assoc_coords(assoc_crds)
+        @assoc_coords = AssocCoords.new(assoc_crds, @axnames)
+        @assoc_coords.axlens.each do |nm,l|
+          if l && l != (l0 = shape[dim_index(nm)])
+            raise ArgumentError, "Length mismatch in coord #{nm} (#{l0}) and assoc_crds (#{l}). You may need to regrid (use GPhys#regrid method) associated coordinate(s) in advance."
+          end
+        end
+        self
+      end
+
+      # * assoc_coords : an AssocCoords
+      # 
+      def assoc_coords=(assoc_coords)
+        @assoc_coords = assoc_coords 
+      end
+
+      def assoc_coords
+        @assoc_coords
       end
 
       def inspect
-	 "<#{rank}D grid #{@axes.collect{|ax| ax.inspect}.join("\n\t")}>"
+        "<#{rank}D grid #{@axes.collect{|ax| ax.inspect}.join("\n\t")}#{@assoc_coords ? "\n"+@assoc_coords.inspect.gsub(/^/,"\t") : ''}>"
       end
 
       def __check_and_set_axnames
@@ -244,6 +286,37 @@ module NumRu
 	@lost_axes.dup
       end
 
+      def coordnames
+        ret = axnames
+        ret.concat(@assoc_coords.coordnames) if @assoc_coords
+        ret
+      end
+
+      def has_axis?(name)
+	@axnames.include?(name)
+      end
+
+      def has_assoccoord?(*arg)
+        if arg.length == 0
+          !@assoc_coords.nil?   # if a grid has assoc coords
+        else
+          name = arg[0]
+          if @assoc_coords
+            @assoc_coords.has_coord?(name)
+          else
+            false
+          end
+        end
+      end
+
+      def has_coord?(name)
+        has_axis?(name) || has_assoccoord?(name)
+      end
+
+      def assoccoordnames
+	@assoc_coords && @assoc_coords.coordnames
+      end
+
 #      def axis(i)
 #	 @axes[i]
 #      end
@@ -254,12 +327,37 @@ module NumRu
 
       alias get_axis axis
 
+      def coord(i)
+        if @assoc_coords && i.is_a?(String) && @assoc_coords.has_coord?(i)
+          @assoc_coords.coord(i)
+        else
+          axis(i).pos
+        end
+      end
+
+      def assoc_coord_gphys(name)
+        @assoc_coords && @assoc_coords.coord_gphys(name)
+      end
+
       def dim_index(dimname)
 	 ax_dim(dimname)[1]
       end
 
+      def coord_dim_indices(coordname)
+        dim = @axnames.index(coordname)
+        if dim
+          [dim]
+        elsif @assoc_coords && @assoc_coords.has_coord?(coordname)
+          axnms = @assoc_coords.coord_gphys(coordname).axnames
+          axnms.collect{|nm| @axnames.index(nm)}
+        else
+          nil
+        end
+      end
+
       def set_axis(dim_or_dimname,ax)
-	 @axes[ ax_dim(dim_or_dimname)[1] ] = ax
+	 @axes[ i = dim_index(dim_or_dimname) ] = ax
+         @axnames[ i ] = ax.name
 	 self
       end
 
@@ -311,6 +409,9 @@ module NumRu
 
 	newgrid = self.class.new( *newaxes )
 	newgrid.set_lost_axes( @lost_axes.dup )
+        if @assoc_coords
+          newgrid.assoc_coords=@assoc_coords.subset_having_axnames(newgrid.axnames)
+        end
 
 	if !deleted_by 
 	  msg = '(deleted) '
@@ -333,6 +434,7 @@ module NumRu
 	 # deep clone onto memory
 	 out = self.class.new( *@axes.collect{|ax| ax.copy} )
 	 out.set_lost_axes( @lost_axes.dup )
+         out.assoc_coords = @assoc_coords.copy if @assoc_coords
 	 out
       end
 
@@ -353,6 +455,10 @@ module NumRu
 	end
 	out = self.class.new( *axes )
 	out.set_lost_axes( (@lost_axes.dup + other.lost_axes).uniq )
+        if (oac = other.assoc_coords) || (sac = self.assoc_coords)
+          sac ? ac=sac.merge(oac) : ac=oac.merge(sac)
+          out.assoc_coords = ac
+        end
 	out
       end
 
@@ -366,7 +472,7 @@ module NumRu
 	    # make a clone
 	    axes = Array.new
 	    (0...rank).each{ |i| axes.push( @axes[i][0..-1] ) }
-	    self.class.new( *axes )
+	    grid = self.class.new( *axes )
 	 else
 	    slicer = __rubber_expansion(slicer)
 	    if slicer.length != rank
@@ -376,16 +482,20 @@ module NumRu
 	    lost = self.lost_axes  #Array.new
 	    for i in 0...rank
 	       ax = @axes[i][slicer[i]]
-	       if ax.is_a?(Axis)      # else its rank became zero (lost)
-		  axes.push( ax )
+	       if ax.is_a?(String)
+                 lost.push( ax )
                else
-		  lost.push( ax )
+                 axes.push( ax )
 	       end
 	    end
 	    grid = self.class.new( *axes )
 	    grid.set_lost_axes( lost ) if lost.length != 0
 	    grid
 	 end
+         if @assoc_coords
+           grid.assoc_coords = @assoc_coords[*slicer]
+         end
+         grid
       end
 
       def __rubber_expansion( args )
@@ -404,6 +514,12 @@ module NumRu
       end
       private :__rubber_expansion
 
+      def cut_assoccoord(hasharg)
+        ac, acsl = @assoc_coords.cut(hasharg)
+        sl = @axnames.collect{|nm| acsl[nm] || true}
+        [ self[*sl], sl ]
+      end
+
       def cut(*args)
 	_cut_(false, *args)
       end
@@ -411,11 +527,13 @@ module NumRu
 	_cut_(true, *args)
       end
 
+      # cut along the regular coorinates.
+      # assume that the coordinates are monotonic (without checking).
       def _cut_(conserve_rank, *args)
 
-	# assume that the coordinates are monotonic (without checking)
+        hasharg = ( args.length==1 && args[0].is_a?(Hash) )
 
-	if args.length==1 && args[0].is_a?(Hash)
+	if hasharg
 	  # specification by axis names
 	  spec = args[0]
 	  if (spec.keys - axnames).length > 0
@@ -447,12 +565,12 @@ module NumRu
       end
       private :_cut_
 
-      def exclude(dim_or_dimname)
-	 dim = dim_index(dim_or_dimname)
-	 axes = @axes.dup
-	 axes.delete_at(dim)
-	 self.class.new( *axes )
-      end
+#      def exclude(dim_or_dimname)
+#	 dim = dim_index(dim_or_dimname)
+#	 axes = @axes.dup
+#	 axes.delete_at(dim)
+#	 self.class.new( *axes )
+#      end
 
       def change_axis(dim, axis)
 	 axes = @axes.dup
@@ -463,42 +581,49 @@ module NumRu
 	    lost.push(axis) if axis.is_a?(String)
 	    axes.delete_at(dim)
 	 end
-	 self.class.new( *axes ).add_lost_axes( lost )
+	 grid = self.class.new( *axes ).add_lost_axes( lost )
+         if @assoc_coords
+           grid.assoc_coords=@assoc_coords.subset_having_axnames(grid.axnames)
+         end
+         grid
       end
 
-      def change_axis!(dim_or_dimname, axis)
-	 if axis.is_a?(Axis)
-	    @axes[ ax_dim(dim_or_dimname)[1] ] = axis
-	 else
-	    @lost_axes.push(axis) if axis.is_a?(String)
-	    @axes.delete_at( ax_dim(dim_or_dimname)[1] )
-	 end
-	 @rank = @axes.length
-	 __check_and_set_axnames
-	 self
-      end
+#      def change_axis!(dim_or_dimname, axis)
+#	 if axis.is_a?(Axis)
+#	    @axes[ dim_index(dim_or_dimname) ] = axis
+#	 else
+#	    @lost_axes.push(axis) if axis.is_a?(String)
+#	    @axes.delete_at( dim_index(dim_or_dimname) )
+#	 end
+#	 @rank = @axes.length
+#	 __check_and_set_axnames
+#	 self
+#      end
 
-      def insert_axis(dim_or_dimname, axis)
-	 dim = ax_dim(dim_or_dimname)[1]
-	 axes = @axes.dup
-	 if axis.is_a?(Axis)
-	    axes[dim+1,0] = axis    # axes.insert(dim, axis) if ruby 1.7
-	 else
-	    # do nothing
-	 end
-	 self.class.new( *axes )
-      end
+#      def insert_axis!(dim_or_dimname, axis)
+#	 dim = dim_index(dim_or_dimname)
+#	 if axis == nil
+#	    # do nothing
+#	 else
+#	    @axes[dim+1,0] = axis    # @axes.insert(dim, axis) if ruby 1.7
+#	    @rank = @axes.length
+#	    __check_and_set_axnames
+#	 end
+#	 self
+#      end
 
-      def insert_axis!(dim_or_dimname, axis)
-	 dim = ax_dim(dim_or_dimname)[1]
-	 if axis == nil
-	    # do nothing
-	 else
-	    @axes[dim+1,0] = axis    # @axes.insert(dim, axis) if ruby 1.7
-	    @rank = @axes.length
-	    __check_and_set_axnames
-	 end
-	 self
+      def insert_axis(dim, axis)
+        axes = @axes.dup
+        ### commented out for the duck typing:
+        #if axis.is_a?(Axis)
+          axes.insert(dim, axis)
+        #else
+        #  raise ArgumentError, "2nd arg must be an Axis"
+        #end
+        grid = self.class.new( *axes )
+	grid.set_lost_axes( lost_axes )
+        grid.assoc_coords = @assoc_coords.dup if @assoc_coords
+	grid
       end
 
       def transpose( *dims )
@@ -512,6 +637,7 @@ module NumRu
 	end
 	grid = self.class.new(*axes)
 	grid.set_lost_axes( lost_axes )
+        grid.assoc_coords = @assoc_coords.dup if @assoc_coords
 	grid
       end
 
@@ -598,5 +724,10 @@ if $0 == __FILE__
 
    p grid, grid.transpose(1,0)
 
+   puts "Test insert_axis..."
+   vz = VArray.new( NArray.float(3).indgen! + 10 ).rename("z")
+   zax = Axis.new().set_pos(vz)
+   grid3 = grid.insert_axis(-1,zax)
+   p grid3
 end