gs2crmod 0.11.63 → 0.11.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.11.63
1
+ 0.11.64
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.63 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.63"
8
+ s.version = "0.11.64"
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-08-20"
12
+ s.date = "2014-09-02"
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"]
@@ -78,12 +75,13 @@ Gem::Specification.new do |s|
78
75
  ]
79
76
  s.homepage = "http://gs2crmod.sourceforge.net"
80
77
  s.licenses = ["GSLv3"]
78
+ s.require_paths = ["lib"]
81
79
  s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
82
- s.rubygems_version = "2.2.2"
80
+ s.rubygems_version = "1.8.23"
83
81
  s.summary = "Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes."
84
82
 
85
83
  if s.respond_to? :specification_version then
86
- s.specification_version = 4
84
+ s.specification_version = 3
87
85
 
88
86
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
89
87
  s.add_runtime_dependency(%q<coderunner>, [">= 0.14.15"])
@@ -22,6 +22,7 @@ def calculate_time_averaged_fluxes
22
22
  return unless FileTest.exist?(netcdf_filename)
23
23
  @hflux_tot_stav = saturated_time_average('hflux_tot_over_time', {})
24
24
  @hflux_tot_stav_error = saturated_time_average_error('hflux_tot_over_time', {})
25
+ @hflux_tot_stav_std_dev = saturated_time_average_std_dev('hflux_tot_over_time', {})
25
26
  @phi2_tot_stav = saturated_time_average('phi2tot_over_time', {})
26
27
  #@par_mom_flux_stav = saturated_time_average('par_mom_flux_over_time', {}) rescue nil
27
28
  #@perp_mom_flux_stav = saturated_time_average('perp_mom_flux_over_time', {}) rescue nil
@@ -99,6 +100,18 @@ def saturated_time_average_error(name, options)
99
100
  return tavg.sd
100
101
  end
101
102
 
103
+ def saturated_time_average_std_dev(name, options)
104
+ # calculate_saturation_time_index unless @saturation_time_index
105
+ options[:t_index_window] = [@saturation_time_index, list(:t).keys.max]
106
+ begin
107
+ vec = gsl_vector(name, options)
108
+ rescue NoMethodError
109
+ eputs "Warning: could not calculate #{name} saturated_time_average_std_dev"
110
+ return nil
111
+ end
112
+ return vec.sd
113
+ end
114
+
102
115
 
103
116
  # I.e. the time at which the primary modes are saturated and the fluxes settle around a long term average.
104
117
 
data/lib/gs2crmod/gs2.rb CHANGED
@@ -154,6 +154,7 @@ eval(%[
154
154
  :es_heat_flux_stav,
155
155
  :es_mom_flux_stav,
156
156
  :hflux_tot_stav_error,
157
+ :hflux_tot_stav_std_dev,
157
158
  :es_heat_flux_stav_error,
158
159
  :es_mom_flux_stav_error,
159
160
  :saturated,
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.63
4
+ version: 0.11.64
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Edmund Highcock
@@ -9,53 +10,60 @@ authors:
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2014-08-20 00:00:00.000000000 Z
13
+ date: 2014-09-02 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: coderunner
16
17
  requirement: !ruby/object:Gem::Requirement
18
+ none: false
17
19
  requirements:
18
- - - ">="
20
+ - - ! '>='
19
21
  - !ruby/object:Gem::Version
20
22
  version: 0.14.15
21
23
  type: :runtime
22
24
  prerelease: false
23
25
  version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
24
27
  requirements:
25
- - - ">="
28
+ - - ! '>='
26
29
  - !ruby/object:Gem::Version
27
30
  version: 0.14.15
28
31
  - !ruby/object:Gem::Dependency
29
32
  name: rubyhacks
30
33
  requirement: !ruby/object:Gem::Requirement
34
+ none: false
31
35
  requirements:
32
- - - ">="
36
+ - - ! '>='
33
37
  - !ruby/object:Gem::Version
34
38
  version: 0.1.2
35
39
  type: :runtime
36
40
  prerelease: false
37
41
  version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
38
43
  requirements:
39
- - - ">="
44
+ - - ! '>='
40
45
  - !ruby/object:Gem::Version
41
46
  version: 0.1.2
42
47
  - !ruby/object:Gem::Dependency
43
48
  name: ruby-netcdf-updated
44
49
  requirement: !ruby/object:Gem::Requirement
50
+ none: false
45
51
  requirements:
46
- - - ">="
52
+ - - ! '>='
47
53
  - !ruby/object:Gem::Version
48
54
  version: 0.6.6.1
49
55
  type: :runtime
50
56
  prerelease: false
51
57
  version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
52
59
  requirements:
53
- - - ">="
60
+ - - ! '>='
54
61
  - !ruby/object:Gem::Version
55
62
  version: 0.6.6.1
56
63
  - !ruby/object:Gem::Dependency
57
64
  name: shoulda
58
65
  requirement: !ruby/object:Gem::Requirement
66
+ none: false
59
67
  requirements:
60
68
  - - '='
61
69
  - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
63
71
  type: :development
64
72
  prerelease: false
65
73
  version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
66
75
  requirements:
67
76
  - - '='
68
77
  - !ruby/object:Gem::Version
@@ -70,57 +79,65 @@ dependencies:
70
79
  - !ruby/object:Gem::Dependency
71
80
  name: rdoc
72
81
  requirement: !ruby/object:Gem::Requirement
82
+ none: false
73
83
  requirements:
74
- - - "~>"
84
+ - - ~>
75
85
  - !ruby/object:Gem::Version
76
86
  version: '3.12'
77
87
  type: :development
78
88
  prerelease: false
79
89
  version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
80
91
  requirements:
81
- - - "~>"
92
+ - - ~>
82
93
  - !ruby/object:Gem::Version
83
94
  version: '3.12'
84
95
  - !ruby/object:Gem::Dependency
85
96
  name: bundler
86
97
  requirement: !ruby/object:Gem::Requirement
98
+ none: false
87
99
  requirements:
88
- - - ">"
100
+ - - ! '>'
89
101
  - !ruby/object:Gem::Version
90
102
  version: 1.0.0
91
103
  type: :development
92
104
  prerelease: false
93
105
  version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
94
107
  requirements:
95
- - - ">"
108
+ - - ! '>'
96
109
  - !ruby/object:Gem::Version
97
110
  version: 1.0.0
98
111
  - !ruby/object:Gem::Dependency
99
112
  name: jeweler
100
113
  requirement: !ruby/object:Gem::Requirement
114
+ none: false
101
115
  requirements:
102
- - - ">="
116
+ - - ! '>='
103
117
  - !ruby/object:Gem::Version
104
118
  version: 1.8.4
105
119
  type: :development
106
120
  prerelease: false
107
121
  version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
108
123
  requirements:
109
- - - ">="
124
+ - - ! '>='
110
125
  - !ruby/object:Gem::Version
111
126
  version: 1.8.4
112
127
  - !ruby/object:Gem::Dependency
113
128
  name: minitest
114
129
  requirement: !ruby/object:Gem::Requirement
130
+ none: false
115
131
  requirements:
116
- - - "~>"
132
+ - - ~>
117
133
  - !ruby/object:Gem::Version
118
134
  version: '4'
119
135
  type: :development
120
136
  prerelease: false
121
137
  version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
122
139
  requirements:
123
- - - "~>"
140
+ - - ~>
124
141
  - !ruby/object:Gem::Version
125
142
  version: '4'
126
143
  description: GS2 is a gyrokinetic flux tube initial value turbulence code which can
@@ -136,7 +153,7 @@ extra_rdoc_files:
136
153
  - README.md
137
154
  - README.rdoc
138
155
  files:
139
- - ".document"
156
+ - .document
140
157
  - Gemfile
141
158
  - LICENSE.txt
142
159
  - README.md
@@ -192,25 +209,26 @@ files:
192
209
  homepage: http://gs2crmod.sourceforge.net
193
210
  licenses:
194
211
  - GSLv3
195
- metadata: {}
196
212
  post_install_message:
197
213
  rdoc_options: []
198
214
  require_paths:
199
215
  - lib
200
216
  required_ruby_version: !ruby/object:Gem::Requirement
217
+ none: false
201
218
  requirements:
202
- - - ">="
219
+ - - ! '>='
203
220
  - !ruby/object:Gem::Version
204
221
  version: 1.9.1
205
222
  required_rubygems_version: !ruby/object:Gem::Requirement
223
+ none: false
206
224
  requirements:
207
- - - ">="
225
+ - - ! '>='
208
226
  - !ruby/object:Gem::Version
209
227
  version: '0'
210
228
  requirements: []
211
229
  rubyforge_project:
212
- rubygems_version: 2.2.2
230
+ rubygems_version: 1.8.23
213
231
  signing_key:
214
- specification_version: 4
232
+ specification_version: 3
215
233
  summary: Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes.
216
234
  test_files: []
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: ddaa61d72b2d1dcf26128b678e6a17cedc7f02cc
4
- data.tar.gz: 80791165d172541b8a29c9e9503437aac7d08360
5
- SHA512:
6
- metadata.gz: 4e2fb0cf29cb64957cd086cdc72d178d10b9fad03ff41b6626bf04991c42aa6b8b2b84954924f23bd1eea05cbc92312d03dfc48acc62eb413c688e407c45bfb7
7
- data.tar.gz: 368f7db4d2076ac5d38305dea6996475db6a7ce23b856e7f50b8b053f6b7b5cfd7618d13cf241b55eeca68acdde658847ab5cb9cca840055648b17d464e5c71f