trinitycrmod 0.4.5 → 0.4.6
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.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/trinitycrmod/trinity.rb +5 -2
- data/trinitycrmod.gemspec +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5bb05d92666b18e935e2438d6ad00baa7e2188b6
|
|
4
|
+
data.tar.gz: d6e4b2728dffa38498ef3f409eb8ffe6b1f9a32d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fd90fdf84b0fea3b98351aa9918de6e73b2e4d01913fe2e239e32434d2159ba003d923fbbe290b6a6440494572d30bbd992050f996a25eddaf70dbb98e9fc77a
|
|
7
|
+
data.tar.gz: 5012e2bbb7f82a890a46db5da6d1332c33f531504d2be714041e4615b01a242cae7e0d0996aecebd2fbc22e48396b39fa9e6211ac3f3eb218ab2d41c0693a7b3
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.4.
|
|
1
|
+
0.4.6
|
data/lib/trinitycrmod/trinity.rb
CHANGED
|
@@ -120,7 +120,7 @@ class CodeRunner
|
|
|
120
120
|
new_run.generate_run_name
|
|
121
121
|
new_run.run_name += '_t'
|
|
122
122
|
eputs 'Copying Trinity Restart files', ''
|
|
123
|
-
system "ls #@directory"
|
|
123
|
+
#system "ls #@directory"
|
|
124
124
|
['iternt', 'iterflx', 'tmp'].each do |ext|
|
|
125
125
|
FileUtils.cp("#@directory/#@run_name.#{ext}", "#{new_run.directory}/.")
|
|
126
126
|
end
|
|
@@ -128,7 +128,9 @@ class CodeRunner
|
|
|
128
128
|
for i in 0...n_flux_tubes
|
|
129
129
|
new_run.gs2_runs[i].directory = new_run.directory + "/flux_tube_#{i+1}"
|
|
130
130
|
FileUtils.makedirs(new_run.gs2_runs[i].directory)
|
|
131
|
+
#ep ['gs2_runs[i] before', gs2_runs[i].nwrite, new_run.gs2_runs[i].nwrite, new_run.gs2_runs[i].parameter_hash]
|
|
131
132
|
gs2_runs[i].restart(new_run.gs2_runs[i])
|
|
133
|
+
#ep ['gs2_runs[i] after', gs2_runs[i].nwrite, new_run.gs2_runs[i].nwrite, new_run.gs2_runs[i].parameter_hash]
|
|
132
134
|
#new_run.gs2_runs[i].run_name = new_run.run_name + (i+1).to_s
|
|
133
135
|
end
|
|
134
136
|
end
|
|
@@ -157,9 +159,9 @@ class CodeRunner
|
|
|
157
159
|
def update_submission_parameters(parameters, start_from_defaults=true)
|
|
158
160
|
super(parameters, start_from_defaults)
|
|
159
161
|
if @flux_pars
|
|
162
|
+
gs2_parameter_hashes = {}
|
|
160
163
|
@flux_pars.each do |par, val|
|
|
161
164
|
if @flux_option == "gs2"
|
|
162
|
-
gs2_parameter_hashes = {}
|
|
163
165
|
if val.kind_of? Hash
|
|
164
166
|
#val.each{|n,v| gs2_runs[n].set(par, v)}
|
|
165
167
|
val.each do |n,v|
|
|
@@ -230,6 +232,7 @@ class CodeRunner
|
|
|
230
232
|
#gs2run.instance_variable_set(var, gs2_run(i).instance_variable_get(var))
|
|
231
233
|
#end
|
|
232
234
|
gs2run = gs2_runs[i]
|
|
235
|
+
#ep ['gs2_runs[i] in generate', gs2_runs[i].nwrite]
|
|
233
236
|
#p ['i',i]
|
|
234
237
|
if @subfolders and @subfolders.fortran_true?
|
|
235
238
|
gs2run.directory = @directory + "/flux_tube_#{i+1}"
|
data/trinitycrmod.gemspec
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
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.4.
|
|
5
|
+
# stub: trinitycrmod 0.4.6 ruby lib
|
|
6
6
|
|
|
7
7
|
Gem::Specification.new do |s|
|
|
8
8
|
s.name = "trinitycrmod"
|
|
9
|
-
s.version = "0.4.
|
|
9
|
+
s.version = "0.4.6"
|
|
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"]
|