gs2crmod 0.11.68 → 0.11.69

data/VERSION

@@ -1 +1 @@
-0.11.68
+0.11.69

data/gs2crmod.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.11.68"
+  s.version = "0.11.69"
 
   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/calculations.rb

@@ -751,6 +751,8 @@ def max_es_heat_amp(species_index)
 end
 
 def calculate_spectral_checks
+	kx = gsl_vector('kx')
+	ky = gsl_vector('ky')
 	ky_spec = gsl_vector('spectrum_over_ky')
 	kx_spec = gsl_vector('spectrum_over_kx')
 	kpar_spec = gsl_vector('spectrum_over_kpar', ky_index: ky_spec.max_index + 1, kx_index: 1)
@@ -767,6 +769,17 @@ def calculate_spectral_checks
 		end
 		@spectrum_check.push check
 	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] 
+
+  #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)
+  @ky_spectrum_peak_phi2 = phi_vec[-1] 
+  phi_vec = gsl_vector('phi2_by_ky_over_time', ky_index:1)
+  @phi2_zonal = phi_vec[-1] 
 end
 
 def calculate_vspace_checks
@@ -797,7 +810,6 @@ def sc(min)
 end
 alias :csc :calculate_spectral_checks
 
-	
 end
 end
 

data/lib/gs2crmod/gs2.rb

@@ -160,8 +160,13 @@ eval(%[
   :saturated,
   :shot_time,
   :spectrum_check,
+  :ky_spectrum_peak_ky,
+  :ky_spectrum_peak_phi2,
+  :kx_spectrum_peak_kx,
+  :kx_spectrum_peak_phi2,
   :par_mom_flux_stav,
   :perp_mom_flux_stav,
+  :phi2_zonal,
   :transient_amplification_at_kx,
   :transient_amplification_at_ky,
   :transient_amplification_at_ky_at_kx,
@@ -1432,6 +1437,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 = 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.68
+  version: 0.11.69
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
-  requirement: &17929040 !ruby/object:Gem::Requirement
+  requirement: &17055360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.15
   type: :runtime
   prerelease: false
-  version_requirements: *17929040
+  version_requirements: *17055360
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: &17926880 !ruby/object:Gem::Requirement
+  requirement: &17054560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *17926880
+  version_requirements: *17054560
 - !ruby/object:Gem::Dependency
   name: ruby-netcdf-updated
-  requirement: &17925740 !ruby/object:Gem::Requirement
+  requirement: &17053980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *17925740
+  version_requirements: *17053980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17940940 !ruby/object:Gem::Requirement
+  requirement: &17053280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *17940940
+  version_requirements: *17053280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17938700 !ruby/object:Gem::Requirement
+  requirement: &17052440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *17938700
+  version_requirements: *17052440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17937200 !ruby/object:Gem::Requirement
+  requirement: &17050380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17937200
+  version_requirements: *17050380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17936160 !ruby/object:Gem::Requirement
+  requirement: &17061300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *17936160
+  version_requirements: *17061300
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17935100 !ruby/object:Gem::Requirement
+  requirement: &17060160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: '4'
   type: :development
   prerelease: false
-  version_requirements: *17935100
+  version_requirements: *17060160
 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