gs2crmod 0.11.34 → 0.11.35
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/ext/gs2crmod_ext.c +1 -1
- data/gs2crmod.gemspec +5 -7
- data/lib/gs2crmod/graphs.rb +18 -4
- metadata +38 -57
- checksums.yaml +0 -7
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.11.
|
1
|
+
0.11.35
|
data/ext/gs2crmod_ext.c
CHANGED
@@ -668,7 +668,7 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
|
|
668
668
|
for(i1=0; i1<tot_size; i1+=nt_reg){
|
669
669
|
printf("\33[2K\r"); //Clear line in terminal
|
670
670
|
printf("\33[1A"); //Go back one line in terminal
|
671
|
-
printf("
|
671
|
+
printf("Main loop iterator = %ld of %ld\n", i1/nt_reg, tot_size/nt_reg);
|
672
672
|
for(i2=i1; i2<tot_size; i2+=nt_reg)
|
673
673
|
{
|
674
674
|
//Calculate spatial and temporal separation
|
data/gs2crmod.gemspec
CHANGED
@@ -2,17 +2,14 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: gs2crmod 0.11.34 ruby lib
|
6
|
-
# stub: ext/extconf.rb
|
7
5
|
|
8
6
|
Gem::Specification.new do |s|
|
9
7
|
s.name = "gs2crmod"
|
10
|
-
s.version = "0.11.
|
8
|
+
s.version = "0.11.35"
|
11
9
|
|
12
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
13
|
-
s.require_paths = ["lib"]
|
14
11
|
s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
|
15
|
-
s.date = "2014-03-
|
12
|
+
s.date = "2014-03-20"
|
16
13
|
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."
|
17
14
|
s.email = "edmundhighcock@sourceforge.net"
|
18
15
|
s.extensions = ["ext/extconf.rb"]
|
@@ -85,12 +82,13 @@ Gem::Specification.new do |s|
|
|
85
82
|
]
|
86
83
|
s.homepage = "http://gs2crmod.sourceforge.net"
|
87
84
|
s.licenses = ["GSLv3"]
|
85
|
+
s.require_paths = ["lib"]
|
88
86
|
s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
|
89
|
-
s.rubygems_version = "
|
87
|
+
s.rubygems_version = "1.8.11"
|
90
88
|
s.summary = "Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes."
|
91
89
|
|
92
90
|
if s.respond_to? :specification_version then
|
93
|
-
s.specification_version =
|
91
|
+
s.specification_version = 3
|
94
92
|
|
95
93
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
96
94
|
s.add_runtime_dependency(%q<coderunner>, [">= 0.14.10"])
|
data/lib/gs2crmod/graphs.rb
CHANGED
@@ -1011,7 +1011,8 @@ module GraphKits
|
|
1011
1011
|
#shape = zaxis.data.shape
|
1012
1012
|
#carts = cartesian_coordinates_gsl_tensor(options)
|
1013
1013
|
#torphiout = 2.6
|
1014
|
-
torphiout = options[:constant_torphi] || options[:torphi]
|
1014
|
+
torphiout = options[:constant_torphi] || options[:torphi] #if constant_torphi is specified this is the toroidal angle at which data is printed
|
1015
|
+
torphiactual = options[:torphi] #This is the actual tor_phi used in the calculation
|
1015
1016
|
raise "Please specify a toroidal angle (options[:torphi])" unless torphiout
|
1016
1017
|
field = options[:field] || field_real_space_gsl_tensor(options)
|
1017
1018
|
torphi_const = constant_torphi_surface_gsl_tensor(options)
|
@@ -1045,12 +1046,25 @@ module GraphKits
|
|
1045
1046
|
i = torphi_const[j,k]
|
1046
1047
|
torphi1 = cyls[2,i,j,k]
|
1047
1048
|
torphi2 = cyls[2,i+1,j,k]
|
1048
|
-
#ep cyls[2,true,j,k].to_a
|
1049
1049
|
deltorphi = cyls[2,shpc[1]-1,j,k] - cyls[2,0,j,k]
|
1050
|
+
|
1051
|
+
#This options tests whether the point is inside or outside a single
|
1052
|
+
#flux tube and defines a factor which will zero all other points.
|
1053
|
+
#This will give the projection of a single flux tube onto a poloidal plane.
|
1054
|
+
if options[:no_flux_tube_copies]
|
1055
|
+
if torphiactual <= cyls[2,shpc[1]-1,j,k] and torphiactual >= cyls[2,0,j,k]
|
1056
|
+
field_fac = 1.0
|
1057
|
+
else
|
1058
|
+
field_fac = 0.0
|
1059
|
+
end
|
1060
|
+
else
|
1061
|
+
field_fac = 1.0
|
1062
|
+
end
|
1063
|
+
|
1050
1064
|
#raise "Periodicity not satisfied: #{(2*Math::PI/deltorphi+1.0e-8)%1.0}, #{(2*Math::PI/deltorphi+1.0e-5)}" unless ((2*Math::PI/deltorphi)+1.0e-8)%1.0 < 1.0e-5
|
1051
1065
|
m1 = (torphi1 )%deltorphi
|
1052
1066
|
m2 = (torphi2 )%deltorphi
|
1053
|
-
m3 = (
|
1067
|
+
m3 = (torphiactual)%deltorphi
|
1054
1068
|
#bracketed = ((m1-m3).abs < 1.0e-4) || (
|
1055
1069
|
#(m2-m3.abs) > 1.0e-4 &&
|
1056
1070
|
#(m2 - m3) *
|
@@ -1114,7 +1128,7 @@ module GraphKits
|
|
1114
1128
|
#ep ['bracketed', i, j, k]
|
1115
1129
|
#ep ['field', field[i,j,k]]
|
1116
1130
|
#new_phi[j,k] = theta_vec[k]
|
1117
|
-
new_field[j,k] = field[i,j,k] * (1-dfac) + field[(i+1)%shp[0],j,k] * dfac
|
1131
|
+
new_field[j,k] = (field[i,j,k] * (1-dfac) + field[(i+1)%shp[0],j,k] * dfac) * field_fac
|
1118
1132
|
#raise "Mismatched radii" unless
|
1119
1133
|
#new_X[j,k] = cyls[0,i,j,k] * Math.cos(cyls[2,i,j,k])
|
1120
1134
|
#new_X[j,k] = x_vec[j]
|
metadata
CHANGED
@@ -1,7 +1,8 @@
|
|
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.35
|
5
|
+
prerelease:
|
5
6
|
platform: ruby
|
6
7
|
authors:
|
7
8
|
- Edmund Highcock
|
@@ -9,106 +10,85 @@ authors:
|
|
9
10
|
autorequire:
|
10
11
|
bindir: bin
|
11
12
|
cert_chain: []
|
12
|
-
date: 2014-03-
|
13
|
+
date: 2014-03-20 00:00:00.000000000 Z
|
13
14
|
dependencies:
|
14
15
|
- !ruby/object:Gem::Dependency
|
15
16
|
name: coderunner
|
16
|
-
requirement: !ruby/object:Gem::Requirement
|
17
|
+
requirement: &10662240 !ruby/object:Gem::Requirement
|
18
|
+
none: false
|
17
19
|
requirements:
|
18
|
-
- -
|
20
|
+
- - ! '>='
|
19
21
|
- !ruby/object:Gem::Version
|
20
22
|
version: 0.14.10
|
21
23
|
type: :runtime
|
22
24
|
prerelease: false
|
23
|
-
version_requirements:
|
24
|
-
requirements:
|
25
|
-
- - ">="
|
26
|
-
- !ruby/object:Gem::Version
|
27
|
-
version: 0.14.10
|
25
|
+
version_requirements: *10662240
|
28
26
|
- !ruby/object:Gem::Dependency
|
29
27
|
name: rubyhacks
|
30
|
-
requirement: !ruby/object:Gem::Requirement
|
28
|
+
requirement: &10281960 !ruby/object:Gem::Requirement
|
29
|
+
none: false
|
31
30
|
requirements:
|
32
|
-
- -
|
31
|
+
- - ! '>='
|
33
32
|
- !ruby/object:Gem::Version
|
34
33
|
version: 0.1.2
|
35
34
|
type: :runtime
|
36
35
|
prerelease: false
|
37
|
-
version_requirements:
|
38
|
-
requirements:
|
39
|
-
- - ">="
|
40
|
-
- !ruby/object:Gem::Version
|
41
|
-
version: 0.1.2
|
36
|
+
version_requirements: *10281960
|
42
37
|
- !ruby/object:Gem::Dependency
|
43
38
|
name: ruby-netcdf-updated
|
44
|
-
requirement: !ruby/object:Gem::Requirement
|
39
|
+
requirement: &10281020 !ruby/object:Gem::Requirement
|
40
|
+
none: false
|
45
41
|
requirements:
|
46
|
-
- -
|
42
|
+
- - ! '>='
|
47
43
|
- !ruby/object:Gem::Version
|
48
44
|
version: 0.6.6.1
|
49
45
|
type: :runtime
|
50
46
|
prerelease: false
|
51
|
-
version_requirements:
|
52
|
-
requirements:
|
53
|
-
- - ">="
|
54
|
-
- !ruby/object:Gem::Version
|
55
|
-
version: 0.6.6.1
|
47
|
+
version_requirements: *10281020
|
56
48
|
- !ruby/object:Gem::Dependency
|
57
49
|
name: shoulda
|
58
|
-
requirement: !ruby/object:Gem::Requirement
|
50
|
+
requirement: &10280180 !ruby/object:Gem::Requirement
|
51
|
+
none: false
|
59
52
|
requirements:
|
60
|
-
- -
|
53
|
+
- - ! '>='
|
61
54
|
- !ruby/object:Gem::Version
|
62
55
|
version: '0'
|
63
56
|
type: :development
|
64
57
|
prerelease: false
|
65
|
-
version_requirements:
|
66
|
-
requirements:
|
67
|
-
- - ">="
|
68
|
-
- !ruby/object:Gem::Version
|
69
|
-
version: '0'
|
58
|
+
version_requirements: *10280180
|
70
59
|
- !ruby/object:Gem::Dependency
|
71
60
|
name: rdoc
|
72
|
-
requirement: !ruby/object:Gem::Requirement
|
61
|
+
requirement: &10279640 !ruby/object:Gem::Requirement
|
62
|
+
none: false
|
73
63
|
requirements:
|
74
|
-
- -
|
64
|
+
- - ~>
|
75
65
|
- !ruby/object:Gem::Version
|
76
66
|
version: '3.12'
|
77
67
|
type: :development
|
78
68
|
prerelease: false
|
79
|
-
version_requirements:
|
80
|
-
requirements:
|
81
|
-
- - "~>"
|
82
|
-
- !ruby/object:Gem::Version
|
83
|
-
version: '3.12'
|
69
|
+
version_requirements: *10279640
|
84
70
|
- !ruby/object:Gem::Dependency
|
85
71
|
name: bundler
|
86
|
-
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirement: &10279000 !ruby/object:Gem::Requirement
|
73
|
+
none: false
|
87
74
|
requirements:
|
88
|
-
- -
|
75
|
+
- - ! '>'
|
89
76
|
- !ruby/object:Gem::Version
|
90
77
|
version: 1.0.0
|
91
78
|
type: :development
|
92
79
|
prerelease: false
|
93
|
-
version_requirements:
|
94
|
-
requirements:
|
95
|
-
- - ">"
|
96
|
-
- !ruby/object:Gem::Version
|
97
|
-
version: 1.0.0
|
80
|
+
version_requirements: *10279000
|
98
81
|
- !ruby/object:Gem::Dependency
|
99
82
|
name: jeweler
|
100
|
-
requirement: !ruby/object:Gem::Requirement
|
83
|
+
requirement: &10278300 !ruby/object:Gem::Requirement
|
84
|
+
none: false
|
101
85
|
requirements:
|
102
|
-
- -
|
86
|
+
- - ! '>='
|
103
87
|
- !ruby/object:Gem::Version
|
104
88
|
version: 1.8.4
|
105
89
|
type: :development
|
106
90
|
prerelease: false
|
107
|
-
version_requirements:
|
108
|
-
requirements:
|
109
|
-
- - ">="
|
110
|
-
- !ruby/object:Gem::Version
|
111
|
-
version: 1.8.4
|
91
|
+
version_requirements: *10278300
|
112
92
|
description: GS2 is a gyrokinetic flux tube initial value turbulence code which can
|
113
93
|
be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated
|
114
94
|
running and analysis of large simulations. This module allows GS2 (and its sister
|
@@ -122,7 +102,7 @@ extra_rdoc_files:
|
|
122
102
|
- README.md
|
123
103
|
- README.rdoc
|
124
104
|
files:
|
125
|
-
-
|
105
|
+
- .document
|
126
106
|
- Gemfile
|
127
107
|
- LICENSE.txt
|
128
108
|
- README.md
|
@@ -185,25 +165,26 @@ files:
|
|
185
165
|
homepage: http://gs2crmod.sourceforge.net
|
186
166
|
licenses:
|
187
167
|
- GSLv3
|
188
|
-
metadata: {}
|
189
168
|
post_install_message:
|
190
169
|
rdoc_options: []
|
191
170
|
require_paths:
|
192
171
|
- lib
|
193
172
|
required_ruby_version: !ruby/object:Gem::Requirement
|
173
|
+
none: false
|
194
174
|
requirements:
|
195
|
-
- -
|
175
|
+
- - ! '>='
|
196
176
|
- !ruby/object:Gem::Version
|
197
177
|
version: 1.9.1
|
198
178
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
179
|
+
none: false
|
199
180
|
requirements:
|
200
|
-
- -
|
181
|
+
- - ! '>='
|
201
182
|
- !ruby/object:Gem::Version
|
202
183
|
version: '0'
|
203
184
|
requirements: []
|
204
185
|
rubyforge_project:
|
205
|
-
rubygems_version:
|
186
|
+
rubygems_version: 1.8.11
|
206
187
|
signing_key:
|
207
|
-
specification_version:
|
188
|
+
specification_version: 3
|
208
189
|
summary: Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes.
|
209
190
|
test_files: []
|
checksums.yaml
DELETED
@@ -1,7 +0,0 @@
|
|
1
|
-
---
|
2
|
-
SHA1:
|
3
|
-
metadata.gz: db1322197e20ae4f7372ca099fa31d360a6eade2
|
4
|
-
data.tar.gz: 62ea55f2c89c27bf0a16d5093535a4ee9c03be62
|
5
|
-
SHA512:
|
6
|
-
metadata.gz: ac64f07edc42a2ea5a66b9fabd6900c2ad0b2260df00e4dc523bb6fad9a71d4b1c734d48c648056499b530b048cb835a4982fe4f3728bac9ea1f865b20f7fa16
|
7
|
-
data.tar.gz: 09ecf4628eaac231583b7a4003212b7bb02855e0b6dd9b9e54c6865ad93349d9f8fb857611ed31e880a7439924c442264e974aaf7f53a663d0805f8ca3436ccb
|