gs2crmod 0.10.2 → 0.10.3

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/gs2crmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gs2crmod"
-  s.version = "0.10.2"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock", "Ferdinand van Wyk"]
-  s.date = "2013-08-19"
+  s.date = "2013-08-27"
   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."
   s.email = "edmundhighcock@sourceforge.net"
   s.extensions = ["ext/extconf.rb"]

data/lib/gs2crmod/ingen.rb

@@ -64,20 +64,31 @@ def run_namelist_tests(namelist, hash, enum = nil)
 	hash[:variables].each do |var, var_hash|
 		gs2_var = (var_hash[:gs2_name] or var)
 		cr_var = var+ext.to_sym 
-		if send(cr_var) and (not var_hash[:should_include] or  eval(var_hash[:should_include]))
+		value = send(cr_var)
+		if value.kind_of? Array
+			value.each{|v| test_variable(namelist, var, var_hash, ext, v)}
+		else
+			test_variable(namelist, var, var_hash, ext, value)
+		end
+	end
+end
+
+def test_variable(namelist, var, var_hash, ext, value)
+		gs2_var = (var_hash[:gs2_name] or var)
+		cr_var = var+ext.to_sym 
+		if value and (not var_hash[:should_include] or  eval(var_hash[:should_include]))
 			var_hash[:must_pass].each do |tst|
-				error(test_failed(namelist, cr_var, gs2_var, tst)) unless send(cr_var).instance_eval(tst[:test])
+				error(test_failed(namelist, cr_var, gs2_var, tst)) unless value.instance_eval(tst[:test])
 			end if var_hash[:must_pass]
 			var_hash[:should_pass].each do |tst|
-				warning(test_failed(namelist, cr_var, gs2_var, tst)) unless send(cr_var).instance_eval(tst[:test])
+				warning(test_failed(namelist, cr_var, gs2_var, tst)) unless value.instance_eval(tst[:test])
 			end if var_hash[:should_pass]
 			if (var_hash[:allowed_values] or var_hash[:text_options])
 				tst = {test: "#{(var_hash[:allowed_values] or var_hash[:text_options]).inspect}.include? self", explanation: "The variable must have one of these values"}
-				error(test_failed(namelist, cr_var, gs2_var, tst)) unless send(cr_var).instance_eval(tst[:test])
+				error(test_failed(namelist, cr_var, gs2_var, tst)) unless value.instance_eval(tst[:test])
 			end
 
 		end
-	end
 end
 
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gs2crmod
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner