coderunner 0.15.6 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8713fa11c4a4f698151a81038a5c1dcbb0493481
-  data.tar.gz: a19fe0ed0368d2817e6ffc94da10c4a7e93e20b3
+  metadata.gz: ea54354556be9175b726b64ed64bf0a5ab260bdd
+  data.tar.gz: b4b4415d6868b5a890324b2799f50b4f77173f91
 SHA512:
-  metadata.gz: c9977b1e776f99f200f031e8f85b1cf0cb0efc9ef6aca202fa39e5832f36337015c402d43b872939f386bba92f75400e4fc17d51ec7980d0893d82ebc8502a74
-  data.tar.gz: f39416543e655fc1d8e0099d229948409049620b24bfe40928065bdceab23c3606c9ace31e6670f4a990499cf0585fae93926a273ccd9c8043cc360bf6a24f44
+  metadata.gz: b0d6b8eca0bcf89e2158a4153a7b4488ea881eb81b904d04562fcaa3e9bb2fa70439ecf6f01999d1d4610df54fe112ad8a47fe6430b8654d409840d50b5d8e8a
+  data.tar.gz: c2ceca5b591a600e1d8bb9be0303af19720332689550ba85fc28148110917b923436c6627bf183014613bdbc3a8757b6b2d79f80e240bc9e2adf30bd065e57df

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-  gem "graphkit", ">= 0.3.2"
+  gem "graphkit", ">= 0.4.2"
   gem "parallelpipes", ">= 1.0.0"
   gem "rubyhacks", ">= 0.1.4"
   gem "rb-gsl", ">= 1.12.0"

data/VERSION

@@ -1 +1 @@
-0.15.6
+0.15.7

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.6 ruby lib
+# stub: coderunner 0.15.7 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.15.6"
+  s.version = "0.15.7"
 
   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 = "2014-12-04"
+  s.date = "2015-02-20"
   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"]
@@ -101,7 +101,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<graphkit>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<graphkit>, [">= 0.4.2"])
       s.add_runtime_dependency(%q<parallelpipes>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<rubyhacks>, [">= 0.1.4"])
       s.add_runtime_dependency(%q<rb-gsl>, [">= 1.12.0"])
@@ -112,7 +112,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<graphkit>, [">= 0.3.2"])
+      s.add_dependency(%q<graphkit>, [">= 0.4.2"])
       s.add_dependency(%q<parallelpipes>, [">= 1.0.0"])
       s.add_dependency(%q<rubyhacks>, [">= 0.1.4"])
       s.add_dependency(%q<rb-gsl>, [">= 1.12.0"])
@@ -124,7 +124,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<graphkit>, [">= 0.3.2"])
+    s.add_dependency(%q<graphkit>, [">= 0.4.2"])
     s.add_dependency(%q<parallelpipes>, [">= 1.0.0"])
     s.add_dependency(%q<rubyhacks>, [">= 0.1.4"])
     s.add_dependency(%q<rb-gsl>, [">= 1.12.0"])

data/lib/coderunner/graphs_and_films.rb

@@ -625,7 +625,7 @@ class CodeRunner
 					g.modify(options)
 					g.instance_eval options[:graphkit_modify] if options[:graphkit_modify]
 # 					p g; exit
-				        g.title +=  sprintf(", frame %0#{fd}d", frame_index) unless options[:frame_title] == false
+				        g.title = (g.title||"") + sprintf(", frame %0#{fd}d", frame_index) unless options[:frame_title] == false
 # 					folder = ("film_frames/"); 
 # 					file_name = sprintf("frame_%0#{fd}d", actual_frames[frame_index])
 # 					g.gnuplot; gets; g.close
@@ -653,80 +653,31 @@ class CodeRunner
 # 		fa = (options[:frame_array] or options[:fa] or list[0][0].run_list[list[0][0].filtered_ids[0]].frame_array(options)	)
 
 		fd = frame_digits = options[:fd]||Math.log10(graphkit_frame_array.map{|f, g| f}.max).ceil
+    fd = 8 if options[:concatenate]
+
 		extension = (options[:extension] or options[:ext] or '.png')
 		extension = '.' + extension unless extension =~ /^\./
 		unless options[:skip_frames] or options[:sf]
-		FileUtils.rm_r('film_frames') if FileTest.exist?('film_frames')
+		FileUtils.rm_r('film_frames') if FileTest.exist?('film_frames') and not options[:concatenate]
 
 		FileUtils.makedirs('film_frames')
-# 		puts @@multiple_processes; gets
 		no_forks = (@@multiple_processes or 1)
 		ep @@multiple_processes, no_forks
-# 		end_graphkit = graphkit_multiple_runners(list, frame_index: fa[1])
-# 		begin_graphkit = graphkit_multiple_runners(list, frame_index: fa[0])
-
-# 		end_area = end_graphkit.plot_area_size
-# 		begin_area = begin_graphkit.plot_area_size
-# 		p end_area, begin_area, options
-# 		plot_size = {}
-# 		axes = [:x, :y, :z]
-# 		options[:normalize] ||= options[:nm]  
-# 		options[:normalize_pieces] ||= options[:nmp]
-# 		for i in 0...end_area.size
-# 			next unless options[:normalize] and options[:normalize].include? axes[i]
-# 			min = [end_area[i][0], begin_area[i][0]].min
-# 			max = [end_area[i][1], begin_area[i][1]].max
-# 			key =  axes[i]
-# 			plot_size[key + :range] = [min, max]
-# 		end
-# 		ep plot_size
-# 		exit
-# 		frames = []
-# 		actual_frames = {}
-# 		i = fa[0]
-# 		j = 0
-# 		while i <= fa[1]
-# 			frames.push i
-# 			actual_frames[i] = j
-# 			i += (options[:ic] or options[:increment] or 1)
-# 			j += 1
-# 		end
 		i = 0
+    if options[:concatenate] and (ents = Dir.entries('film_frames').grep(/frame_/)).size > 0
+      i = ents.map{|fn| fn.gsub(/\D/, '').to_i}.max + 1
+    end
+
 		actual_frames = graphkit_frame_array.map{|f, g| f}.inject({}){|hash, f| hash[f] = i; i+=1; hash}
 		graphkit_frame_array.pieces(no_forks).each_with_index do |graphkit_frame_array_piece, myrank|
 			fork do
-# 				if options[:normalize_pieces]
-# 				end_area = graphkit_multiple_runners(list, frame_index: piece.max).plot_area_size
-# 				begin_area = graphkit_multiple_runners(list, frame_index: piece.min).plot_area_size
-# 				axes = [:x, :y, :z]
-# 				for i in 0...end_area.size
-# 					next unless options[:normalize_pieces].include? axes[i]
-# 					min = [end_area[i][0], begin_area[i][0]].min
-# 					max = [end_area[i][1], begin_area[i][1]].max
-# 					key =  axes[i]
-# 
-# 					plot_size[key + :range] = [min, max]
-# 				end
-# 				end
-# 				eputs 'making graphs...'; sleep 1
-# 				graph_array = graphkit_multiple_runners_with_frame_array(piece, list, myrank==0)
-# # 				ep graph_array
-# 				eputs
 				graphkit_frame_array_piece.each_with_index do |(frame_index,g), pindex|
 					if myrank == 0
 						eputs "\033[2A" # Terminal jargon - go back one line
 						eputs sprintf("Plotting graphs: %2.2f", pindex.to_f/graphkit_frame_array_piece.size.to_f * 100.0) + "% Complete"
 					end
-# 					g = graph_kit_multiple_runners(list, plot_size + {frame_index: frame_index})
-					
-# 					g.modify(plot_size)
-# 					g.modify(options)
-# 					p g; exit
-# 				        g.title +=  sprintf(", frame %0#{fd}d", frame_index) unless options[:frame_title] == false
 					folder = ("film_frames/"); 
 					file_name = sprintf("frame_%0#{fd}d", actual_frames[frame_index])
-# 					g.gnuplot; gets; g.close
-# 					ep folder + file_name + '.png'; gets
 					g.gnuplot_write(folder + file_name + extension, size: options[:size])
 				end
 			end

data/lib/coderunner/remote_code_runner.rb

@@ -150,7 +150,8 @@ class RemoteCodeRunner < CodeRunner
 		end
     cachename = self.class.cache_folder(@host, @folder) + '/' + filename
 		if @remote_cache == :auto and 	FileTest.exist?(cachename)
-			return eval(File.read(cachename))
+			data = eval(File.read(cachename))
+      return data if not data.nil?
 		end
 		string = @libraries.map{|lib| "require #{lib}"}.join(";") + ";" + string
 

data/test/test_coderunner.rb

@@ -394,9 +394,9 @@ class TestFortranNamelistC < Test::Unit::TestCase
 		#FileUtils.rm('lib/cubecalccrmod/namelists.rb')
 		CodeRunner.setup_run_class('cubecalc', modlet: 'with_namelist')
 		assert_equal(File.read('test/cubecalc_namelist.cc').size+1, CodeRunner::Cubecalc::WithNamelist.get_aggregated_source_code_text('test').size)
-		CodeRunner::Cubecalc::WithNamelist.synchronise_variables('test')
+		#CodeRunner::Cubecalc::WithNamelist.synchronise_variables('test')
 		CodeRunner::Cubecalc::WithNamelist.synchronise_variables_from_input_file('test/cubecalc.in')
-		CodeRunner::Cubecalc::WithNamelist.update_defaults_from_source_code('test')
+		#CodeRunner::Cubecalc::WithNamelist.update_defaults_from_source_code('test')
 	end
 	def test_mediawiki_write
 		CodeRunner.setup_run_class('cubecalc', modlet: 'with_namelist')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.15.7
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: parallelpipes
   requirement: !ruby/object:Gem::Requirement