coderunner 0.16.7 → 0.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257c0bd7135530bdb310ce0aa17542bc0f04d6dd
-  data.tar.gz: cc6da83fb0b46129964834cfc86fb46e3778b17e
+  metadata.gz: d61419b6ff8ca8962b2f3bd1a6d4d1ac80eb954e
+  data.tar.gz: e05030ab35aec0a0ab74e607d38216c34741a2e1
 SHA512:
-  metadata.gz: a6940d5f8bc6d8482f730644958507e5f5beb17110582f6f52d5f6ebc08fe2ee0e60dc2937ab2afdf25b993ba58ee3c174a0d4ef96a9eb934232765a2418ea1b
-  data.tar.gz: 5856dde2c9b89e4dd8532b1609a97e317c09b86fdd3af15c7274febb35c338bfa4faba074a280d4e0d6923ddcf23c9f6bfd9d99d27b2042715f9725352cbbf2f
+  metadata.gz: 7cc723df8dbe6d71baeeb54a1b443f66e413775eb88d816a4cadffbd24c3ac67b8e9f4ff2dfbc532b2c45a545fc0b0a67e11164600dab48a0711e836ae513feb
+  data.tar.gz: 61d03747461649b0c986858e27c562013dda06a1e5a1d013bac25b3d66fcd76dc70a50d5b2fc139392277b8bf88bdd751c3cfb8443cfc27cad8252b101c3197f

data/VERSION

@@ -1 +1 @@
-0.16.7
+0.16.8

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.16.7 ruby lib
+# stub: coderunner 0.16.8 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.7"
+  s.version = "0.16.8"
 
   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 = "2015-05-21"
+  s.date = "2015-05-22"
   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", "coderunnerrepo"]

data/lib/coderunner/system_modules/launcher.rb

@@ -27,5 +27,11 @@ class CodeRunner
 			fname = CodeRunner.launcher_directory + "/#{$$}.stop"
 			File.open(fname, 'w'){|file| file.puts "\n"}
     end
+    def error_file_launcher
+      return "#{executable_name}.#{job_identifier}.e"
+    end
+    def output_file_launcher
+      return "#{executable_name}.#{job_identifier}.o"
+    end
   end
 end

data/lib/coderunner/system_modules/slurm.rb

@@ -17,7 +17,7 @@ module Slurm
 	def run_command
 # 		"qsub #{batch_script_file}"
 		if use_launcher
-			return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+			return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file_launcher} 2> #{error_file_launcher}]
 		else
 			"#@preamble #{mpi_prog}  #{executable_location}/#{executable_name} #{parameter_string}"
 		end
@@ -83,19 +83,17 @@ EOF
 	end
 
 	def cancel_job
-		if use_launcher
-      cancel_job_launcher
-		else
-			`scancel #{@job_no}`
-		end
+		use_launcher ? cancel_job_launcher : `scancel #{@job_no}`
 	end
 
 	def error_file
-		return "#{executable_name}.#{job_identifier}.e#@job_no"
+		use_launcher ? error_file_launcher :
+      "#{executable_name}.#{job_identifier}.e#@job_no"
 	end
 
 	def output_file
-		return "#{executable_name}.#{job_identifier}.o#@job_no"
+		use_launcher ? output_file_launcher :
+      "#{executable_name}.#{job_identifier}.o#@job_no"
 	end
 
 def get_run_status(job_no, current_status)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.16.7
+  version: 0.16.8
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit