coderunner 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea54354556be9175b726b64ed64bf0a5ab260bdd
-  data.tar.gz: b4b4415d6868b5a890324b2799f50b4f77173f91
+  metadata.gz: 3b40b38fcea184d29203d2d101ceb480eacf1d6b
+  data.tar.gz: 0e0f3a66735a746b44b3973f494496e4f25fe2f3
 SHA512:
-  metadata.gz: b0d6b8eca0bcf89e2158a4153a7b4488ea881eb81b904d04562fcaa3e9bb2fa70439ecf6f01999d1d4610df54fe112ad8a47fe6430b8654d409840d50b5d8e8a
-  data.tar.gz: c2ceca5b591a600e1d8bb9be0303af19720332689550ba85fc28148110917b923436c6627bf183014613bdbc3a8757b6b2d79f80e240bc9e2adf30bd065e57df
+  metadata.gz: 901df6eacfbbefd640e79d8204ac4688a0aa1d1c1fcc8dc816c30fb2f2909a917077326c4a0682d45eb76983378f7f9e763bdd34e702245215f339b18983f57d
+  data.tar.gz: 678cfd6ae0a6d206f1a214eeec5626e02988ba6e1d2d70739e1fdc638b60099cf0c43752a15b27389733a28c210b92f9aae62a1d211d1e87595bb6737826b869

data/VERSION

@@ -1 +1 @@
-0.15.7
+0.15.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.15.7 ruby lib
+# stub: coderunner 0.15.8 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.15.7"
+  s.version = "0.15.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-02-20"
+  s.date = "2015-04-02"
   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

@@ -9,5 +9,18 @@ class CodeRunner
 		def max_ppn
 			16
 		end
+    def mpi_prog
+	    nodes, ppn = @nprocs.split(/x/)
+      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
 	end
 end

data/lib/coderunner/system_modules/slurm.rb

@@ -17,11 +17,14 @@ module Slurm
 		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
 			return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
 		else
-			nodes, ppn = @nprocs.split(/x/)
-			nprocstot = nodes.to_i * ppn.to_i
-			"#@preamble mpirun -np #{nprocstot}  #{executable_location}/#{executable_name} #{parameter_string}"
+			"#@preamble #{mpi_prog}  #{executable_location}/#{executable_name} #{parameter_string}"
 		end
 	end
+  def mpi_prog
+	  nodes, ppn = @nprocs.split(/x/)
+	  nprocstot = nodes.to_i * ppn.to_i
+    "mpirun -np #{nprocstot}"
+  end 
 
 	def execute
 		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)

metadata

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