gs2crmod 0.11.73 → 0.11.74

data/VERSION

@@ -1 +1 @@
-0.11.73
+0.11.74

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.73"
+  s.version = "0.11.74"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
-  s.date = "2014-09-07"
+  s.date = "2014-09-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/gsl_data_3d.rb

@@ -382,7 +382,7 @@ class CodeRunner::Gs2
 			else
 				theta_vec = gsl_vector(:theta, options)
 				factors = GSL::Tensor.alloc(6,theta_vec.size)
-				values = File.read("#@directory/#@run_name.g").split(/\s*\n\s*/)
+				values = File.read(options[:geometry_file]||"#@directory/#@run_name.g").split(/\s*\n\s*/)
 				3.times{values.shift}
 				values = values.map{|str| str.split(/\s+/).map{|s| s.to_f}}.transpose
 				#ep values
@@ -396,8 +396,7 @@ class CodeRunner::Gs2
 							opts = options.dup
 							opts[:interpolate_theta] = nil
 							theta_vec_short = gsl_vector(:theta, {})
-							#p 'sizes', [theta_vec_short.size, values[i+1].to_gslv.size]
-							interp = GSL::ScatterInterp.alloc(:linear, [theta_vec_short, values[i+1].to_gslv], true)
+							interp = GSL::ScatterInterp.alloc(:linear, [values[0], values[i+1].to_gslv], true)
 							for j in 0...theta_vec.size
 								factors[i,j] = interp.eval(theta_vec[j])
 							end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.73
+  version: 0.11.74
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: &20567540 !ruby/object:Gem::Requirement
+  requirement: &11951880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.15
   type: :runtime
   prerelease: false
-  version_requirements: *20567540
+  version_requirements: *11951880
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: &20566860 !ruby/object:Gem::Requirement
+  requirement: &11951240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *20566860
+  version_requirements: *11951240
 - !ruby/object:Gem::Dependency
   name: ruby-netcdf-updated
-  requirement: &20566080 !ruby/object:Gem::Requirement
+  requirement: &11949800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *20566080
+  version_requirements: *11949800
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20565060 !ruby/object:Gem::Requirement
+  requirement: &11948020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *20565060
+  version_requirements: *11948020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20563800 !ruby/object:Gem::Requirement
+  requirement: &11947320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *20563800
+  version_requirements: *11947320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20563200 !ruby/object:Gem::Requirement
+  requirement: &11962620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20563200
+  version_requirements: *11962620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20562220 !ruby/object:Gem::Requirement
+  requirement: &11961880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *20562220
+  version_requirements: *11961880
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &20560960 !ruby/object:Gem::Requirement
+  requirement: &11960740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: '4'
   type: :development
   prerelease: false
-  version_requirements: *20560960
+  version_requirements: *11960740
 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