coderunner 0.11.22 → 0.11.23

data/VERSION

@@ -1 +1 @@
-0.11.22
+0.11.23

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.11.22"
+  s.version = "0.11.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2012-12-30"
+  s.date = "2013-03-01"
   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/instance_methods.rb

@@ -1201,16 +1201,25 @@ Conditions contain a single = sign: #{conditions}
 		#|| ""
 # 			qstat = qstat=~/\S/ ? qstat : nil
 		job_no = nil
-			5.times do # job_no may not appear instantly
+		if self.respond_to? :queue_wait_attempts
+			ntimes = queue_wait_attempts
+		else
+			ntimes = 5
+		end
+		eputs 'Waiting for job to appear in the queue...'
+		ntimes.times do |i| # job_no may not appear instantly
 # 				eputs queue_status
-				new_job_nos = queue_status.scan(/^\s*(\d+)/).map{|match| match[0].to_i}
-				job_no = (new_job_nos-old_job_nos).sort[0]
+			new_job_nos = queue_status.scan(/^\s*(\d+)/).map{|match| match[0].to_i}
+			job_no = (new_job_nos-old_job_nos).sort[0]
 # 				eputs "job_no", job_no
-				break if job_no
-				sleep 0.2
-				qstat = queue_status
+			break if job_no
+			sleep 0.2
+			qstat = queue_status
+			if i == ntimes
+				eputs 'Timeout... perhaps increase queue_wait_attempts in the system module?'
 			end
-			job_no ||= -1 # some functions don't work if job_no couldn't be found, but most are ok
+		end
+		job_no ||= -1 # some functions don't work if job_no couldn't be found, but most are ok
 	end
 	
 	private :get_new_job_no

data/lib/coderunner/system_modules/load_leveler.rb

@@ -146,5 +146,11 @@ def get_run_status(job_no, current_status)
 	end
 end
 
+ 	# It takes a long time for the job to appear in the queue
+  # Each attempt to wait for it to appear takes 0.2 seconds
+	# Here we therefore wait 40 seconds!
+	def queue_wait_attempts
+		200
+	end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.11.22
+  version: 0.11.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit