gs2crmod 0.11.46 → 0.11.47
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/gs2.rb +17 -5
- metadata +15 -15
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.11.
|
1
|
+
0.11.47
|
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.47"
|
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"]
|
data/lib/gs2crmod/gs2.rb
CHANGED
@@ -1282,16 +1282,23 @@ end
|
|
1282
1282
|
t_index_beg = options[:t_index_window][0]
|
1283
1283
|
t_index_end = options[:t_index_window][1]
|
1284
1284
|
end
|
1285
|
-
if options[:amin]
|
1286
|
-
amin = 1.0
|
1287
|
-
else
|
1285
|
+
if options[:amin]
|
1288
1286
|
amin = options[:amin]
|
1289
1287
|
end
|
1288
|
+
if options[:v_ref] # velocity of reference species
|
1289
|
+
v_ref = options[:v_ref]
|
1290
|
+
end
|
1291
|
+
if options[:omega] # angular velocity of plasma
|
1292
|
+
omega = options[:omega]
|
1293
|
+
end
|
1294
|
+
if options[:omega] and (options[:v_ref] == nil or options[:amin] == nil)
|
1295
|
+
raise 'Need to specify amin AND v_ref options when specifying omega to move to LAB frame!'
|
1296
|
+
end
|
1290
1297
|
if options[:output_box_size] and options[:output_box_size].kind_of?Array
|
1291
1298
|
r_box_size = options[:output_box_size][0]
|
1292
1299
|
z_box_size = options[:output_box_size][1]
|
1293
|
-
else
|
1294
|
-
|
1300
|
+
#else
|
1301
|
+
# raise 'Option output_box_size must be specified (in units of amin) and must be an Array.'
|
1295
1302
|
end
|
1296
1303
|
if options[:output_box_points] and options[:output_box_points].kind_of?Array
|
1297
1304
|
r_box_pts = options[:output_box_points][0]
|
@@ -1327,6 +1334,11 @@ end
|
|
1327
1334
|
Terminal.erewind(1) #go back one line in terminal
|
1328
1335
|
eputs sprintf("Writing time index = %d of %d#{Terminal::CLEAR_LINE}", i, t_index_end-t_index_beg+1) #clear line and print time index
|
1329
1336
|
options[:t_index] = i
|
1337
|
+
#Need to test whether omega is specified to change torphi at each time step. If not, do nothing since torphi must be
|
1338
|
+
#set to a value to call the graphkit below
|
1339
|
+
if options[:omega]
|
1340
|
+
options[:torphi] = omega * (gsl_vector(:t)[i] - gsl_vector(:t)[0]) * (amin/v_ref)
|
1341
|
+
end
|
1330
1342
|
kit = field_real_space_poloidal_plane_graphkit(options)
|
1331
1343
|
t_var.put(gsl_vector(:t)[i], 'index'=>[i-t_index_beg]) #Write time to unlimited time NetCDF variable
|
1332
1344
|
field_var.put(NArray.to_na((kit.data[0].f.data).to_a), 'start'=>[0,0,i-t_index_beg], 'end'=>[-1,-1,i-t_index_beg])
|
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.47
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -14,7 +14,7 @@ date: 2014-04-07 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: coderunner
|
17
|
-
requirement: &
|
17
|
+
requirement: &20223140 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: 0.14.10
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *20223140
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: rubyhacks
|
28
|
-
requirement: &
|
28
|
+
requirement: &20222500 !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: *20222500
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: ruby-netcdf-updated
|
39
|
-
requirement: &
|
39
|
+
requirement: &20221720 !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: *20221720
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: shoulda
|
50
|
-
requirement: &
|
50
|
+
requirement: &20219280 !ruby/object:Gem::Requirement
|
51
51
|
none: false
|
52
52
|
requirements:
|
53
53
|
- - ! '>='
|
@@ -55,10 +55,10 @@ dependencies:
|
|
55
55
|
version: '0'
|
56
56
|
type: :development
|
57
57
|
prerelease: false
|
58
|
-
version_requirements: *
|
58
|
+
version_requirements: *20219280
|
59
59
|
- !ruby/object:Gem::Dependency
|
60
60
|
name: rdoc
|
61
|
-
requirement: &
|
61
|
+
requirement: &20302860 !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: *20302860
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: bundler
|
72
|
-
requirement: &
|
72
|
+
requirement: &20302040 !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: *20302040
|
81
81
|
- !ruby/object:Gem::Dependency
|
82
82
|
name: jeweler
|
83
|
-
requirement: &
|
83
|
+
requirement: &20300880 !ruby/object:Gem::Requirement
|
84
84
|
none: false
|
85
85
|
requirements:
|
86
86
|
- - ! '>='
|
@@ -88,7 +88,7 @@ dependencies:
|
|
88
88
|
version: 1.8.4
|
89
89
|
type: :development
|
90
90
|
prerelease: false
|
91
|
-
version_requirements: *
|
91
|
+
version_requirements: *20300880
|
92
92
|
description: GS2 is a gyrokinetic flux tube initial value turbulence code which can
|
93
93
|
be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated
|
94
94
|
running and analysis of large simulations. This module allows GS2 (and its sister
|