trinitycrmod 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f8bb5bb77415cd24949e7ead7cee9b046c9f22
-  data.tar.gz: 6ff6703f90671c31b657fae590bb04d76ca08df8
+  metadata.gz: 05901024300b2c48fadf30bb6a85c982a67318bd
+  data.tar.gz: c5f1c1cb3b93136e304d2046330e03bd8ac8ddf3
 SHA512:
-  metadata.gz: 60514fa5ee4ff49b33d512ff0caada673c76700e4f21369b63946923ee4a1eba7a94a9a697b50daf39411279bd001adedc554a8c5cfe739e97397dbae037b943
-  data.tar.gz: 6da206d6b1203763ab20d04658defb5550ecc3000d0a673dfca6798a831a4c521dd5786a2017a0513474baea6116070b3d770290bba0d96d935d1d20cb6dd96a
+  metadata.gz: efc67e157fb35235b764ed3027c268935888d77213b6962978ed449debb9cb17f78d6e944ecb2628bd229804fd4dd6966df16ffe25f03f1ac4501e62541dc6ed
+  data.tar.gz: 72df55a2ece6bd1d8ed166d9a9afc5c63b3215ed142639ec9df17285c8c9678a8f78eb0d7df34e8fd8996305efdf7c20e1317a753fe2c75c2b46fac49dbe8ae6

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/trinitycrmod/trinity.rb

@@ -182,10 +182,11 @@ class CodeRunner
     #  will set nx for all runs to be 43, and delt for run 1 to 0.01, delt
     #  for run 2 to be 0.05
     def update_submission_parameters(parameters, start_from_defaults=true)
+      @set_flux_defaults_procs ||= []
       super(parameters, start_from_defaults)
       if @flux_option == "gs2"
-        raise "set_flux_defaults_proc not defined" unless @set_flux_defaults_proc
-        @set_flux_defaults_proc.call
+        raise "No set_flux_defaults_procs defined" unless @set_flux_defaults_procs.size > 0
+        @set_flux_defaults_procs.each{|prc| prc.call}
         gs2_parameter_hashes = {}
         if @flux_pars
           @flux_pars.each do |par, val|

data/lib/trinitycrmod/trinity_gs2.rb

@@ -62,13 +62,13 @@ class CodeRunner
 			CodeRunner::Gs2.make_new_defaults_file(name + '_gs2tmp', gs2_input_file)
 
 			File.open(defaults_filename, 'a'){|file| file.puts <<EOF2
-@set_flux_defaults_proc = Proc.new do
+@set_flux_defaults_procs.push(Proc.new do
 gs2_runs.each do |run|
 run.instance_eval do
 #{File.read(tmp_filename).gsub(/\A|\n/, "\n  ")}
 end
 end
-end
+end)
 
 
 EOF2

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.6.1 ruby lib
+# stub: trinitycrmod 0.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   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-02-02"
+  s.date = "2015-02-03"
   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.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner