trinitycrmod 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45addc2aec59dee48597a236e7badca79c0ff97d
-  data.tar.gz: c5754e7e66463e83b3a5ed3e3697bff877e85ffb
+  metadata.gz: 2bc69720254ce2556f354d010a077aca3ee8ea76
+  data.tar.gz: 4e9f6850f1f4a7e71ea6ea8fcb95e203a3d464ce
 SHA512:
-  metadata.gz: eee87a5a162a34d23d9195c1b2279362a6e6d56ae1a54ad034a306080fa9ceab4fabd47b5c18705ac7198d7a45ff776a97c658c9424e9a7a55f0911dcc995df4
-  data.tar.gz: 157219eb32d5697710a2b8d8555e8deeeeac6a65cd8a4949f21099c2a8b9a6c68fd3319319314153997f7e3cf265134a61f6f700e7c95f68d34dfe932133f3bd
+  metadata.gz: 3b22d130f1233dad7876ddcb8c2023e03b2bec58f5f105a8064f7390e12ff1a8f08cec3b192e4b86109f4ae74471829bd9cc1732612dcf23a35f6343c242eda4
+  data.tar.gz: 33eca2219135e6fe9f2a86c4f1d835497172110998afac8ba6ffb92f98414b1da9c9ba4550ea67aa9dde57106b1f8e468b8ae1cfeb69cef04e7068d536780c77

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/trinitycrmod/trinity.rb

@@ -7,6 +7,9 @@ class CodeRunner
 	#  It  generates the Trinity input file, and both analyses the results and allows easy plotting of them. It also interfaces with the GS2 CodeRunner  module to allow analysis of the individual GS2 results if GS2 is being used as the flux code.
 	class Trinity < Run::FortranNamelist
 		#include CodeRunner::SYSTEM_MODULE
+		#
+
+		class FluxOptionError < StandardError; end
 
 
 

data/lib/trinitycrmod/trinity_gs2.rb

@@ -44,7 +44,11 @@ EOF2
 
 		end
 
+		# Generates the component runs for GS2 and returns the hash
+		# Raises an error if flux_option != "gs2"
 		def gs2_runs
+			raise FluxOptionError.new("gs2_runs called and flux_option != gs2") if not flux_gs2?
+
 			#puts "2@COMMMMMMMMMMMMMPOOOOOOOOOOOOOONNNETN", @component_runs
 			generate_component_runs if not (@component_runs and @component_runs.size > 0)
 			#p ["@COMMMMMMMMMMMMMPOOOOOOOOOOOOOONNNETN", @component_runs]
@@ -62,15 +66,31 @@ EOF2
     # Override standard CodeRunner method to allow for Gs2 variables
 		def evaluate_defaults_file(filename)
 			text = File.read(filename)
+			instance_eval(text)
 			text.scan(/^\s*@(\w+)/) do
 				var_name = $~[1].to_sym
 				next if var_name == :defaults_file_description
-				unless rcp.variables.include? var_name or Gs2.rcp.variables.include? var_name
+				unless rcp.variables.include? var_name or (flux_gs2? and Gs2.rcp.variables.include? var_name)
 					warning("---#{var_name}---, specified in #{File.expand_path(filename)}, is not a variable. This could be an error")
 				end
 			end
-			instance_eval(text)
 		end
 
+		# An array of arrays containing the GS2 run times for each iteration. 
+		# Produced unscientifically by scanning the stdout.
+		def gs2_run_times
+			raise FluxOptionError.new("gs2_run_times called and flux_option != gs2") if not flux_gs2?
+			run_times = []
+			File.open(@directory + '/' + output_file, "r").each_line{|l| l.scan(/Job.*timer.*(\d+\.\d+)/){run_times.push $~[1].to_f}}
+			sz = run_times.size.to_f
+			return run_times.pieces((sz / n_flux_tubes.to_f).ceil)
+
+		end
+
+		# Is the flux tube code being used gs2?
+		def flux_gs2?
+			@flux_option == "gs2"
+		end
 	end
+
 end

data/trinitycrmod.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.3.5 ruby lib
+# stub: trinitycrmod 0.3.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   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-02-06"
+  s.date = "2014-02-11"
   s.description = "This module allows Trinity, the Multiscale Gyrokinetic Turbulent Transport solver for Fusion Reactors, to harness the power of CodeRunner, a framework for the automated running and analysis of simulations."
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner