trinitycrmod 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/trinitycrmod/graphs.rb

@@ -1,18 +1,41 @@
 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}))
+		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}))
+		end
+		def prof_graphkit(options)
 			raise "Please specify t_index" unless options[:t_index]
 			it = options[:t_index] - 1
-			array = nt_outfile.get_2d_array_float(options[:header], /1.*time/)
-			rho_array = nt_outfile.get_2d_array_float(/2.*radius/, /1.*time/)
+			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]
+			if options[:exclude_perturbed_fluxes]
+				s = array.size
+				array = array.slice(0...nrad-1)
+				rho_array = rho_array.slice(0...nrad-1)
+			end
 			#p rho_array, array
-			GraphKit.autocreate(x: {data: rho_array[it].to_gslv, title: 'rho', units: ''},
-													y: {data: array[it].to_gslv, title: options[:title]||"", units: options[:units]||""}
+			GraphKit.autocreate(x: {data: rho_array.to_gslv, title: 'rho', units: ''},
+													y: {data: array.to_gslv, title: options[:title]||"", units: options[:units]||""}
 												 )
 		end
+		# Graph of Qi in gyroBohm units against rho for a given t_index
+		def ion_hflux_gb_prof_graphkit(options)
+			fluxes_prof_graphkit(options.dup.absorb({header: /Qi.*\(GB/, title: 'Ion Heat Flux', units: 'Q_gB'}))
+		end
+		# Graph of toroidal angular momentum flux in gyroBohm units against rho for a given t_index
+		def lflux_gb_prof_graphkit(options)
+			fluxes_prof_graphkit(options.dup.absorb({header: /Pi.*\(GB/, title: 'Toroidal Angular Momentum Flux', units: 'Pi_gB'}))
+		end
+		# Graph of toroidal angular momentum against rho for a given t_index
 		def ang_mom_prof_graphkit(options)
 			return nt_prof_graphkit(options.dup.absorb({header: /ang\s+mom/, title: 'Angular Momentum', units: ''}))
 		end
+		# Graph of Ti against rho for a given t_index
 		def ion_temp_prof_graphkit(options)
 			return nt_prof_graphkit(options.dup.absorb({header: /i\+ temp/, title: 'Ti', units: 'keV'}))
 		end

data/lib/trinitycrmod/output_files.rb

@@ -2,13 +2,20 @@ require 'text-data-tools'
 
 class CodeRunner
   class Trinity
-    #  this module provides easy access to the Trinity  textbased output data
-    #  by defining a TextDataFile  for every text  output file. See the documentation
+    #  This module provides easy access to the Trinity  textbased output data
+    #  by defining a TextDataTools::Named::DataFile or TextDataTools::Column::DataFile  
+		#  for every text  output file. See the documentation
     #  for TextDataTools  for more information.
     module OutputFiles
+			# File ending in '.info': contains global results.
       def info_outfile
         TextDataTools::Named::DataFile.new(@directory + '/' + @run_name + '.info', ':')
       end
+			# 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:)/)
+      end
+			# File ending in '.nt': contains profiles: Ti, Te etc.
       def nt_outfile
         TextDataTools::Column::DataFile.new(@directory + '/' + @run_name + '.nt', true, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:)/)
       end

data/lib/trinitycrmod/trinity.rb

@@ -100,7 +100,7 @@ class CodeRunner
 				get_global_results 
 			end
 			#p ['fusionQ is ', fusionQ]
-			@percent_complete = completed_timesteps / ntstep * 100.0
+			@percent_complete = completed_timesteps.to_f / ntstep.to_f * 100.0
 		end
 
 		def get_status

data/test/test_trinitycrmod.rb

@@ -44,6 +44,11 @@ class TestTrinitycrmodIFSPPPLAnalysis < Test::Unit::TestCase
 		#kit.gnuplot
 		assert_equal(kit.data[0].class, GraphKit::DataKit)
 		assert_equal(kit.data[0].x.data[0], 0.05)
+	  kit = @runner.run_list[1].graphkit('ion_hflux_gb_prof', {t_index: 2})
+		#kit.gnuplot
+		assert_equal(kit.data[0].class, GraphKit::DataKit)
+		assert_equal(8,kit.data[0].y.data.size)
+		assert_equal(kit.data[0].y.data[0], 0.001944)
 	end
   def teardown
     FileUtils.rm('test/ifspppl_results/.code_runner_script_defaults.rb')

data/trinitycrmod.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2739372725142217113
+      hash: -1326413784735556803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: