trinitycrmod 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/trinitycrmod/graphs.rb

@@ -2,17 +2,17 @@ class CodeRunner::Trinity
 	module TrinityGraphKits
 		# Graphs plotting quantities from the '.nt' file vs rho for a given t_index
 		def nt_prof_graphkit(options)
-			prof_graphkit(options.dup.absorb({outfile: nt_outfile}))
+			prof_graphkit(options.dup.absorb({outfile: :nt}))
 		end
 		# Graphs plotting quantities from the '.fluxes' file vs rho for a given t_index
 		def fluxes_prof_graphkit(options)
-			prof_graphkit(options.dup.absorb({outfile: fluxes_outfile, exclude_perturbed_fluxes: true}))
+			prof_graphkit(options.dup.absorb({outfile: :fluxes, exclude_perturbed_fluxes: true}))
 		end
 		def prof_graphkit(options)
 			raise "Please specify t_index" unless options[:t_index]
 			it = options[:t_index] - 1
-			array = options[:outfile].get_2d_array_float(options[:header], /1.*time/)[it]
-			rho_array = options[:outfile].get_2d_array_float(/2.*radius/, /1.*time/)[it]
+			array = get_2d_array_float(options[:outfile], options[:header], /1.*time/)[it]
+			rho_array = get_2d_array_float(options[:outfile], /2.*radius/, /1.*time/)[it]
 			if options[:exclude_perturbed_fluxes]
 				s = array.size
 				array = array.slice(0...nrad-1)

data/lib/trinitycrmod/output_files.rb

@@ -24,5 +24,15 @@ class CodeRunner
       end
     end
     include OutputFiles
+
+		#  Return a two-dimensional array of floatingpoint numbers from the file ending in outfile,
+		#  from the column whose header matches column_header,  indexed by index_header. See
+		#  TextDataTools::Column::DataFile for more information. Outfile is a symbol, use e.g. :nt 
+		#  for data from 'run_name.nt'.
+		def get_2d_array_float(outfile, column_header, index_header)
+			cache[:array_2d] = {} unless [:Complete, :Failed].include? @status
+			cache[:array_2d] ||= {}
+			cache[:array_2d][[outfile, column_header, index_header]] ||= send(outfile + :_outfile).get_2d_array_float(column_header, index_header)
+		end
   end
 end

data/trinitycrmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-06-18"
+  s.date = "2013-06-19"
   s.description = "This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport solver for Fusion Reactors, to harness the power of CodeRunner, a framework for the automated running and analysis of simulations."
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1326413784735556803
+      hash: 38043125482508098
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: