coderunner 0.15.12 → 0.15.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2978c40385db27d78718304136bce84f6fd4816
-  data.tar.gz: 2bb7c2c495b6c73800944cbe4db67676af95241c
+  metadata.gz: bdaa33a0e55c8b08f7a428e1437ff88bbfb2098d
+  data.tar.gz: 93fb05648880a150f5bbc3bce9713c64dd97d803
 SHA512:
-  metadata.gz: a643a60a5a228eb4365d20120e29901ec746345f7afe2317f1b0cbfe16aa97a7903ad87c1793509f6ac25394b924bb732ce87e1b2701b7ceced3cf94013d8d9b
-  data.tar.gz: 01f80f29a2c1a1f48178c9911fbdb696b082e2095fab1e8b151e503bb4a6959627ba921f52a5dec9761868f2a2cb5efc22040dc01b95b894a24631ab6b2e0c26
+  metadata.gz: 67d87ac7d6d8793c7dc3ab8deaa3dcb4de405f4cc0388fd625c93c66681e7bf0775664504f1a6f217078cbb6f1cc21603bd457ee6044fab4a5e6063042da7f7d
+  data.tar.gz: 981c6767312f1ed06f6d555a5ef5c74da9cf77a15b6346363593d8d9b51d306e69b712c49ccea4832d548e3d9be8f96c0d5d03823d4e4150a1b56d6f23660626

data/VERSION

@@ -1 +1 @@
-0.15.12
+0.15.13

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.15.12 ruby lib
+# stub: coderunner 0.15.13 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.15.12"
+  s.version = "0.15.13"
 
   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-04-08"
+  s.date = "2015-04-09"
   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/system_modules/helios.rb

@@ -2,10 +2,6 @@ class CodeRunner
 	require SCRIPT_FOLDER + '/system_modules/slurm.rb'
 	module Helios
 		include Slurm
-		#def batch_script
-			#raise "Please specify project" unless @project
-			#super
-		#end
 		def max_ppn
 			16
 		end
@@ -14,13 +10,12 @@ class CodeRunner
       nprocstot = nodes.to_i * ppn.to_i
       "srun -n #{nprocstot}"
     end 
-    def run_command
-  # 		"qsub #{batch_script_file}"
-      if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
-        return %[#@preamble #{mpi_prog} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
-      else
-        "#@preamble #{mpi_prog}  #{executable_location}/#{executable_name} #{parameter_string}"
-      end
-    end
+	def run_command
+		if use_launcher
+			return %[#{code_run_environment}\n #@preamble #{mpi_prog}  #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+		else
+			"#@preamble #{mpi_prog}  #{executable_location}/#{executable_name} #{parameter_string}"
+		end
+	end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.15.12
+  version: 0.15.13
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit