trinitycrmod 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16211ebc1a757304ac250cb4a34b7bf71653c309
-  data.tar.gz: f6fc555a64872639ddf3f24fd3f31d9ce5aa6ce8
+  metadata.gz: 61ffe3a14f6dddf50dd5654f37ee160dba6e74bc
+  data.tar.gz: 9b02ff93eb5db94888d8d8650dcb3c7cbeec4a38
 SHA512:
-  metadata.gz: 452495ee189e29d44751d59644c3cdc835078a6e2cd323e018fe0b441ca9cc59d5ce8062c0444f71080ba62ef3acb24b6a77a9a777d291aed12f1696cf4e20fd
-  data.tar.gz: d1009653a4f0bc66776d074691e21c1567ac6fdf1762c3dadcdbd5a8505ebcb5962f4011054b09ba71900b12ea6bfeb71ed979b6de8a539c85cb5e049c2cb014
+  metadata.gz: 3c40a518eb0d83fee4edabf7a9bbf198354ca6b0bd870909fb01b0c78b8f0be83e2ffe5deeb81ed4e56fe52c491eea91414c705fd67f22b0d6ac5952b8f89004
+  data.tar.gz: 04f6aa8929e859931e921666da33c153f05c71d473a1199e6a35ad877b66894412fb8642e00f54fa03e44126570eb440b858cf5a6d179d2b0f3a9b1112797711

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/trinitycrmod/graphs.rb

@@ -4,6 +4,10 @@ class CodeRunner::Trinity
 		def nt_prof_graphkit(options)
 			prof_graphkit(options.dup.absorb({outfile: :nt}))
 		end
+		# Graphs plotting quantities from the '.nt' file vs rho for a given t_index
+		def pwr_prof_graphkit(options)
+			prof_graphkit(options.dup.absorb({outfile: :pwr, radius_match: /2.*rad/}))
+		end
 		# Graphs plotting quantities from the '.fluxes' file vs rho for a given t_index
 		def fluxes_prof_graphkit(options)
 			prof_graphkit(options.absorb({outfile: :fluxes, exclude_perturbed_fluxes: true}))
@@ -25,7 +29,7 @@ class CodeRunner::Trinity
 				t_indices = [it]
 			end
 			array = t_indices.map{|i| get_2d_array_float(options[:outfile], options[:header], /1.*time/)[i].to_gslv}.mean.to_a
-			rho_array = t_indices.map{|i| get_2d_array_float(options[:outfile], /2.*radius/, /1.*time/)[i].to_gslv}.mean.to_a
+			rho_array = t_indices.map{|i| get_2d_array_float(options[:outfile], options[:radius_match]||/2.*radius/, /1.*time/)[i].to_gslv}.mean.to_a
 			if options[:exclude_perturbed_fluxes]
 				s = array.size
 				array = array.slice(0...nrad-1)

data/lib/trinitycrmod/output_files.rb

@@ -14,6 +14,10 @@ class CodeRunner
 			# File ending in '.fluxes': contains heat flux, momentum flux etc.
       def fluxes_outfile
         TextDataTools::Column::DataFile.new(@directory + '/' + @run_name + '.fluxes', true, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:|\Z)/)
+      end
+			# File ending in '.pwr': contains sources, alpha heating etc
+      def pwr_outfile
+        TextDataTools::Column::DataFile.new(@directory + '/' + @run_name + '.pwr', true, /\S+/, /(?:\#\s+)?\b\d+:.*?(?=\d:|\Z)/)
       end
 			# File ending in '.nt': contains profiles: Ti, Te etc.
       def nt_outfile

data/trinitycrmod.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.4.0 ruby lib
+# stub: trinitycrmod 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2014-03-15"
+  s.date = "2014-03-16"
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner