trinitycrmod 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413b38bd4ccf40719be5c2e6f2c7e2b622d7f1ef
-  data.tar.gz: 91dd192ff90d43e2ac44754704c17677ca969308
+  metadata.gz: ac9c5954bf7071ce81476e0159f33e6d71b09aa8
+  data.tar.gz: 6aaa46089655606a9c82e93b61a480f3e18dd0a5
 SHA512:
-  metadata.gz: 974f20c0da920ef1034433be4fc110feef9ff24ba7d08bb99ea2e80a7af357440363ee8b7975c7c7ad20c3536534ef2cc46fbbbb5540eea03acbf9bcec02a777
-  data.tar.gz: 5a98b2ea9f517611acc52696caad15cc9c8477980e00b0872cc3277caef7a50343fa8c3d26f170a7d713dab14c923a5356e278629f5e1872294bb19ced48b924
+  metadata.gz: fe7552ad206bcccad017a36ca9282034050e09124b7d361737d2c042ad536c935f2cacddb2d6b7ae58bb15c4ba069c17c25c149e6de7dc8ce6263023e487c672
+  data.tar.gz: d10b806384534570f045de0ac0c6b091020e550a06845fb6d47444faecca363710aba2d0f6fe8e9d25d74ec145561adcf0880ed275808a169136c6e83d640630

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/trinitycrmod/trinity.rb

@@ -187,8 +187,19 @@ class CodeRunner
 						if val.kind_of? Hash
 							#val.each{|n,v| gs2_runs[n].set(par, v)}
 							val.each do |n,v| 
-								gs2_parameter_hashes[n] ||= {}
-								gs2_parameter_hashes[n][par] = v
+                if n == :jac
+                  range =  0...n_flux_tubes_jac
+                elsif n == :calib
+                  range =  n_flux_tubes_jac...n_flux_tubes
+                else
+                  range = n..n
+                end
+                for i in range
+                  gs2_parameter_hashes[i] ||= {}
+                  gs2_parameter_hashes[i][par] = v
+                end
+								#gs2_parameter_hashes[n] ||= {}
+								#gs2_parameter_hashes[n][par] = v
 							end
 						else
 							for i in 0...n_flux_tubes
@@ -218,7 +229,7 @@ class CodeRunner
 						str+="_#{par}_#{send(par).to_s[0...8]}"
 					end
 				end
-				@run_name = @run_name.gsub(/\s+/, "_").gsub(/[\/{}"><]/, '') + "_id_#@id"
+				@run_name = @run_name.gsub(/\s+/, "_").gsub(/[\/{}"><:=]/, '') + "_id_#@id"
 		end
 
 		# The number of separate flux tube results needed for the jacobian

data/trinitycrmod.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.5.6 ruby lib
+# stub: trinitycrmod 0.5.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2015-01-26"
+  s.date = "2015-01-27"
   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."
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner