trinitycrmod 0.5.3 → 0.5.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +8 -3
- data/VERSION +1 -1
- data/lib/trinitycrmod/trinity.rb +25 -20
- data/lib/trinitycrmod/trinity_gs2.rb +21 -0
- data/trinitycrmod.gemspec +15 -12
- metadata +24 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 77964126d573cc9049d3cbd59d288bea65caa039
|
4
|
+
data.tar.gz: fc8023b31db6fd017ddc5a5c3a4a19eab94a748e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0396359b0204b2a96ee73ee5cd646cc99e6fa5ad052c2d278f5c3c57973de3dc5733de653aa389704a78abd771743e8bdcbf29667834e17f7e6b54661cfe9c68
|
7
|
+
data.tar.gz: 1d4e5185c2f5bb5a6b40af491908aa80af4d19c0c05af1a436c95d807610d719d80963f909696fe1ff69b4df0b7640d282390fff7577fb3cb7003a5662ee14db
|
data/Gemfile
CHANGED
@@ -3,13 +3,18 @@ source "http://rubygems.org"
|
|
3
3
|
# Example:
|
4
4
|
gem "coderunner", ">= 0.15.5"
|
5
5
|
gem "text-data-tools", ">= 1.1.3"
|
6
|
-
gem "gs2crmod", ">=0.11.
|
6
|
+
gem "gs2crmod", ">=0.11.76"
|
7
7
|
|
8
8
|
# Add dependencies to develop your gem here.
|
9
9
|
# Include everything needed to run rake, tests, features, etc.
|
10
10
|
group :development do
|
11
|
-
gem "shoulda", ">= 0"
|
11
|
+
#gem "shoulda", ">= 0"
|
12
|
+
#gem "rdoc", "~> 3.12"
|
13
|
+
#gem "bundler", "> 1.0.0"
|
14
|
+
#gem "jeweler", ">= 2.0.0"
|
15
|
+
gem "shoulda", " 3.0.1"
|
12
16
|
gem "rdoc", "~> 3.12"
|
13
17
|
gem "bundler", "> 1.0.0"
|
14
|
-
gem "jeweler", ">=
|
18
|
+
gem "jeweler", ">= 1.8.4"
|
19
|
+
gem "minitest", "~> 4"
|
15
20
|
end
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.5.
|
1
|
+
0.5.4
|
data/lib/trinitycrmod/trinity.rb
CHANGED
@@ -133,15 +133,17 @@ class CodeRunner
|
|
133
133
|
if new_run.flux_option == "gs2" and @flux_option == "gs2" and not new_run.no_restart_gs2
|
134
134
|
for i in 0...n_flux_tubes
|
135
135
|
break if i >= new_run.n_flux_tubes
|
136
|
-
if i >= n_flux_tubes_jac
|
137
|
-
jn = i - n_flux_tubes_jac + 1
|
138
|
-
|
139
|
-
folder = "calibrate_#{jn}"
|
140
|
-
else
|
141
|
-
jn = i + 1
|
142
|
-
|
143
|
-
folder = "flux_tube_#{jn}"
|
144
|
-
end
|
136
|
+
#if i >= n_flux_tubes_jac
|
137
|
+
#jn = i - n_flux_tubes_jac + 1
|
138
|
+
##run_name = "calibrate_" + @run_name + (jn).to_s
|
139
|
+
#folder = "calibrate_#{jn}"
|
140
|
+
#else
|
141
|
+
#jn = i + 1
|
142
|
+
##run_name = @run_name + (jn).to_s
|
143
|
+
#folder = "flux_tube_#{jn}"
|
144
|
+
#end
|
145
|
+
#
|
146
|
+
folder = gs2_folder_name(i)
|
145
147
|
|
146
148
|
new_run.gs2_runs[i].directory = new_run.directory + "/#{folder}"
|
147
149
|
FileUtils.makedirs(new_run.gs2_runs[i].directory)
|
@@ -261,16 +263,19 @@ class CodeRunner
|
|
261
263
|
gs2run = gs2_runs[i]
|
262
264
|
#ep ['gs2_runs[i] in generate', gs2_runs[i].nwrite]
|
263
265
|
#p ['i',i]
|
264
|
-
if i >= n_flux_tubes_jac
|
265
|
-
jn = i - n_flux_tubes_jac + 1
|
266
|
-
run_name = "calibrate_" + @run_name + (jn).to_s
|
267
|
-
folder = "calibrate_#{jn}"
|
268
|
-
else
|
269
|
-
jn = i + 1
|
270
|
-
run_name = @run_name + (jn).to_s
|
271
|
-
folder = "flux_tube_#{jn}"
|
272
|
-
end
|
273
|
-
|
266
|
+
#if i >= n_flux_tubes_jac
|
267
|
+
#jn = i - n_flux_tubes_jac + 1
|
268
|
+
#run_name = "calibrate_" + @run_name + (jn).to_s
|
269
|
+
#folder = "calibrate_#{jn}"
|
270
|
+
#else
|
271
|
+
#jn = i + 1
|
272
|
+
#run_name = @run_name + (jn).to_s
|
273
|
+
#folder = "flux_tube_#{jn}"
|
274
|
+
#end
|
275
|
+
|
276
|
+
folder = gs2_folder_name(i)
|
277
|
+
run_name = gs2_run_name(i)
|
278
|
+
|
274
279
|
if @subfolders and @subfolders.fortran_true?
|
275
280
|
gs2run.directory = @directory + "/" + folder
|
276
281
|
FileUtils.makedirs(gs2run.directory)
|
@@ -363,7 +368,7 @@ class CodeRunner
|
|
363
368
|
#component.status = @status
|
364
369
|
#p ["HERE2", @component_runs.size, @component_runs[i]]
|
365
370
|
#Dir.chdir(@directory) {
|
366
|
-
compdir = "flux_tube_#{i+1}"
|
371
|
+
compdir = gs2_folder_name(i) # "flux_tube_#{i+1}"
|
367
372
|
Dir.chdir(compdir){component.process_directory} if FileTest.exist? compdir
|
368
373
|
#}
|
369
374
|
component.component_runs = []
|
@@ -125,6 +125,27 @@ EOF2
|
|
125
125
|
def flux_gs2?
|
126
126
|
@flux_option == "gs2"
|
127
127
|
end
|
128
|
+
|
129
|
+
def gs2_run_name(i)
|
130
|
+
if i >= n_flux_tubes_jac
|
131
|
+
jn = i - n_flux_tubes_jac + 1
|
132
|
+
run_name = "calibrate_" + @run_name + (jn).to_s
|
133
|
+
else
|
134
|
+
jn = i + 1
|
135
|
+
run_name = @run_name + (jn).to_s
|
136
|
+
end
|
137
|
+
run_name
|
138
|
+
end
|
139
|
+
def gs2_folder_name(i)
|
140
|
+
if i >= n_flux_tubes_jac
|
141
|
+
jn = i - n_flux_tubes_jac + 1
|
142
|
+
folder = "calibrate_#{jn}"
|
143
|
+
else
|
144
|
+
jn = i + 1
|
145
|
+
folder = "flux_tube_#{jn}"
|
146
|
+
end
|
147
|
+
folder
|
148
|
+
end
|
128
149
|
end
|
129
150
|
|
130
151
|
end
|
data/trinitycrmod.gemspec
CHANGED
@@ -2,16 +2,16 @@
|
|
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: trinitycrmod 0.5.
|
5
|
+
# stub: trinitycrmod 0.5.4 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "trinitycrmod"
|
9
|
-
s.version = "0.5.
|
9
|
+
s.version = "0.5.4"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib"]
|
13
13
|
s.authors = ["Edmund Highcock"]
|
14
|
-
s.date = "2015-01-
|
14
|
+
s.date = "2015-01-26"
|
15
15
|
s.description = "This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport solver for Fusion Reactors, to harness the power of CodeRunner, a framework for the automated running and analysis of simulations."
|
16
16
|
s.email = "edmundhighcock@sourceforge.net"
|
17
17
|
s.extra_rdoc_files = [
|
@@ -50,28 +50,31 @@ Gem::Specification.new do |s|
|
|
50
50
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
51
51
|
s.add_runtime_dependency(%q<coderunner>, [">= 0.15.5"])
|
52
52
|
s.add_runtime_dependency(%q<text-data-tools>, [">= 1.1.3"])
|
53
|
-
s.add_runtime_dependency(%q<gs2crmod>, [">= 0.11.
|
54
|
-
s.add_development_dependency(%q<shoulda>, ["
|
53
|
+
s.add_runtime_dependency(%q<gs2crmod>, [">= 0.11.76"])
|
54
|
+
s.add_development_dependency(%q<shoulda>, ["= 3.0.1"])
|
55
55
|
s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
|
56
56
|
s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
|
57
|
-
s.add_development_dependency(%q<jeweler>, [">=
|
57
|
+
s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
|
58
|
+
s.add_development_dependency(%q<minitest>, ["~> 4"])
|
58
59
|
else
|
59
60
|
s.add_dependency(%q<coderunner>, [">= 0.15.5"])
|
60
61
|
s.add_dependency(%q<text-data-tools>, [">= 1.1.3"])
|
61
|
-
s.add_dependency(%q<gs2crmod>, [">= 0.11.
|
62
|
-
s.add_dependency(%q<shoulda>, ["
|
62
|
+
s.add_dependency(%q<gs2crmod>, [">= 0.11.76"])
|
63
|
+
s.add_dependency(%q<shoulda>, ["= 3.0.1"])
|
63
64
|
s.add_dependency(%q<rdoc>, ["~> 3.12"])
|
64
65
|
s.add_dependency(%q<bundler>, ["> 1.0.0"])
|
65
|
-
s.add_dependency(%q<jeweler>, [">=
|
66
|
+
s.add_dependency(%q<jeweler>, [">= 1.8.4"])
|
67
|
+
s.add_dependency(%q<minitest>, ["~> 4"])
|
66
68
|
end
|
67
69
|
else
|
68
70
|
s.add_dependency(%q<coderunner>, [">= 0.15.5"])
|
69
71
|
s.add_dependency(%q<text-data-tools>, [">= 1.1.3"])
|
70
|
-
s.add_dependency(%q<gs2crmod>, [">= 0.11.
|
71
|
-
s.add_dependency(%q<shoulda>, ["
|
72
|
+
s.add_dependency(%q<gs2crmod>, [">= 0.11.76"])
|
73
|
+
s.add_dependency(%q<shoulda>, ["= 3.0.1"])
|
72
74
|
s.add_dependency(%q<rdoc>, ["~> 3.12"])
|
73
75
|
s.add_dependency(%q<bundler>, ["> 1.0.0"])
|
74
|
-
s.add_dependency(%q<jeweler>, [">=
|
76
|
+
s.add_dependency(%q<jeweler>, [">= 1.8.4"])
|
77
|
+
s.add_dependency(%q<minitest>, ["~> 4"])
|
75
78
|
end
|
76
79
|
end
|
77
80
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: trinitycrmod
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Edmund Highcock
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-01-
|
11
|
+
date: 2015-01-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: coderunner
|
@@ -44,28 +44,28 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 0.11.
|
47
|
+
version: 0.11.76
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 0.11.
|
54
|
+
version: 0.11.76
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: shoulda
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - '='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version:
|
61
|
+
version: 3.0.1
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - '='
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version:
|
68
|
+
version: 3.0.1
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rdoc
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -100,14 +100,28 @@ dependencies:
|
|
100
100
|
requirements:
|
101
101
|
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version:
|
103
|
+
version: 1.8.4
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version:
|
110
|
+
version: 1.8.4
|
111
|
+
- !ruby/object:Gem::Dependency
|
112
|
+
name: minitest
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
114
|
+
requirements:
|
115
|
+
- - "~>"
|
116
|
+
- !ruby/object:Gem::Version
|
117
|
+
version: '4'
|
118
|
+
type: :development
|
119
|
+
prerelease: false
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
121
|
+
requirements:
|
122
|
+
- - "~>"
|
123
|
+
- !ruby/object:Gem::Version
|
124
|
+
version: '4'
|
111
125
|
description: This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport
|
112
126
|
solver for Fusion Reactors, to harness the power of CodeRunner, a framework for
|
113
127
|
the automated running and analysis of simulations.
|