gs2crmod 0.6.0 → 0.6.1

data/Rakefile

@@ -28,9 +28,39 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+require 'rake/clean'
+
+NAME = 'gs2crmod'
+
+# rule to build the extension: this says
+# that the extension should be rebuilt
+# after any change to the files in ext
+file "lib/#{NAME}_ext.so" =>
+    Dir.glob("ext/*{.rb,.c}") do
+  Dir.chdir("ext") do
+    # this does essentially the same thing
+    # as what RubyGems does
+    ruby "extconf.rb"
+    sh "make"
+  end
+  cp "ext/#{NAME}_ext.so", "lib/#{NAME}_ext.so"
+end
+
+# make the :test task depend on the shared
+# object, so it will be built automatically
+# before running the tests
+task :test => "lib/#{NAME}_ext.so"
+
+# use 'rake clean' and 'rake clobber' to
+# easily delete generated files
+CLEAN.include('ext/**/*{.o,.log,.so}')
+CLEAN.include('ext/**/Makefile')
+CLOBBER.include('lib/**/*.so')
+CLOBBER.include('lib/*.so')
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'lib' << 'test' << 'ext'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/gs2crmod.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]

data/lib/gs2crmod/graphs.rb

@@ -340,14 +340,14 @@ module GraphKits
 
 	alias :eigenfunction_graphkit :efn_graphkit
 		
-	def es_heat_vs_ky_vs_kx_graphkit(options={})
+	def es_heat_flux_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_over_ky_over_kx', options)
+			zaxis = axiskit('es_heat_flux_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"
@@ -357,7 +357,7 @@ module GraphKits
 		end
 	end
 
-	def es_heat_flux_vs_ky_graphkit(options={})
+	def es_heat_vs_ky_graphkit(options={})
 		case options[:command]
 		when :help
 			return "Heat flux vs ky"
@@ -368,7 +368,7 @@ module GraphKits
 		end
 	end
 
-	def es_heat_flux_vs_kxy_graphkit(options={})
+	def es_heat_vs_kxy_graphkit(options={})
 		case options[:command]
 		when :help
 			return "Heat flux vs options[:direction]  (kx or ky)"
@@ -376,7 +376,7 @@ module GraphKits
 			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 = GraphKit.autocreate({x: axiskit(kxy.to_s, options), y: axiskit("es_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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors: