gs2crmod 0.5.17 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.17
+0.6.0

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.5.17"
+  s.version = "0.6.0"
 
   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-06-17"
+  s.date = "2013-06-21"
   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

@@ -33,6 +33,7 @@ def auto_axiskits(name, options)
 	        'spectrum_over_kx' => ["Spectrum at t = #{sprintf("%.3f" ,(options[:t] or list(:t)[options[:t_index]] or list(:t).values.max))}", '', 1],
 	        'zonal_spectrum' => ["Zonal spectrum at t = #{sprintf("%.3f" ,(options[:t] or list(:t)[options[:t_index]] or list(:t).values.max))}", '', 1],
 	        'spectrum_over_ky' => ["Spectrum at t = #{sprintf("%.3f" ,(options[:t] or list(:t)[options[:t_index]] or list(:t).values.max))}", '', 1],
+	        'es_heat_over_ky' => ["Heat Flux at t = #{sprintf("%.3f" ,(options[:t] or list(:t)[options[:t_index]] or list(:t).values.max))}", 'Q_gB', 1],
 	        'growth_rate_over_ky_over_kx' => ["Growth Rate", "v_th#{species_letter}/a", 2],
 	       	'es_heat_flux_over_ky_over_kx' => ["Heat flux at t = #{sprintf("%.3f" ,(options[:t] or list(:t)[options[:t_index]] or list(:t).values.max))}", '', 2],
 	       	'spectrum_over_kpar' => ["Spectrum at t = #{sprintf("%.3f" ,(options[:t] or list(:t)[options[:t_index]] or list(:t).values.max))}", '', 1],
@@ -339,14 +340,14 @@ module GraphKits
 
 	alias :eigenfunction_graphkit :efn_graphkit
 		
-	def es_heat_flux_vs_ky_vs_kx_graphkit(options={})
+	def es_heat_vs_ky_vs_kx_graphkit(options={})
 		case options[:command]
 		when :help
 			return  "Graph of electrostatic contribution to heat flux at a given time vs kx and ky"
 		when :options
 			return [:with]
 		else
-			zaxis = axiskit('es_heat_flux_over_ky_over_kx', options)
+			zaxis = axiskit('es_heat_over_ky_over_kx', options)
 			zaxis.data = zaxis.data.transpose
 			kit = GraphKit.autocreate({y: axiskit('ky', options), x: axiskit('kx', options), z: zaxis})
 			kit.title = "Heat flux"
@@ -356,6 +357,35 @@ module GraphKits
 		end
 	end
 
+	def es_heat_flux_vs_ky_graphkit(options={})
+		case options[:command]
+		when :help
+			return "Heat flux vs ky"
+		when :options
+			return [:ky_index, :species_index]
+		else
+			return es_heat_flux_vs_kxy_graphkit(options.absorb({direction: :ky}))
+		end
+	end
+
+	def es_heat_flux_vs_kxy_graphkit(options={})
+		case options[:command]
+		when :help
+			return "Heat flux vs options[:direction]  (kx or ky)"
+		when :options
+			return [:ky_index, :species_index]
+		else
+			kxy = options[:direction]||options[:kxy] 
+			kit = GraphKit.autocreate({x: axiskit(kxy.to_s, options), y: axiskit("es_heat_flux_vs_#{kxy}", options)})
+			kit.title  = "Heat flux vs #{kxy} for species #{options[:species_index]}"
+			kit.file_name = options[:graphkit_name] + options[:t_index].to_s
+			kit.data[0].with = 'lp'
+			#kit.ylabel = "Phi^2 #{kxy}^2"
+			kit.pointsize = 2.0
+		end
+	end
+
+
 	def es_heat_flux_vs_time_graphkit(options={})
 		case options[:command]
 		when :help

data/lib/gs2crmod/gs2.rb

@@ -52,7 +52,8 @@ class CodeRunner
 
 class Gs2 < Run::FortranNamelist
 
-GS2_CRMOD_VERSION = Version.new(Gem.loaded_specs['gs2crmod'].version.to_s)
+#GS2_CRMOD_VERSION = Version.new(Gem.loaded_specs['gs2crmod'].version.to_s)
+GS2_CRMOD_VERSION = Version.new('0.5.0')
 
 
 def agk?

data/test/helper.rb

@@ -12,7 +12,7 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'gs2crmod'
+require 'coderunner'
 
 class Test::Unit::TestCase
 end

data/test/test_gs2crmod.rb

@@ -1,7 +1,14 @@
 require 'helper'
 
 class TestGs2crmod < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+	def setup
+    @runner = CodeRunner.fetch_runner(Y: 'test/slab_itg', C: 'gs2', X: '/dev/null')
+  end
+  def teardown
+    FileUtils.rm('test/slab_itg/.code_runner_script_defaults.rb')
+    FileUtils.rm('test/slab_itg/.CODE_RUNNER_TEMP_RUN_LIST_CACHE')
+  end
+  def test_basics
+    assert_equal(@runner.run_class, CodeRunner::Gs2)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner