trinitycrmod 0.2.4 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.6

data/lib/trinitycrmod/graphs.rb

@@ -6,7 +6,11 @@ class CodeRunner::Trinity
 		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, exclude_perturbed_fluxes: true}))
+			prof_graphkit(options.absorb({outfile: :fluxes, exclude_perturbed_fluxes: true}))
+		end
+		# Graphs plotting quantities from the '.pbalance' file vs rho for a given t_index
+		def pbalance_prof_graphkit(options)
+			prof_graphkit(options.absorb({outfile: :pbalance}))
 		end
 		def prof_graphkit(options)
 			raise "Please specify t_index" unless options[:t_index]
@@ -19,25 +23,40 @@ class CodeRunner::Trinity
 				rho_array = rho_array.slice(0...nrad-1)
 			end
 			#p rho_array, array
-			GraphKit.autocreate(x: {data: rho_array.to_gslv, title: 'rho', units: ''},
+			kit = GraphKit.autocreate(x: {data: rho_array.to_gslv, title: 'rho', units: ''},
 													y: {data: array.to_gslv, title: options[:title]||"", units: options[:units]||""}
 												 )
+			kit.data[0].title += " at time = #{list(:t)[it+1]} s"
+			kit
 		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'}))
+			fluxes_prof_graphkit(options.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'}))
+			fluxes_prof_graphkit(options.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: ''}))
+			return nt_prof_graphkit(options.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'}))
+			return nt_prof_graphkit(options.absorb({header: /i\+ temp/, title: 'Ti', units: 'keV'}))
+		end
+
+		# Graph of ion power integrated from the magnetic axis to rho vs rho
+		def ion_pwr_prof_graphkit(options)
+			return pbalance_prof_graphkit(options.absorb({header: /i\+ pwr/, title: 'Integrated ion power', units: 'MW'}))
+		end
+		# Graph of electron power integrated from the magnetic axis to rho vs rho
+		def electron_pwr_prof_graphkit(options)
+			return pbalance_prof_graphkit(options.absorb({header: /e\- pwr/, title: 'Integrated electron power', units: 'MW'}))
+		end
+		# Graph of ion power integrated from the magnetic axis to rho vs rho
+		def ion_pwr_prof_graphkit(options)
+			return pbalance_prof_graphkit(options.absorb({header: /i\+ pwr/, title: 'Integrated ion power', units: 'MW'}))
 		end
 	end
 

data/lib/trinitycrmod/namelists.rb

@@ -1198,7 +1198,81 @@
           :explanation=>
            "This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
        :type=>:Fortran_Bool,
-       :autoscanned_defaults=>[".false."]}}},
+       :autoscanned_defaults=>[".false."]},
+     :nbi_mult=>
+      {:should_include=>"true",
+       :description=>
+        " multiplies QNBII, QNBIE and SNBIE when using the tokamak profile db, may not be self consistent when using TORQ for torque input (as opposed to pioq)",
+       :help=>
+        " multiplies QNBII, QNBIE and SNBIE when using the tokamak profile db, may not be self consistent when using TORQ for torque input (as opposed to pioq)",
+       :code_name=>:nbi_mult,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
+     :icrh_mult=>
+      {:should_include=>"true",
+       :description=>
+        " multiplies QICRHI and QICRHE when using the tokamak profile db",
+       :help=>
+        " multiplies QICRHI and QICRHE when using the tokamak profile db",
+       :code_name=>:icrh_mult,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
+     :ech_mult=>
+      {:should_include=>"true",
+       :description=>
+        " multiplies QECHI and QECHE when using the tokamak profile db",
+       :help=>" multiplies QECHI and QECHE when using the tokamak profile db",
+       :code_name=>:ech_mult,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
+     :lh_mult=>
+      {:should_include=>"true",
+       :description=>
+        " multiplies QLHI and QLHE when using the tokamak profile db",
+       :help=>" multiplies QLHI and QLHE when using the tokamak profile db",
+       :code_name=>:lh_mult,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
+     :ibw_mult=>
+      {:should_include=>"true",
+       :description=>
+        " multiplies QIBWI and QIBWE when using the tokamak profile db",
+       :help=>" multiplies QIBWI and QIBWE when using the tokamak profile db",
+       :code_name=>:ibw_mult,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]},
+     :dwn_mult=>
+      {:should_include=>"true",
+       :description=>
+        " multiplies DWIR, DWER, DNER when using the tokamak profile db",
+       :help=>" multiplies DWIR, DWER, DNER when using the tokamak profile db",
+       :code_name=>:dwn_mult,
+       :must_pass=>
+        [{:test=>"kind_of? Numeric",
+          :explanation=>
+           "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
+       :type=>:Float,
+       :autoscanned_defaults=>[1.0]}}},
  :physics=>
   {:description=>"",
    :should_include=>"true",

data/lib/trinitycrmod/output_files.rb

@@ -18,6 +18,10 @@ class CodeRunner
 			# 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:|\Z)/)
+      end
+			# File ending in '.pbalance': contains fluxes and sources
+      def pbalance_outfile
+        TextDataTools::Column::DataFile.new(@directory + '/' + @run_name + '.pbalance', true, /\S+/, /(?:\#\s+)?\d:.*?(?=\d:|\Z)/)
       end
       def time_outfile
         TextDataTools::Column::DataFile.new(@directory + '/' + @run_name + '.time', true, /\S+/, /\w+/)
@@ -25,9 +29,9 @@ class CodeRunner
 			def view_outfiles
 				case ENV['EDITOR']
 				when /vim/i
-					"#{ENV['EDITOR']} -Rp #{info_outfile} #{nt_outfile} #{fluxes_outfile}"
+					system "#{ENV['EDITOR']} -Rp '+tabdo set nu|set nowrap'  #{info_outfile} #{nt_outfile} #{fluxes_outfile}"
 				else
-					"#{ENV['EDITOR']} #{info_outfile} #{nt_outfile} #{fluxes_outfile}"
+					system "#{ENV['EDITOR']} #{info_outfile} #{nt_outfile} #{fluxes_outfile}"
 				end
 			end
     end
@@ -42,5 +46,19 @@ class CodeRunner
 			cache[:array_2d] ||= {}
 			cache[:array_2d][[outfile, column_header, index_header]] ||= send(outfile + :_outfile).get_2d_array_float(column_header, index_header)
 		end
+
+		# Returns a hash of the specified dimension in the form {index=> value} where index is 1-based
+		# Dimension can be:
+		# 	:t
+		# 	:rho
+		# 	:rho_cc
+		def list(var)
+			case var
+			when :t
+				hash  = {}
+				get_2d_array_float(:nt, /1:\s+time/, /1:\s+time/).map{|arr| arr[0]}.each_with_index{|t,i| hash[i+1] = t}
+				hash
+			end
+		end
   end
 end

data/sync_variables/sync_variables.rb

@@ -1,6 +1,6 @@
 require 'helper'
 CodeRunner.setup_run_class('trinity')
-#CodeRunner::Trinity.get_input_help_from_source_code(ENV['TRINITY_SOURCE'])
+CodeRunner::Trinity.get_input_help_from_source_code(ENV['TRINITY_SOURCE'])
 CodeRunner::Trinity.update_defaults_from_source_code(ENV['TRINITY_SOURCE'])
 CodeRunner::Trinity.synchronise_variables(ENV['TRINITY_SOURCE'])
 

data/test/test_trinitycrmod.rb

@@ -37,6 +37,9 @@ class TestTrinitycrmodIFSPPPLAnalysis < Test::Unit::TestCase
     CodeRunner.status(Y: 'test/ifspppl_results')
     assert_equal(@runner.run_list.size, 1)
     assert_equal(@runner.run_list[1].fusionQ, 0.075658439797815016)
+		list_t = @runner.run_list[1].list(:t)
+		assert_equal(201, list_t.size)
+		assert_equal(0.04375, list_t[10])
     FileUtils.rm('test/ifspppl_results/.CODE_RUNNER_TEMP_RUN_LIST_CACHE')
   end
 	def test_graphs
@@ -49,6 +52,10 @@ class TestTrinitycrmodIFSPPPLAnalysis < Test::Unit::TestCase
 		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)
+	  kit = @runner.run_list[1].graphkit('ion_pwr_prof', {t_index: 2})
+		assert_equal(8,kit.data[0].y.data.size)
+		assert_equal(kit.data[0].y.data[0], 0.2412)
+		#kit.gnuplot
 	end
   def teardown
     FileUtils.rm('test/ifspppl_results/.code_runner_script_defaults.rb')

data/trinitycrmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.2.4"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-06-19"
+  s.date = "2013-06-24"
   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.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-24 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: 4601330261692563943
+      hash: -1744466157144352750
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: