gs2crmod 0.9.10 → 0.9.11

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
-  s.date = "2013-08-16"
+  s.date = "2013-08-19"
   s.description = "GS2 is a gyrokinetic flux tube initial value turbulence code which can be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated running and analysis of large simulations. This module allows GS2 (and its sister code AstroGK) to harness the power of the CodeRunner framework."
   s.email = "edmundhighcock@sourceforge.net"
   s.extensions = ["ext/extconf.rb"]

data/lib/gs2crmod/graphs.rb

@@ -23,6 +23,8 @@ def auto_axiskits(name, options)
 								 'tpar2_by_mode_over_time' => ["(delta T_parallel)^2 by mode", '%'],
 						 		'tperp2_by_mode_over_time' => ["(delta T_perp)^2 by mode", '%'],
                                 'hflux_tot' => ['Total Heat Flux', ''],
+                                'es_heat_par' => ['Parallel electrostatic heat flux', ''],
+                                'es_heat_perp' => ['Perpendicular electrostatic heat flux', ''],
                 'ky' => ['ky', "1/rho_#{species_letter}"],
                 'kx' => ['kx', "1/rho_#{species_letter}"],
 	        'kpar' => ['kpar', "2 pi/qR"],
@@ -75,6 +77,13 @@ def axiskit(name, options={})
 		units = ''
 		return GraphKit::AxisKit.autocreate(data: gsl_vector('es_heat_flux_over_time', options), title: "#{type} Heat Flux", units: units)
 # 	when 'spectrum_by_ky'
+# 		return AxisKit.autocreate(data: gsl_vector('spectrum_by_ky', options), title: "Phi^2 at t = #{list(:t)[options[:t_index]]}", units: '')
+	when 'es_heat_par'
+    puts "heat par" 
+		type = species_type(options[:species_index]).capitalize
+		units = ''
+		return GraphKit::AxisKit.autocreate(data: gsl_vector('es_heat_par_over_time', options), title: "#{type} parallel es heat flux", units: units)
+# 	when 'spectrum_by_ky'
 # 		return AxisKit.autocreate(data: gsl_vector('spectrum_by_ky', options), title: "Phi^2 at t = #{list(:t)[options[:t_index]]}", units: '')
 	end
 	raise CRError.new("Unknown axis kit: #{name}")
@@ -404,6 +413,41 @@ module GraphKits
 		end 
 	end
 
+	def es_heat_par_vs_time_graphkit(options={})
+		case options[:command]
+		when :help
+			return "Graph of parallel electrostatic heat flux vs time."
+		when :options
+			return [:t_index_window, :species_index]
+		else
+			kit = GraphKit.autocreate({x: axiskit('t', options), y: axiskit('es_heat_par', options)})
+			kit.data[0].title = "#{species_type(options[:species_index])} es_heat_par: #@run_name"
+			kit.data[0].with = "l" #"lines"
+			kit.file_name = options[:graphkit_name]
+# 			kit.log_axis = 'y'
+			kit
+		end
+	end
+
+	def es_heat_perp_vs_time_graphkit(options={})
+		case options[:command]
+		when :help
+			return "Graph of perpendicular electrostatic heat flux vs time."
+		when :options
+			return [:t_index_window, :species_index]
+		else
+			kit = GraphKit.autocreate({x: axiskit('t', options), y: axiskit('es_heat_perp', options)})
+			kit.data[0].title = "#{species_type(options[:species_index])} es_heat_perp: #@run_name"
+			kit.data[0].with = "l" #"lines"
+			kit.file_name = options[:graphkit_name]
+# 			kit.log_axis = 'y'
+			kit
+		end
+	end
+	def es_heat_all_vs_time_graphkit(options={})
+    es_heat_par_vs_time_graphkit(options)
+    es_heat_perp_vs_time_graphkit(options)
+	end
 	def es_mom_flux_vs_time_graphkit(options={})
 		case options[:command]
 		when :help

data/lib/gs2crmod/gsl_data.rb

@@ -731,6 +731,29 @@ module GSLVectors
 				return GSL::Vector.alloc(netcdf_file.var('es_heat_flux').get('start' => [options[:species_index].to_i - 1, options[:begin_element]], 'end' => [options[:species_index].to_i - 1, options[:end_element]]).to_a.flatten)
 			end
 		end
+		def es_heat_par_over_time_gsl_vector(options)
+			Dir.chdir(@directory) do
+
+				options.setup_time_window
+				return GSL::Vector.alloc(netcdf_file.var('es_heat_par').get('start' => [options[:species_index].to_i - 1, options[:begin_element]], 'end' => [options[:species_index].to_i - 1, options[:end_element]]).to_a.flatten)
+			end
+		end
+		alias :es_heat_par_gsl_vector :es_heat_par_over_time_gsl_vector
+		def es_heat_perp_over_time_gsl_vector(options)
+			Dir.chdir(@directory) do
+
+				options.setup_time_window
+				return GSL::Vector.alloc(netcdf_file.var('es_heat_perp').get('start' => [options[:species_index].to_i - 1, options[:begin_element]], 'end' => [options[:species_index].to_i - 1, options[:end_element]]).to_a.flatten)
+			end
+		end
+		alias :es_heat_perp_gsl_vector :es_heat_perp_over_time_gsl_vector
+		def es_heat_flux_over_time_gsl_vector(options)
+			Dir.chdir(@directory) do
+
+				options.setup_time_window
+				return GSL::Vector.alloc(netcdf_file.var('es_heat_flux').get('start' => [options[:species_index].to_i - 1, options[:begin_element]], 'end' => [options[:species_index].to_i - 1, options[:end_element]]).to_a.flatten)
+			end
+		end
 		def es_mom_flux_over_time_gsl_vector(options)
 			Dir.chdir(@directory) do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner