gs2crmod 0.11.41 → 0.11.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2485952c9fd5ce2f24643f82eca1e06f1ff1a0d4
-  data.tar.gz: ea870f6f032d63e5c1628f39720b47b67059eede
+  metadata.gz: d47bfd3f6daaad59aa71daa189d30c0e1e548249
+  data.tar.gz: 74da568667cf816e48dc5b841fe6edf0e3fb8abb
 SHA512:
-  metadata.gz: f93422f4fa968740a2af38967dd0bc9761ad0db8482dd963344e1e179908555a26d3106b8ea3530626656b5ee9e9c40254a9c226cf02199fcbafcd475b5238b1
-  data.tar.gz: b7c7dfe02270426ab537a8e89e030916c7d98689c50969a6eeafced53a7ea70f227045f3d90ede58e51bcca7cccef26d64f2fe38f3245d2d8e5805d3205507e6
+  metadata.gz: ede1341b80bf20b9748fad03729a0334d38524047823847a4bd154b899106c00839f22bde718868b00867902fd2c0e245887759e516376d0dbb86884013218ff
+  data.tar.gz: cf559fa103920112339472b6a0531d3bbdf7204d0be01390c9e4a5051a8c88dc938cdb97a39afaf8394c73928fabfa0570684a7757a2a6a52fe8f8648b361c8c

data/VERSION

@@ -1 +1 @@
-0.11.41
+0.11.42

data/gs2crmod.gemspec

@@ -2,12 +2,12 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: gs2crmod 0.11.41 ruby lib
+# stub: gs2crmod 0.11.42 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.41"
+  s.version = "0.11.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/gs2crmod/read_netcdf.rb

@@ -53,14 +53,14 @@ class NetcdfSmartReader
 		dims = dimensions(varname)
 		narray = @file.var(varname).get('start'=>starts(dims, options), 'end'=>ends(dims, options))
 		if options[:modify_variable]
-			dimhash = dims.inject({}){|hash, dim| 
+			hsh = dims.inject({}){|hsh, dim| 
 				opts = options.dup
 				opts[:modify_variable] = nil
 				dimval = read_variable(dimension_variable_name(dim.name), opts)
-				hash[dim.name] = dimval
-				hash
+				hsh[dim.name] = dimval
+				hsh
 			}
-			narray = options[:modify_variable].call(varname, narray, hash)
+			narray = options[:modify_variable].call(varname, narray, hsh)
 		end
 		shape = narray.shape
 		shape.delete_if{|i| i==1}
@@ -197,8 +197,8 @@ def hyperviscosity_graphkit(options)
 	raise "This only works for spectrogk"  unless spectrogk?
 	options[:modify_variable] = Proc.new do |varname, narray, dimhash|
 		#dimnames = dimhash.keys
-		ky = gsl_vector('ky')
-		kx = gsl_vector('kx').to_box_order
+		ky = dimhash['Y'].to_a.to_gslv
+		kx = dimhash['X'].to_a.to_gslv.to_box_order
 		shape = narray.shape
 		if  varname == "gnew2_ta"
 			shape = narray.shape
@@ -225,8 +225,11 @@ def hypercoll_graphkit(options)
 	raise "This only works for spectrogk"  unless spectrogk?
 	options[:modify_variable] = Proc.new do |varname, narray, dimhash|
 		#dimnames = dimhash.keys
+		p varname, dimhash
 		if  varname == "gnew2_ta"
 			shape = narray.shape
+			m = dimhash['m']
+			mmax = new_netcdf_file.var('hermite').get.to_a.size - 1
 			p 'shape',shape
 			for ig in 0...shape[0]
 				for it in 0...shape[1]
@@ -234,7 +237,7 @@ def hypercoll_graphkit(options)
 						for il in 0...shape[3]
 							for ie in 0...shape[4]
 								for is in 0...shape[5]
-									narray[ig,it,ik,il,ie,is]*=send(:nu_h_ + (is+1).to_sym)*(il.to_f/(shape[3]-1))**send(:nexp_h_ + (is+1).to_sym)
+									narray[ig,it,ik,il,ie,is]*=send(:nu_h_ + (is+1).to_sym)*(m[il]/mmax)**send(:nexp_h_ + (is+1).to_sym)
 								end
 							end
 						end
@@ -252,6 +255,7 @@ def lenardbern_graphkit(options)
 	options[:modify_variable] = Proc.new do |varname, narray, dimhash|
 		#dimnames = dimhash.keys
 		if  varname == "gnew2_ta"
+			m = dimhash['m']
 			shape = narray.shape
 			for ig in 0...shape[0]
 				for it in 0...shape[1]
@@ -259,7 +263,7 @@ def lenardbern_graphkit(options)
 						for il in 0...shape[3]
 							for ie in 0...shape[4]
 								for is in 0...shape[5]
-									narray[ig,it,ik,il,ie,is]*=send(:nu_ + (is+1).to_sym)*il
+									narray[ig,it,ik,il,ie,is]*=send(:nu_ + (is+1).to_sym)*m[il]
 								end
 							end
 						end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.41
+  version: 0.11.42
 platform: ruby
 authors:
 - Edmund Highcock