gphys 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7c72f148f6533d2919d1aba54f9d44a067b760
-  data.tar.gz: a3466fcffa5e822b2ccad7cf9ef360e9ce4878c0
+  metadata.gz: 1921300d74726704bca4bba00ebaa9b46081ae24
+  data.tar.gz: 4c9344000f180c1405877496eb6492304d74b73d
 SHA512:
-  metadata.gz: fa215a84b1098a016c00bd690942e22c57a66141eb0a6953caf0509597bcc63abd171f1796d3ca732f524284e01c4c41a6d53a390f87b3af879015fa025d026b
-  data.tar.gz: a1b97e59ef9b813b5aeca31e651abd57b42650e2ee70674f099da965ecb94c7790e61bbe4e0943659ac6fec20067890c3135576107cd99a59fe02a282baed1f9
+  metadata.gz: 386eca1431a75db9af349d1739b661b2a59b24df4f8b4f38df8ac9cbb87f27f2960dc944bce3bdb3c88a16d9ba7750cefa5913e363cb576d5ae9f4699e49b1d4
+  data.tar.gz: 4d0a3d04f2312aefd778e68241ee5a0ad323a0488bdfbfd136f0651755c2233a1693ddc2e141e8949bb5e5bd4a679f7ed8197273015207dfc105352bd0174b82

data/ChangeLog

@@ -1,3 +1,43 @@
+2017-04-17  Takeshi Horinouchi
+1.5.1 --> 1.5.2
+
+M	lib/numru/gphys/version.rb
+
+2017-04-17  Takeshi Horinouchi
+updated units: "/s" -> "1/s".
+
+M	lib/numru/gphys/grib_params.rb
+
+2017-04-17  Takeshi Horinouchi
+treatment based on (but not the same as in) [dennou-ruby:003987]
+
+M	lib/numru/ganalysis/covariance.rb
+
+2017-04-17  Takeshi Horinouchi
+Removed the string length limit for slsttl when DCLVERSION >= 7.1
+
+M	lib/numru/ggraph.rb
+
+2017-04-17  Takeshi Horinouchi
+a refactoring
+
+M	lib/numru/dclext.rb
+
+2017-04-17  Takeshi Horinouchi
+Completed the bug fix intended in c5ace9bf8d81ea738b15ebb35e2c3dc8512997af
+
+M	lib/numru/dclext.rb
+
+2017-04-17  Takeshi Horinouchi
+Changed the default param values for GGraph::startup (ifl: 1->nil, colormap: 4->nil) not to impede prior settings.
+
+M	lib/numru/ggraph.rb
+
+2017-04-11  Takeshi Horinouchi
+bug fix to avoid zero division (from Kawai & Yashiro: dcdvlop)
+
+M	lib/numru/dclext.rb
+
 2017-01-24  Takeshi Horinouchi
 years extended to 2017
 

data/lib/numru/dclext.rb

@@ -934,12 +934,17 @@ module NumRu
         dz = DCL.rgnge( (max-min)/nlev.to_f )
       end
 
-      zmin = DCL.irle(min/dz)*dz
-      zmax = DCL.irge(max/dz)*dz
-      n = ((zmax-zmin)/dz).round
+      if dz != 0
+        zmin = DCL.irle(min/dz)*dz
+        zmax = DCL.irge(max/dz)*dz
+        n = ((zmax-zmin)/dz).round
+      else
+        zmin = min
+        n = 0
+      end
 
-      levels = Array.new
-      for i in 0..n
+      levels = [ zmin ]
+      for i in 1..n
         x = ((zmin+i*dz)/dz).round * dz
         levels.push(x)
       end

data/lib/numru/ganalysis/covariance.rb

@@ -48,7 +48,7 @@ module NumRu
         nary /= (ndiv-1)
         return UNumeric.new(nary, units), ndiv
       else
-        nary.div!(ndiv-1)
+        nary = nary.div!(ndiv-1)
         vary = VArray.new(nary,
                           {"long_name"=>"covariance","units"=>units.to_s},
                           "covariance")
@@ -57,7 +57,7 @@ module NumRu
       end
     end
 
-    def corelation(gphys0, gphys1, *dims)
+    def correlation(gphys0, gphys1, *dims)
       val0 = gphys0.val
       val1 = gphys1.val
       if val0.is_a?(NArrayMiss)
@@ -80,9 +80,9 @@ module NumRu
       gphys1 = gphys1.copy.replace_val(val1)
 
       covariance, ndiv = gphys0.covariance(gphys1,*dims)
+      dims = dims.map{|dim| gphys0.dim_index(dim) }
       return covariance/(gphys0.stddev(*dims)*gphys1.stddev(*dims)), mask.to_type(NArray::LINT).sum(*dims)
     end
-    alias correlation corelation
   end
 
   class GPhys
@@ -90,10 +90,9 @@ module NumRu
       GAnalysis.covariance(self, other, *dims)
     end
 
-    def corelation(other, *dims)
-      GAnalysis.corelation(self, other, *dims)
+    def correlation(other, *dims)
+      GAnalysis.correlation(self, other, *dims)
     end
-    alias correlation corelation
   end
 end
 

data/lib/numru/ggraph.rb

@@ -127,10 +127,10 @@ library if you like.
     * options (Hash) : options to change the default behavior if specified.
        option name	default value	# description:
        "iws"     1    # DCL sgpack param: Workstation ID (1:display, 2:file
-                      # if DCL ver>=6)
-       "ifl"     4    # DCL swpack param (for DCL ver.>=6): file format num
-                      # for iws==2 (1:png,2:eps,3:svg,4:pdf)
-       "colormap"  1  # DCL color map number (Integer)
+                      # if DCL ver>=6); DCL's default is 4
+       "ifl"     nil  # DCL swpack param (for DCL ver.>=6): file format num
+                      # for iws==2 (1:png,2:eps,3:svg,4:pdf; DCL's default is 1)
+       "colormap" nil # DCL color map number (Integer)
        "iwidth"  nil  # DCL swpack param (Integer): display width
                       # (pixcels)
        "iheight" nil  # DCL swpack param (Integer): display height
@@ -1141,8 +1141,8 @@ module NumRu
 
     @@startup_options = Misc::KeywordOptAutoHelp.new(
       ['iws', 1, 'DCL sgpack param: Workstation ID (1:display, 2:file if DCL ver>=6)'],
-      ['ifl', 4, 'DCL swpack param (for DCL ver.>=6): file format num for iws==2 (1:png,2:eps,3:svg,4:pdf)'],
-      ['colormap', 1, 'DCL color map number (Integer)'],
+      ['ifl', nil, 'DCL swpack param (for DCL ver.>=6): file format num for iws==2 (1:png,2:eps,3:svg,4:pdf); DCL\'s default is 4'],
+      ['colormap', nil, 'DCL color map number (Integer); DCL\'s default is 1'],
       ['iwidth', nil, 'DCL swpack param (Integer): display width (pixcels)'],
       ['iheight', nil, 'DCL swpack param (Integer): display height (pixcels)'],
       ['lwait', true, 'DCL swpack param (true/false): wait mouse click to show next page'],
@@ -1156,8 +1156,8 @@ module NumRu
       opts = @@startup_options.interpret(options)
       DCL.swpset('iwidth',opts['iwidth'])  if opts['iwidth']
       DCL.swpset('iheight',opts['iheight'])  if opts['iheight']
-      DCL.swpset('ifl',opts['ifl']) if DCL::DCLVERSION >= "6"
-      DCL.sgscmn(opts['colormap'])
+      DCL.swpset('ifl',opts['ifl']) if opts['ifl'] && DCL::DCLVERSION >= "6"
+      DCL.sgscmn(opts['colormap']) if opts['colormap']
       DCL.swpset('lwait',opts['lwait'])
       DCL.swpset('lalt',opts['lalt'])
 
@@ -1183,18 +1183,20 @@ module NumRu
 
       program = File.expand_path($0)       if !program
       if date
-        program = __shorten_path(program,77) + '  ' + Date.today.to_s
+        program = __shorten_path(program,77) if DCL::DCLVERSION < "7.1"
+        program += '  ' + Date.today.to_s
       else
-        program = __shorten_path(program,99)
-        if date.nil?
-          program = program + '  ' + Date.today.to_s if program.length < 77
+        program = __shorten_path(program,99) if DCL::DCLVERSION < "7.1"
+        if date.nil? && ## date is not added if false
+            (DCL::DCLVERSION >= "7.1" || program.length < 77)
+          program += '  ' + Date.today.to_s
         end
       end
       if !data_source
         data_source = Dir.pwd
         data_source = '' if data_source == program.sub(/\/[^\/]+$/,'')
       end
-      data_source = __shorten_path(data_source,99)
+      data_source = __shorten_path(data_source,99) if DCL::DCLVERSION < "7.1"
       sz = 1.0/( program.length + data_source.length )
       char_height = [0.008, sz].min        if !char_height
       yb = 2.0 * char_height               if !yb

data/lib/numru/gphys/grib_params.rb

@@ -563,12 +563,12 @@ NAMES_UNITS = {
   PARAM_SIG_VEL => ["Sigma coord. vertical velocity", "SGCVV", "s /s", "vertical_air_velocity_expressed_as_tendency_of_sigma"],
   PARAM_VERT_VEL => ["Pressure Vertical velocity", "VVEL", "Pa/s", "vertical_air_velocity_expressed_as_tendency_of_pressure"],
   PARAM_GEOM_VEL => ["Geometric Vertical velocity", "DZGT", "m/s", "upward_air_velocity"],
-  PARAM_ABS_VOR => ["Absolute vorticity", "ABSV", "/s", "atmosphere_absolute_vorticity"],
-  PARAM_ABS_DIV => ["Absolute divergence", "ABSD", "/s", ""],
-  PARAM_REL_VOR => ["Relative vorticity", "RELV", "/s", "atmosphere_relative_vorticity"],
-  PARAM_REL_DIV => ["Relative divergence", "RELD", "/s", "divergence_of_wind"],
-  PARAM_U_SHR => ["Vertical u-component shear", "VUCSH", "/s", "eastward_wind_shear"],
-  PARAM_V_SHR => ["Vertical v-component shear", "VVCSH", "/s", "northward_wind_shear"],
+  PARAM_ABS_VOR => ["Absolute vorticity", "ABSV", "1/s", "atmosphere_absolute_vorticity"],
+  PARAM_ABS_DIV => ["Absolute divergence", "ABSD", "1/s", ""],
+  PARAM_REL_VOR => ["Relative vorticity", "RELV", "1/s", "atmosphere_relative_vorticity"],
+  PARAM_REL_DIV => ["Relative divergence", "RELD", "1/s", "divergence_of_wind"],
+  PARAM_U_SHR => ["Vertical u-component shear", "VUCSH", "1/s", "eastward_wind_shear"],
+  PARAM_V_SHR => ["Vertical v-component shear", "VVCSH", "1/s", "northward_wind_shear"],
   PARAM_CRNT_DIR => ["Direction of current", "DIRC", "Deg. true", "direction_of_sea_water_velocity"],
   PARAM_CRNT_SPD => ["Speed of current", "SPC", "m/s", "sea_water_speed"],
   PARAM_U_CRNT => ["u-component of current", "UOGRD", "m/s", "eastward_sea_water_velocity"],
@@ -620,7 +620,7 @@ NAMES_UNITS = {
   PARAM_ICE_U => ["u-component of ice drift", "UICE", "m/s", "sea_ice_eastward_velocity"],
   PARAM_ICE_V => ["v-component of ice drift", "VICE", "m/s", "sea_ice_northward_velocity"],
   PARAM_ICE_GROWTH => ["Ice growth rate", "ICEG", "m/s", "tendency_of_sea_ice_thickness_due_to_thermodynamics"],
-  PARAM_ICE_DIV => ["Ice divergence", "ICED", "/s", "divergence_of_sea_ice_velocity"],
+  PARAM_ICE_DIV => ["Ice divergence", "ICED", "1/s", "divergence_of_sea_ice_velocity"],
   PARAM_SNO_M => ["Snow melt", "SNOM", "kg/m2", "surface_snow_melt_amount"],
   PARAM_WAVE_HGT => ["Significant height of combined", "HTSGW", "wind m", "significant_height_of_wind_and_swell_waves"],
   PARAM_SEA_DIR => ["Direction of wind waves", "WVDIR", "deg. true", "direction_of_wind_wave_velocity"],

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.1"
+    VERSION = "1.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gphys
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Takeshi Horinouchi
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray