gs2crmod 0.11.69 → 0.11.70

data/VERSION

@@ -1 +1 @@
-0.11.69
+0.11.70

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.69"
+  s.version = "0.11.70"
 
   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-03"
+  s.date = "2014-09-04"
   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"]
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
   s.licenses = ["GSLv3"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes."
 
   if s.respond_to? :specification_version then

data/lib/gs2crmod/calculations.rb

@@ -771,12 +771,12 @@ def calculate_spectral_checks
 	end
 
   #Calculate peak kx, ky spectrum values and associated phi2 values
-  peak_ky_idx = ky_spec.max_index 
-  @ky_spectrum_peak_ky = ky[peak_ky_idx] 
+  @ky_spectrum_peak_idx = ky_spec.max_index 
+  @ky_spectrum_peak_ky = ky[@ky_spectrum_peak_idx] 
 
   #Also want to know the phi2 at the energy containing scales and for ZFs
   #Pick phi2 at the final time step.
-  phi_vec = gsl_vector('phi2_by_ky_over_time', ky_index:peak_ky_idx)
+  phi_vec = gsl_vector('phi2_by_ky_over_time', ky_index:@ky_spectrum_peak_idx)
   @ky_spectrum_peak_phi2 = phi_vec[-1] 
   phi_vec = gsl_vector('phi2_by_ky_over_time', ky_index:1)
   @phi2_zonal = phi_vec[-1] 

data/lib/gs2crmod/gs2.rb

@@ -160,6 +160,7 @@ eval(%[
   :saturated,
   :shot_time,
   :spectrum_check,
+  :ky_spectrum_peak_idx,
   :ky_spectrum_peak_ky,
   :ky_spectrum_peak_phi2,
   :kx_spectrum_peak_kx,
@@ -1437,7 +1438,7 @@ end
       graphs = [
         [(kit = ky_spectrum_graphkit; kit.gp.logscale="y"; kit.file_name = "ky_spectrum.eps"; kit), "$k_y$ spectrum at the final time step averaged over $k_x$."],
         [(kit = kx_spectrum_graphkit; kit.gp.logscale="y"; kit.file_name = "kx_spectrum.eps"; kit), "$k_x$ spectrum at the final time step averaged over $k_y$."],
-        [(kit = kpar_spectrum_graphkit(kx_index:0, ky_index:@ky_spectrum_peak); kit.gp.logscale="y"; kit.file_name = "kpar_spectrum.eps"; kit), "$k_{par}$ spectrum at the final time step for $kx = 0$, and $ky = k_{y,peak}$."],
+        [(kit = kpar_spectrum_graphkit(kx_index:0, ky_index:@ky_spectrum_peak_idx); kit.gp.logscale="y"; kit.file_name = "kpar_spectrum.eps"; kit), "$k_{par}$ spectrum at the final time step for $kx = 0$, and $ky = k_{y,peak}$."],
         [(kit = spectrum_graphkit(no_zonal:true); kit.gp.view="map"; kit.gp.logscale="z"; kit.file_name = "spectrum.eps"; kit), "2D spectrum versus $k_x$ and $k_y$ without zonal flows."],
         [(kit = hflux_tot_vs_time_graphkit; kit.file_name = "hflux_tot_vs_time.eps"; kit), "Total heat flux $Q_{tot}$ as a function of time."],
         [(kit = es_heat_flux_vs_time_graphkit(species_index:1); kit.file_name = "es_heat_1_vs_time.eps"; kit), "Heat flux of species 1 versus time."],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.11.69
+  version: 0.11.70
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: &17055360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 0.14.15
   type: :runtime
   prerelease: false
-  version_requirements: *17055360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.15
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: &17054560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *17054560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: ruby-netcdf-updated
-  requirement: &17053980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +54,31 @@ dependencies:
         version: 0.6.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *17053980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.6.1
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17053280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *17053280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17052440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +86,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *17052440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17050380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -77,10 +102,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17050380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17061300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *17061300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17060160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +134,12 @@ dependencies:
         version: '4'
   type: :development
   prerelease: false
-  version_requirements: *17060160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
 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
@@ -187,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes.