gs2crmod 0.11.71 → 0.11.72

data/VERSION

@@ -1 +1 @@
-0.11.71
+0.11.72

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.71"
+  s.version = "0.11.72"
 
   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-04"
+  s.date = "2014-09-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/graphs.rb

@@ -180,6 +180,7 @@ GRAPHKIT_OPTIONS_HELP = {
   thetamin: "The (0-based) index of the minimum value of theta to include in the plot",
 	theta_index: "integer, index of theta at which to plot (e.g. theta_index: 20)",
 	kxfac: "float, overrides calculation of kxfac in zonal flow velocity function",
+	add_mean_flow: "bool, Adds mean flow to zonal flow velocity",
   ncopies: " The number of periodic copies of the flux tube to include",
   torphi_values: "An array of two values of the toroidal angle. The graph will be plotted in between those two values with poloidal cross sections at either end",
   magnify: " The magnification factor of the small section. It can take any value greater than or equal to 1",
@@ -2372,10 +2373,13 @@ module GraphKits
 		when :help
 			return  "zonal_flow_velocity_vs_x: Graph of the zonal flow velocity kxfac*IFT(i k_x phi). kxfac = (qinp/rhoc)*grho(rhoc)."
 		when :options
-			return  [:t, :t_index, :theta_index, :kxfac]
+			return  [:t, :t_index, :theta_index, :kxfac, :add_mean_flow]
 		else
       options[:ky_index]=0
 			kit = GraphKit.autocreate({x: axiskit('x', options), y: axiskit("zonal_flow_velocity_over_x", options)})
+      if options[:add_mean_flow]
+        kit.data[0].y.data += mean_flow_velocity_over_x_gsl_vector(options)
+      end
 			kit.title  = "Zonal Flow Velocity versus x"
 			kit.file_name = options[:graphkit_name] + options[:t_index].to_s
 			kit.data[0].with = 'lp'

data/lib/gs2crmod/gsl_data.rb

@@ -1021,7 +1021,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*kx.size
+        vec_zf_vel = kxfac*(phi*kx).backward.imag
         return vec_zf_vel
 			end
 		end
@@ -1031,7 +1031,7 @@ module GSLVectors
     #at the middle of the box.
 		def mean_flow_velocity_over_x_gsl_vector(options)
 			Dir.chdir(@directory) do
-				raise CRFatal.new("Need to have g_exb > 0 to have a mean flow.") unless @g_exb > 0
+				raise CRFatal.new("Need to have g_exb > 0 to have a mean flow.") unless @g_exb 
         x = gsl_vector(:x)
 
         vec_exb_vel = GSL::Vector.alloc(x.size)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.71
+  version: 0.11.72
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner