coderunner 0.11.21 → 0.11.22

data/VERSION

@@ -1 +1 @@
-0.11.21
+0.11.22

data/coderunner.gemspec

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

@@ -684,7 +684,7 @@ def info_file
 
 
 # Actual Command:
-# #{run_command}
+# #{run_command.gsub(/\n/, "\n#")}
 # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 EOF
 
@@ -1010,6 +1010,17 @@ end
 	def code_run_environment
 		""
 	end
+
+def warning(message)
+	eputs "Warning: " + message; sleep 0.3
+end
+
+class SubmitError < StandardError
+end
+
+def error(message)
+	raise("Error: " + message)
+end
 end
 
 end

data/lib/coderunner/system_modules/moab.rb

@@ -14,8 +14,8 @@ EOF
 				
 	def queue_status
 		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status.txt]  +
-			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status2.txt] 
+			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status.txt | grep sh]  +
+			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status2.txt | grep sh] 
 		else
 			%x[qstat | grep $USER]
 		end
@@ -37,7 +37,7 @@ EOF
 	def run_command
 # 		"qsub #{batch_script_file}"
 		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
-			return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+			return %[#{mpi_prog} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
 		else
 			nodes, ppn = @nprocs.split(/x/)
 			nprocstot = nodes.to_i * ppn.to_i
@@ -49,8 +49,8 @@ EOF
 		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
 			launch_id = "#{Time.now.to_i}#{$$}"
 			fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
-			File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
-			sleep 1 until FileTest.exist? fname + '.pid'
+			File.open(fname + '.start', 'w'){|file| file.print "cd #{Dir.pwd};", run_command, "\n"}
+			sleep 2 until FileTest.exist? fname + '.pid'
 			pid = File.read(fname + '.pid').to_i
 			FileUtils.rm fname + '.pid'
 			return pid
@@ -115,16 +115,30 @@ EOF
 	end
 
 	def error_file
-		return "#{executable_name}.#{job_identifier}.e#@job_no"
+		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
+			return "#{executable_name}.#{job_identifier}.e"
+		else
+			return "#{executable_name}.#{job_identifier}.e#@job_no"
+		end
 	end
 
 	def output_file
-		return "#{executable_name}.#{job_identifier}.o#@job_no"
+		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
+			return "#{executable_name}.#{job_identifier}.o"
+		else
+			return "#{executable_name}.#{job_identifier}.o#@job_no"
+		end
 	end
 
 def get_run_status(job_no, current_status)
 	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-		return :Unknown
+		if current_status =~ Regexp.new(job_no.to_s)
+			@running = true
+			return :Running
+		else
+			@running = false
+			return :Unknown
+		end
 	end
 	line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
 	unless line

metadata

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