gs2crmod 0.11.29 → 0.11.30

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.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/ext/gs2crmod_ext.c +6 -0
  3. data/gs2crmod.gemspec +4 -6
  4. metadata +37 -56
  5. checksums.yaml +0 -7
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.11.29
1
+ 0.11.30
data/ext/gs2crmod_ext.c CHANGED
@@ -439,6 +439,7 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
439
439
  VALUE test_proc = rb_eval_string("Proc.new {|options| case options[:correlation_type]; when 'perp'; 0; when 'par'; 1; when 'time'; 2; when 'full'; 3 ;else; raise 'Please specify correlation_type as a string (perp/par/time/full)'; end}");
440
440
  int corr_type = FIX2INT(RFCALL_11_ON(test_proc, "call", options));
441
441
 
442
+ printf("Reading in data\n");
442
443
  for(it=0; it<t_size; it++)
443
444
  {
444
445
  /*options[:t_index] = it+1*/
@@ -489,6 +490,7 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
489
490
 
490
491
 
491
492
 
493
+ printf("Interpolating\n");
492
494
  /******************************
493
495
  * GSL Interpolation of *
494
496
  * field in time *
@@ -661,8 +663,12 @@ VALUE gs2crmod_tensor_field_correlation_gsl_tensor(VALUE self, VALUE options)
661
663
  break;
662
664
  }
663
665
 
666
+ printf("Main calculation loop\n\n");
664
667
  //Start main loop for correlation function calculation
665
668
  for(i1=0; i1<tot_size; i1+=nt_reg){
669
+ printf("\33[2K\r"); //Clear line in terminal
670
+ printf("\33[1A"); //Go back one line in terminal
671
+ printf("main loop iterator = %ld of %ld\n", i1/nt_reg, tot_size/nt_reg);
666
672
  for(i2=i1; i2<tot_size; i2+=nt_reg)
667
673
  {
668
674
  //Calculate spatial and temporal separation
data/gs2crmod.gemspec CHANGED
@@ -2,15 +2,12 @@
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.29 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.29"
8
+ s.version = "0.11.30"
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
12
  s.date = "2014-03-18"
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."
@@ -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 = "2.2.1"
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 = 4
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"])
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.29
4
+ version: 0.11.30
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Edmund Highcock
@@ -13,102 +14,81 @@ date: 2014-03-18 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: &10642060 !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: !ruby/object:Gem::Requirement
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- version: 0.14.10
25
+ version_requirements: *10642060
28
26
  - !ruby/object:Gem::Dependency
29
27
  name: rubyhacks
30
- requirement: !ruby/object:Gem::Requirement
28
+ requirement: &10641380 !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: !ruby/object:Gem::Requirement
38
- requirements:
39
- - - ">="
40
- - !ruby/object:Gem::Version
41
- version: 0.1.2
36
+ version_requirements: *10641380
42
37
  - !ruby/object:Gem::Dependency
43
38
  name: ruby-netcdf-updated
44
- requirement: !ruby/object:Gem::Requirement
39
+ requirement: &10640580 !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: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - ">="
54
- - !ruby/object:Gem::Version
55
- version: 0.6.6.1
47
+ version_requirements: *10640580
56
48
  - !ruby/object:Gem::Dependency
57
49
  name: shoulda
58
- requirement: !ruby/object:Gem::Requirement
50
+ requirement: &10639420 !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: !ruby/object:Gem::Requirement
66
- requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- version: '0'
58
+ version_requirements: *10639420
70
59
  - !ruby/object:Gem::Dependency
71
60
  name: rdoc
72
- requirement: !ruby/object:Gem::Requirement
61
+ requirement: &10638840 !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: !ruby/object:Gem::Requirement
80
- requirements:
81
- - - "~>"
82
- - !ruby/object:Gem::Version
83
- version: '3.12'
69
+ version_requirements: *10638840
84
70
  - !ruby/object:Gem::Dependency
85
71
  name: bundler
86
- requirement: !ruby/object:Gem::Requirement
72
+ requirement: &10637920 !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: !ruby/object:Gem::Requirement
94
- requirements:
95
- - - ">"
96
- - !ruby/object:Gem::Version
97
- version: 1.0.0
80
+ version_requirements: *10637920
98
81
  - !ruby/object:Gem::Dependency
99
82
  name: jeweler
100
- requirement: !ruby/object:Gem::Requirement
83
+ requirement: &10636960 !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: !ruby/object:Gem::Requirement
108
- requirements:
109
- - - ">="
110
- - !ruby/object:Gem::Version
111
- version: 1.8.4
91
+ version_requirements: *10636960
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
- - ".document"
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: 2.2.1
186
+ rubygems_version: 1.8.11
206
187
  signing_key:
207
- specification_version: 4
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: 9fc845a7af975cc8918d33678677d6a9daf3b3fe
4
- data.tar.gz: 5911a0644a0aae45ee429a1f9b3370b5692629b7
5
- SHA512:
6
- metadata.gz: 9942d199a0ad3c657e0e5b5b80e4564a86aa0b85c3b13e0fe47475602027796ec2bbb5c6dcc74d30238e8d874a19e372e17e971c76e88fbec55ba68ba1f73f93
7
- data.tar.gz: 1d16ca5efe84d2cc3fa3b9f4da55201416f70a80ab428d94ad13554bbca2234084ad6fcc2f6eb44626553ce232fdbf365e50311527fea92ae0d13058a8e3ad58