coderunner 0.14.16 → 0.14.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f02342c2ff349901cbd2d361c9619ac0efb03401
-  data.tar.gz: f040499a52713af1b238bc1683c8738f5870fd32
+  metadata.gz: 9ff03c52c882c64aef522a5dd07b5dd28055aa3a
+  data.tar.gz: 738466df4ceb7eb4705c165ccc5341a723ead8e4
 SHA512:
-  metadata.gz: c820d8b2bea2ac147111a53ac23c4139ca3bf9ec12b6e8e21f9490a2fb5ab3d24e5a81f79d8153041825b5aa4df44ab582307ccb9efc2144935f878854477ed7
-  data.tar.gz: 1851d04d417e52c92b645ebeacec35706d9fd8915fa2a589a8b441ddfb7d1ae2e86f72b867b60687e4743b198abec6fa67604337cde1eda8d24c8190caa1657c
+  metadata.gz: 131c06a3e00adbd565a95842a8e4993034ab558fda5eac89a40f89a9e14a184e63fba90e80b4297af307db312e908f2c59f0dddc017a54b33fb321c3ceed3b78
+  data.tar.gz: ebefbcd6d9b3d3e040c30512b1831fe3f1762a7f5d3efa6211dff581a5e3c8fc4b402fc8c05b7f9a701d948f415e835bf3f2bdc7385448ee6393e1eb9f746d59

data/VERSION

@@ -1 +1 @@
-0.14.16
+0.14.17

data/coderunner.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.14.16 ruby lib
+# stub: coderunner 0.14.17 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.14.16"
+  s.version = "0.14.17"
 
   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 = "2014-05-26"
+  s.date = "2014-07-02"
   s.description = "CodeRunner is a framework for the automated running and analysis of simulations. It automatically generates any necessary input files, organises the output data and analyses it. Because it is a modular system, it can easily be customised to work with any system and any simulation code. One of its greatest strengths is that it is independent of any one simulation code; thus it can easily plot and compare the data from different codes."
   s.email = "edmundhighcock@sourceforge.net"
   s.executables = ["coderunner"]

data/lib/coderunner/fortran_namelist.rb

@@ -569,10 +569,12 @@ end
 # Scan the text of a namelist from an input file and return an array variables with their default values
 
 def self.scan_text_for_variables(text)
-	regex = Regexp.new("#{rcp.matching_regex.to_s}\\s*(?:\\!(?<comment>.*))?[\\n|;]")
+	regex = Regexp.new("#{rcp.matching_regex.to_s}\\s*(?:\\!(?<comment>.*))?(?:\\n|;|\\Z)")
 	arr = []
+	#ep ['scanning text', text]
 	text.scan(regex) do
 		match = $~
+		#ep ['scan_match', match]
 		var = match[:name].downcase.to_sym
 		default = match[:default.to_sym]
 		default = (match[:float] or match[:complex]) ? match[:default].gsub(/(\.)(\D|$)/, '\10\2').gsub(/[dD]/, 'e').gsub(/(\D|^)(\.)/, '\10\2') : match[:default]
@@ -1085,7 +1087,7 @@ def self.get_namelists_and_variables_from_source_code(source)
 	all_variables_in_source = {}
 	namelist_declarations = {}
 	#source.scan(/^\s*namelist\s*\/(?<namelist>\w+)\/(?<variables>(?:(?:&\s*[\n\r]+)|[^!\n\r])*)/) do 
-	source.scan(Regexp.new("#{/^\s*namelist\s*\/\s*(?<namelist>\w+)\s*\//}(?<variables>#{FORTRAN_SINGLE_LINE})")) do 
+	source.scan(Regexp.new("#{/^\s*namelist\s*\/\s*(?<namelist>\w+)\s*\//i}(?<variables>#{FORTRAN_SINGLE_LINE})", Regexp::IGNORECASE)) do 
 		namelist = $~[:namelist].to_s.downcase.to_sym
 		variables = $~[:variables].gsub(/!.*/, '')
 		eputs namelist, variables
@@ -1112,9 +1114,9 @@ end
 # Try to get a sample value of the 
 def self.get_sample_value(source, var)
 			ep var
-			values_text = source.scan(Regexp.new("\\W#{var}\\s*=\\s*.+")).join("\n") 
+			values_text = source.scan(Regexp.new("\\W#{var}\\s*=\\s*.+", Regexp::IGNORECASE)).join("\n") 
 			ep values_text
-			values = scan_text_for_variables(values_text).map{|(v,val)| val} 
+			values = scan_text_for_variables(values_text.sub(/_RKIND/, '')).map{|(v,val)| val} 
 			values.uniq!
 # 			ep values if var == :nbeta
 			values.delete_if{|val| val.kind_of? String} if values.find{|val| val.kind_of? Numeric}

data/lib/coderunner/run.rb

@@ -824,7 +824,7 @@ to your code module.
 
 		@run_info = rcp.run_info || [] # Run info can optionally be defined in the code module.
 # 		ep @run_info
-		@run_info = rcp.run_info + ([:preamble, :job_no, :running, :id, :status, :sys, :is_component, :naming_pars, :run_name, :resubmit_id, :real_id, :component_runs, :parameter_hash, :parameter_hash_string, :output_file, :error_file, :extra_files] + SUBMIT_OPTIONS) #.each{|v| RUN_INFO.push v} unless RUN_INFO.include? :job_no
+		@run_info = rcp.run_info + ([:preamble, :job_no, :running, :id, :status, :sys, :is_component, :naming_pars, :run_name, :resubmit_id, :real_id, :component_runs, :parameter_hash, :parameter_hash_string, :output_file, :error_file, :extra_files, :code_run_environment] + SUBMIT_OPTIONS) #.each{|v| RUN_INFO.push v} unless RUN_INFO.include? :job_no
 		@all = (rcp.variables + rcp.results + rcp.run_info) #.each{|v| ALL.push v}
 # 		ep "GOT HERE"
 		(@all + [:directory, :run_name, :modlet, :relative_directory]).each{|var| send(:attr_accessor, var)}
@@ -1055,7 +1055,7 @@ end
 	# is to return an empty string.
 
 	def code_run_environment
-		""
+		@code_run_environment
 	end
 
 # Prints a warning message, useful for pre-submit checks.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.14.16
+  version: 0.14.17
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit