gs2crmod 0.12.0 → 0.12.1

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.12.0"
+  s.version = "0.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
-  s.date = "2015-07-28"
+  s.date = "2015-08-05"
   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.rb

@@ -1029,10 +1029,10 @@ module GSLVectors
       GSL::Vector.indgen(ysize, 0, ly/ysize)
     end
 
-    #This function reads in the 'grho' variable from the netcdf file.
-    def grho_gsl_vector(options)
-      grho = GSL::Vector.alloc(netcdf_file.var('grho').get('start' => [0], 'end' => [-1]).to_a)
-      return grho
+    #This function reads in the 'drhodpsi' variable from the netcdf file.
+    def drhodpsi_gsl_vector(options)
+      drhodpsi = netcdf_file.var('drhodpsi').get()[0]
+      return drhodpsi
     end
 
     #This function returns the zonal flow velocity as a function of x (the radial coordinate).
@@ -1043,7 +1043,7 @@ module GSLVectors
                           If using numerical equil use the option :kxfac to override calculation.") unless @qinp or (@pk and @epsl or options[:kxfac])
 
         kx = gsl_vector(:kx).to_box_order
-        grho = gsl_vector('grho')[get_list_of(:theta).length/2]
+        drhodpsi = gsl_vector('drhodpsi')
 
         phi = GSL::Vector.alloc(kx.size)
         for it in 0...gsl_vector(:t).size
@@ -1053,9 +1053,9 @@ module GSLVectors
         phi /= gsl_vector(:t).size
 
         if @qinp
-          kxfac = (@qinp/@rhoc)*grho
+          kxfac = (@qinp/@rhoc)/drhodpsi
         elsif @pk and @epsl
-          kxfac = (@epsl/@pk)*grho
+          kxfac = (@epsl/@pk)/drhodpsi
         elsif options[:kxfac]
           kxfac = options[:kxfac]
         else
@@ -1064,7 +1064,7 @@ module GSLVectors
 
         vec_zf_vel = GSL::Vector.alloc(kx.size)
         #Take imaginary part since i k_x will lead to imaginary part being real
-        vec_zf_vel = kxfac*(phi*kx).backward.imag
+        vec_zf_vel = 0.5*kxfac*(phi*kx).backward.imag
         return vec_zf_vel
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner