coderunner 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b445613262ed7c7fee9a6e8c0f4ed08b30b4bd
-  data.tar.gz: 5fb5203798cfa9f2732e9e1f85b1579cd7adc917
+  metadata.gz: 7efe9db90ab3c2addc215e3c05f683539b032164
+  data.tar.gz: a743bf0b621c725aa6f1446dac7e5a482c5b107d
 SHA512:
-  metadata.gz: 7b6e22cab3a4e93afcea7bf3c8e61e1cfadf0074127a1261bbbc052c08fd5fb1eb5334766e3a0b4c057b4fa6ec727d9e33454945e57b47edbfe21801044f730e
-  data.tar.gz: b9566ed9862fa5083e4bb154d6b67284dd06e9cb49b4daee39860b61221312418bde205fb152af57d5b8ab9b829de4739567eac00605b354e6b6af55b052e0e9
+  metadata.gz: 75cea1b6e8a13dfae663ba2700af11ef86baf355cd0732e68c89f8ddecceac7157aa075ee0633ad121f6ab154c77e4ee409b84555a06a413f7d7bffbb92daac2
+  data.tar.gz: 5280776232d68f28c230e4e9081584d5980a30136207a3caa2ae2a682d8ea6e936c4686071d2f6f964fdb7e38c7203f2de70e5d8efc9c5bb9be8b7747fd553fc

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

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 1.0.10 ruby lib
+# stub: coderunner 1.0.11 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner".freeze
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Edmund Highcock".freeze]
-  s.date = "2017-04-27"
+  s.date = "2018-02-06"
   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.".freeze
   s.email = "edmundhighcock@users.sourceforge.net".freeze
   s.executables = ["coderunner".freeze, "coderunnerrepo".freeze]

data/lib/coderunner/system_modules/marconi.rb

@@ -1,36 +1,25 @@
 class CodeRunner
-	require SCRIPT_FOLDER + '/system_modules/moab.rb'
+	require SCRIPT_FOLDER + '/system_modules/slurm.rb'
 	module Marconi
-		include Moab
-		def batch_script
-			raise "Please specify project" unless @project
-			super
-		end
+		include Slurm
+		#def batch_script
+			#raise "Please specify project" unless @project
+			#super
+		#end
 		def max_ppn
-			36
+			48
 		end
-	def batch_script
-		ppn_checks
-		hours, mins, secs = hours_minutes_seconds
-<<EOF
-	#!/bin/bash --login 
-	#PBS -N #{executable_name}.#{job_identifier}
-	#PBS -l select=#{nodes}:ncpus=#{ppn}:mpiprocs=#{ppn}
-	#PBS -l walltime=#{sprintf("%02d:%02d:%02d", hours, mins, secs)}
-	#{@project ? "#PBS -A #@project" : ""}
-	#{@queue ? "#PBS -q #@queue" : ""}
-
-  #{code_run_environment}
-
-	### start of jobscript 
-	cd $PBS_O_WORKDIR 
-	echo "workdir: $PBS_O_WORKDIR" 
-
-	echo "Submitting #{nodes}x#{ppn} job on #{CodeRunner::SYS} for project #@project..."
-EOF
-	end
-	def mpi_prog
-		"mpirun -np #{nprocstot}"
-	end
+		def run_command
+	# 		"qsub #{batch_script_file}"
+			if use_launcher
+				return %[#{code_run_environment}\n ibrun -n #{@nprocs} -o 0 #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+			else
+				"srun #{executable_location}/#{executable_name} #{parameter_string}"
+			end
+		end
+		def batch_script
+			raise "Please specify the queue to submit to using the -Q (or Q:) flag" unless @queue
+			super
+		end	
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit