coderunner 0.11.11 → 0.11.12

data/VERSION

@@ -1 +1 @@
-0.11.11
+0.11.12

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.11.11"
+  s.version = "0.11.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2012-11-22"
+  s.date = "2012-11-23"
   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/class_methods.rb

@@ -331,10 +331,13 @@ EOF
 		unless copts[:C]
 			if FileTest.exist? file=Dir.pwd + '/.code_runner_script_defaults.rb'
 				copts[:C] = eval(File.read(file))[:code]
+				copts[:m] = eval(File.read(file))[:modlet]
 			elsif self.runner
 				copts[:C] = self.runner.code
+				copts[:m] = self.runner.modlet
 			end
 		end
+		#ep ['code', 'modlet is', copts[:C], copts[:m]]
 		            
 		run_class = setup_run_class(copts[:C], modlet: copts[:m])
 		run_class.class_eval(string)

data/lib/coderunner/fortran_namelist.rb

@@ -546,6 +546,7 @@ def self.parse_input_file(input_file, strict=true)
 		hash = namelist_hash[namelist] = {}
 		#p $~
 		scan_text_for_variables($~.to_s).each do |var, val|
+			#ep ['Varval', var, val]
 			add_code_variable_to_namelist(namelist, var, val) if @strict
 			hash[var] =  val
 		end
@@ -761,12 +762,14 @@ def self.defaults_file_text_from_input_file(input_file)
 
 	hash = parse_input_file(input_file)
 	#pp hash; exit
+	#ep ['class', self.to_s, 'namelists', rcp.namelists.keys, 'code_long', rcp.code_long, 'namelist_hashes', rcp.namelists.values.map{|v| v.class}]
 	rcp.namelists.each do |namelist, namelist_hash|
  		#ep namelist
 		if namelist_hash[:enumerator]  # ie. This is an indexed namelist
       #p namelist_hash[:enumerator]
 			enumerator = namelist_hash[:enumerator][:name]
 			enum_hash = hash.find{|nml, nmlh| nmlh[enumerator]}
+			next unless enum_hash
 			#pp enum_hash
 			enum = enum_hash[1][enumerator]
 			enum.times{|i| string << namelist_defaults_text(hash, namelist, namelist_hash, i+1)}

data/lib/coderunner/instance_methods.rb

@@ -432,6 +432,7 @@ class CodeRunner
 # 			ep run_class_names
 			
 		  modlet_file = "#{code}crmod/#{modlet}.rb"
+			#ep ['requiring modlet file']
 			require modlet_file
 			run_class = recursive_const_get(run_class_name)
 			run_class.instance_variable_set(:@modlet, modlet)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.11.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit