gs2crmod 0.11.48 → 0.11.49

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 (6) hide show
  1. checksums.yaml +7 -0
  2. data/Gemfile +1 -1
  3. data/VERSION +1 -1
  4. data/gs2crmod.gemspec +10 -8
  5. data/lib/gs2crmod/gs2.rb +3 -3
  6. metadata +58 -39
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 5636709ad99508c1afcf2a8d471faa1c4a559085
4
+ data.tar.gz: 24c8a3b935da6132655a214a1d438237d4065c98
5
+ SHA512:
6
+ metadata.gz: 1d422b79733e85ada9d6acc3e540e159e0424354a4fc560ee7c619b0ae416c9d7afb0db8700db6725219f5eed3b10a5baeb38206e4bae4f9928a392176e1bbf4
7
+ data.tar.gz: 4b3f0355c498f53bd0448d1d92c3dbb929c5fc6967ffeca1bcb447ab767fbbc07d9a3a7d0cc9d94300561d74cd93d919158476fe4ad970933f1fc910fdf9b8ce
data/Gemfile CHANGED
@@ -1,7 +1,7 @@
1
1
  source "http://rubygems.org"
2
2
  # Add dependencies required to use your gem here.
3
3
  # Example:
4
- gem "coderunner", ">= 0.14.10"
4
+ gem "coderunner", ">= 0.14.15"
5
5
  gem "rubyhacks", ">= 0.1.2"
6
6
  # It seems necessary to have the following line un-commented on some systems but commented out on other systems:
7
7
  gem "ruby-netcdf-updated", ">= 0.6.6.1"
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.11.48
1
+ 0.11.49
data/gs2crmod.gemspec CHANGED
@@ -2,14 +2,17 @@
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.49 ruby lib
6
+ # stub: ext/extconf.rb
5
7
 
6
8
  Gem::Specification.new do |s|
7
9
  s.name = "gs2crmod"
8
- s.version = "0.11.48"
10
+ s.version = "0.11.49"
9
11
 
10
12
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
13
+ s.require_paths = ["lib"]
11
14
  s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
12
- s.date = "2014-04-07"
15
+ s.date = "2014-04-10"
13
16
  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."
14
17
  s.email = "edmundhighcock@sourceforge.net"
15
18
  s.extensions = ["ext/extconf.rb"]
@@ -82,16 +85,15 @@ Gem::Specification.new do |s|
82
85
  ]
83
86
  s.homepage = "http://gs2crmod.sourceforge.net"
84
87
  s.licenses = ["GSLv3"]
85
- s.require_paths = ["lib"]
86
88
  s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
87
- s.rubygems_version = "1.8.11"
89
+ s.rubygems_version = "2.2.2"
88
90
  s.summary = "Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes."
89
91
 
90
92
  if s.respond_to? :specification_version then
91
- s.specification_version = 3
93
+ s.specification_version = 4
92
94
 
93
95
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
94
- s.add_runtime_dependency(%q<coderunner>, [">= 0.14.10"])
96
+ s.add_runtime_dependency(%q<coderunner>, [">= 0.14.15"])
95
97
  s.add_runtime_dependency(%q<rubyhacks>, [">= 0.1.2"])
96
98
  s.add_runtime_dependency(%q<ruby-netcdf-updated>, [">= 0.6.6.1"])
97
99
  s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -99,7 +101,7 @@ Gem::Specification.new do |s|
99
101
  s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
100
102
  s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
101
103
  else
102
- s.add_dependency(%q<coderunner>, [">= 0.14.10"])
104
+ s.add_dependency(%q<coderunner>, [">= 0.14.15"])
103
105
  s.add_dependency(%q<rubyhacks>, [">= 0.1.2"])
104
106
  s.add_dependency(%q<ruby-netcdf-updated>, [">= 0.6.6.1"])
105
107
  s.add_dependency(%q<shoulda>, [">= 0"])
@@ -108,7 +110,7 @@ Gem::Specification.new do |s|
108
110
  s.add_dependency(%q<jeweler>, [">= 1.8.4"])
109
111
  end
110
112
  else
111
- s.add_dependency(%q<coderunner>, [">= 0.14.10"])
113
+ s.add_dependency(%q<coderunner>, [">= 0.14.15"])
112
114
  s.add_dependency(%q<rubyhacks>, [">= 0.1.2"])
113
115
  s.add_dependency(%q<ruby-netcdf-updated>, [">= 0.6.6.1"])
114
116
  s.add_dependency(%q<shoulda>, [">= 0"])
data/lib/gs2crmod/gs2.rb CHANGED
@@ -539,7 +539,7 @@ def restart(new_run)
539
539
  # ep @runner.parameters
540
540
  new_run.run_name = nil
541
541
  new_run.naming_pars = @naming_pars
542
- new_run.update_submission_parameters(new_run.parameter_hash.inspect, false) if new_run.parameter_hash
542
+ new_run.update_submission_parameters(new_run.parameter_hash_string, false) if new_run.parameter_hash
543
543
  new_run.naming_pars.delete(:restart_id)
544
544
  new_run.generate_run_name
545
545
  eputs 'Copying Restart files', ''
@@ -795,9 +795,9 @@ end
795
795
  def generate_input_file(&block)
796
796
  raise CRFatal("No Input Module File Given or Module Corrupted") unless methods.include? (:input_file_text)
797
797
  run_namelist_backwards_compatibility
798
- if @restart_id and not @is_a_restart # The second test checks that the restart function has not been called manually earlier (e.g. in Trinity)
798
+ if @restart_id and (not @is_a_restart or @resubmit_id) # The second test checks that the restart function has not been called manually earlier (e.g. in Trinity), but we must check that it is not in fact a resubmitted run
799
799
  @runner.run_list[@restart_id].restart(self)
800
- elsif @save_for_restart and @save_for_restart.fortran_true? and not @is_a_restart
800
+ elsif @save_for_restart and @save_for_restart.fortran_true? and (not @is_a_restart or @resubmit_id)
801
801
  @restart_dir = "nc"
802
802
  #if CODE_OPTIONS[:gs2] and CODE_OPTIONS[:gs2][:list]
803
803
  #FileUtils.makedirs "#{@runner.root_folder}/#@restart_dir"
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gs2crmod
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.48
5
- prerelease:
4
+ version: 0.11.49
6
5
  platform: ruby
7
6
  authors:
8
7
  - Edmund Highcock
@@ -10,85 +9,106 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2014-04-07 00:00:00.000000000 Z
12
+ date: 2014-04-10 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: coderunner
17
- requirement: &10539420 !ruby/object:Gem::Requirement
18
- none: false
16
+ requirement: !ruby/object:Gem::Requirement
19
17
  requirements:
20
- - - ! '>='
18
+ - - ">="
21
19
  - !ruby/object:Gem::Version
22
- version: 0.14.10
20
+ version: 0.14.15
23
21
  type: :runtime
24
22
  prerelease: false
25
- version_requirements: *10539420
23
+ version_requirements: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - ">="
26
+ - !ruby/object:Gem::Version
27
+ version: 0.14.15
26
28
  - !ruby/object:Gem::Dependency
27
29
  name: rubyhacks
28
- requirement: &10538800 !ruby/object:Gem::Requirement
29
- none: false
30
+ requirement: !ruby/object:Gem::Requirement
30
31
  requirements:
31
- - - ! '>='
32
+ - - ">="
32
33
  - !ruby/object:Gem::Version
33
34
  version: 0.1.2
34
35
  type: :runtime
35
36
  prerelease: false
36
- version_requirements: *10538800
37
+ version_requirements: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ">="
40
+ - !ruby/object:Gem::Version
41
+ version: 0.1.2
37
42
  - !ruby/object:Gem::Dependency
38
43
  name: ruby-netcdf-updated
39
- requirement: &10537300 !ruby/object:Gem::Requirement
40
- none: false
44
+ requirement: !ruby/object:Gem::Requirement
41
45
  requirements:
42
- - - ! '>='
46
+ - - ">="
43
47
  - !ruby/object:Gem::Version
44
48
  version: 0.6.6.1
45
49
  type: :runtime
46
50
  prerelease: false
47
- version_requirements: *10537300
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ">="
54
+ - !ruby/object:Gem::Version
55
+ version: 0.6.6.1
48
56
  - !ruby/object:Gem::Dependency
49
57
  name: shoulda
50
- requirement: &10535820 !ruby/object:Gem::Requirement
51
- none: false
58
+ requirement: !ruby/object:Gem::Requirement
52
59
  requirements:
53
- - - ! '>='
60
+ - - ">="
54
61
  - !ruby/object:Gem::Version
55
62
  version: '0'
56
63
  type: :development
57
64
  prerelease: false
58
- version_requirements: *10535820
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
59
70
  - !ruby/object:Gem::Dependency
60
71
  name: rdoc
61
- requirement: &10550520 !ruby/object:Gem::Requirement
62
- none: false
72
+ requirement: !ruby/object:Gem::Requirement
63
73
  requirements:
64
- - - ~>
74
+ - - "~>"
65
75
  - !ruby/object:Gem::Version
66
76
  version: '3.12'
67
77
  type: :development
68
78
  prerelease: false
69
- version_requirements: *10550520
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: '3.12'
70
84
  - !ruby/object:Gem::Dependency
71
85
  name: bundler
72
- requirement: &10548440 !ruby/object:Gem::Requirement
73
- none: false
86
+ requirement: !ruby/object:Gem::Requirement
74
87
  requirements:
75
- - - ! '>'
88
+ - - ">"
76
89
  - !ruby/object:Gem::Version
77
90
  version: 1.0.0
78
91
  type: :development
79
92
  prerelease: false
80
- version_requirements: *10548440
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - ">"
96
+ - !ruby/object:Gem::Version
97
+ version: 1.0.0
81
98
  - !ruby/object:Gem::Dependency
82
99
  name: jeweler
83
- requirement: &10547460 !ruby/object:Gem::Requirement
84
- none: false
100
+ requirement: !ruby/object:Gem::Requirement
85
101
  requirements:
86
- - - ! '>='
102
+ - - ">="
87
103
  - !ruby/object:Gem::Version
88
104
  version: 1.8.4
89
105
  type: :development
90
106
  prerelease: false
91
- version_requirements: *10547460
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - ">="
110
+ - !ruby/object:Gem::Version
111
+ version: 1.8.4
92
112
  description: GS2 is a gyrokinetic flux tube initial value turbulence code which can
93
113
  be used for fusion or astrophysical plasmas. CodeRunner is a framework for the automated
94
114
  running and analysis of large simulations. This module allows GS2 (and its sister
@@ -102,7 +122,7 @@ extra_rdoc_files:
102
122
  - README.md
103
123
  - README.rdoc
104
124
  files:
105
- - .document
125
+ - ".document"
106
126
  - Gemfile
107
127
  - LICENSE.txt
108
128
  - README.md
@@ -165,26 +185,25 @@ files:
165
185
  homepage: http://gs2crmod.sourceforge.net
166
186
  licenses:
167
187
  - GSLv3
188
+ metadata: {}
168
189
  post_install_message:
169
190
  rdoc_options: []
170
191
  require_paths:
171
192
  - lib
172
193
  required_ruby_version: !ruby/object:Gem::Requirement
173
- none: false
174
194
  requirements:
175
- - - ! '>='
195
+ - - ">="
176
196
  - !ruby/object:Gem::Version
177
197
  version: 1.9.1
178
198
  required_rubygems_version: !ruby/object:Gem::Requirement
179
- none: false
180
199
  requirements:
181
- - - ! '>='
200
+ - - ">="
182
201
  - !ruby/object:Gem::Version
183
202
  version: '0'
184
203
  requirements: []
185
204
  rubyforge_project:
186
- rubygems_version: 1.8.11
205
+ rubygems_version: 2.2.2
187
206
  signing_key:
188
- specification_version: 3
207
+ specification_version: 4
189
208
  summary: Module to allow CodeRunner to run and analyse the GS2 and AstroGK codes.
190
209
  test_files: []