gs2crmod 0.11.68 → 0.11.69
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/gs2crmod.gemspec +1 -1
- data/lib/gs2crmod/calculations.rb +13 -1
- data/lib/gs2crmod/gs2.rb +6 -0
- metadata +17 -17
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.11.
|
1
|
+
0.11.69
|
data/gs2crmod.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "gs2crmod"
|
8
|
-
s.version = "0.11.
|
8
|
+
s.version = "0.11.69"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
|
@@ -751,6 +751,8 @@ def max_es_heat_amp(species_index)
|
|
751
751
|
end
|
752
752
|
|
753
753
|
def calculate_spectral_checks
|
754
|
+
kx = gsl_vector('kx')
|
755
|
+
ky = gsl_vector('ky')
|
754
756
|
ky_spec = gsl_vector('spectrum_over_ky')
|
755
757
|
kx_spec = gsl_vector('spectrum_over_kx')
|
756
758
|
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
|
|
767
769
|
end
|
768
770
|
@spectrum_check.push check
|
769
771
|
end
|
772
|
+
|
773
|
+
#Calculate peak kx, ky spectrum values and associated phi2 values
|
774
|
+
peak_ky_idx = ky_spec.max_index
|
775
|
+
@ky_spectrum_peak_ky = ky[peak_ky_idx]
|
776
|
+
|
777
|
+
#Also want to know the phi2 at the energy containing scales and for ZFs
|
778
|
+
#Pick phi2 at the final time step.
|
779
|
+
phi_vec = gsl_vector('phi2_by_ky_over_time', ky_index:peak_ky_idx)
|
780
|
+
@ky_spectrum_peak_phi2 = phi_vec[-1]
|
781
|
+
phi_vec = gsl_vector('phi2_by_ky_over_time', ky_index:1)
|
782
|
+
@phi2_zonal = phi_vec[-1]
|
770
783
|
end
|
771
784
|
|
772
785
|
def calculate_vspace_checks
|
@@ -797,7 +810,6 @@ def sc(min)
|
|
797
810
|
end
|
798
811
|
alias :csc :calculate_spectral_checks
|
799
812
|
|
800
|
-
|
801
813
|
end
|
802
814
|
end
|
803
815
|
|
data/lib/gs2crmod/gs2.rb
CHANGED
@@ -160,8 +160,13 @@ eval(%[
|
|
160
160
|
:saturated,
|
161
161
|
:shot_time,
|
162
162
|
:spectrum_check,
|
163
|
+
:ky_spectrum_peak_ky,
|
164
|
+
:ky_spectrum_peak_phi2,
|
165
|
+
:kx_spectrum_peak_kx,
|
166
|
+
:kx_spectrum_peak_phi2,
|
163
167
|
:par_mom_flux_stav,
|
164
168
|
:perp_mom_flux_stav,
|
169
|
+
:phi2_zonal,
|
165
170
|
:transient_amplification_at_kx,
|
166
171
|
:transient_amplification_at_ky,
|
167
172
|
:transient_amplification_at_ky_at_kx,
|
@@ -1432,6 +1437,7 @@ end
|
|
1432
1437
|
graphs = [
|
1433
1438
|
[(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$."],
|
1434
1439
|
[(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$."],
|
1440
|
+
[(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}$."],
|
1435
1441
|
[(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."],
|
1436
1442
|
[(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."],
|
1437
1443
|
[(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
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gs2crmod
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.11.
|
4
|
+
version: 0.11.69
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -14,7 +14,7 @@ date: 2014-09-03 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: coderunner
|
17
|
-
requirement: &
|
17
|
+
requirement: &17055360 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: 0.14.15
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *17055360
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: rubyhacks
|
28
|
-
requirement: &
|
28
|
+
requirement: &17054560 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ! '>='
|
@@ -33,10 +33,10 @@ dependencies:
|
|
33
33
|
version: 0.1.2
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *17054560
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: ruby-netcdf-updated
|
39
|
-
requirement: &
|
39
|
+
requirement: &17053980 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ! '>='
|
@@ -44,10 +44,10 @@ dependencies:
|
|
44
44
|
version: 0.6.6.1
|
45
45
|
type: :runtime
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *17053980
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: shoulda
|
50
|
-
requirement: &
|
50
|
+
requirement: &17053280 !ruby/object:Gem::Requirement
|
51
51
|
none: false
|
52
52
|
requirements:
|
53
53
|
- - =
|
@@ -55,10 +55,10 @@ dependencies:
|
|
55
55
|
version: 3.0.1
|
56
56
|
type: :development
|
57
57
|
prerelease: false
|
58
|
-
version_requirements: *
|
58
|
+
version_requirements: *17053280
|
59
59
|
- !ruby/object:Gem::Dependency
|
60
60
|
name: rdoc
|
61
|
-
requirement: &
|
61
|
+
requirement: &17052440 !ruby/object:Gem::Requirement
|
62
62
|
none: false
|
63
63
|
requirements:
|
64
64
|
- - ~>
|
@@ -66,10 +66,10 @@ dependencies:
|
|
66
66
|
version: '3.12'
|
67
67
|
type: :development
|
68
68
|
prerelease: false
|
69
|
-
version_requirements: *
|
69
|
+
version_requirements: *17052440
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: bundler
|
72
|
-
requirement: &
|
72
|
+
requirement: &17050380 !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
74
74
|
requirements:
|
75
75
|
- - ! '>'
|
@@ -77,10 +77,10 @@ dependencies:
|
|
77
77
|
version: 1.0.0
|
78
78
|
type: :development
|
79
79
|
prerelease: false
|
80
|
-
version_requirements: *
|
80
|
+
version_requirements: *17050380
|
81
81
|
- !ruby/object:Gem::Dependency
|
82
82
|
name: jeweler
|
83
|
-
requirement: &
|
83
|
+
requirement: &17061300 !ruby/object:Gem::Requirement
|
84
84
|
none: false
|
85
85
|
requirements:
|
86
86
|
- - ! '>='
|
@@ -88,10 +88,10 @@ dependencies:
|
|
88
88
|
version: 1.8.4
|
89
89
|
type: :development
|
90
90
|
prerelease: false
|
91
|
-
version_requirements: *
|
91
|
+
version_requirements: *17061300
|
92
92
|
- !ruby/object:Gem::Dependency
|
93
93
|
name: minitest
|
94
|
-
requirement: &
|
94
|
+
requirement: &17060160 !ruby/object:Gem::Requirement
|
95
95
|
none: false
|
96
96
|
requirements:
|
97
97
|
- - ~>
|
@@ -99,7 +99,7 @@ dependencies:
|
|
99
99
|
version: '4'
|
100
100
|
type: :development
|
101
101
|
prerelease: false
|
102
|
-
version_requirements: *
|
102
|
+
version_requirements: *17060160
|
103
103
|
description: GS2 is a gyrokinetic flux tube initial value turbulence code which can
|
104
104
|
be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated
|
105
105
|
running and analysis of large simulations. This module allows GS2 (and its sister
|