trinitycrmod 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a503c473f40ba4b2ca103f5090436139493cb4bf
-  data.tar.gz: cc96ac7458372f96ecee8699c46acb961dcb6adb
+  metadata.gz: 2deca7cf4f421e80bcc0192a8a0aa5a0ba3bf61d
+  data.tar.gz: 9124cb09beb00f542f77a8556331a766412c7e7d
 SHA512:
-  metadata.gz: d72b2c4f73867e77416463d28cdc2f417588a2137670789e273231f19cad231bd189e012e32df00bd185e460160b50c4f89ab0d3715e03ac8e16ba988fd82ede
-  data.tar.gz: 0985fc5769ef619c157882057103078adb5a361d9d6eae0f725dbf61369ae19112aedf26e460bca76e82a079b37611ede885311cb27b0ff7149a439ed8e3d498
+  metadata.gz: e0802307c2613319d71789cc590eb4012852551a9b73520a24bc34c0ebbc13f8336984d1d4f17bbcf6f84b8ae48e727dc044b9f8fc6e92d40567aeed77667afc
+  data.tar.gz: 8328d59ea46c6011cc99100b705e597d09e22a146336858d4400cad6aa4ca49fa7f32afecd69d56ac24013200545439a97fbdf1a4602c698959497189061075e

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/lib/trinitycrmod/calib.rb

@@ -0,0 +1,48 @@
+
+class Calib
+  def self.analyse_file(filename)
+    str = File.read(filename)
+    str.sub!(/calibra.*\s+/, '')
+    cal = $~[0]
+    strs = str.split(/(?=reduced_qflux)/); strs.shift
+    return strs.map{|s| new_from_string(cal,s)}
+  end
+  def self.new_from_string(cal,str)
+    pp str
+    cal = cal.sub(/cal\w+/,'').split(/\s+/).delete_if{|s| s=~/\A\s*\Z/}.map{|s| s.to_i}
+    hash = str.scan(
+      /((?:(?:reduced|full)_[pq]flux)|[pq]flux factor)([\deE\s.+-]+)/
+    ).inject({}){|h,(k,v)| 
+      arr = v.split(/\s+/).delete_if{|s| s=~/\A\s*\Z/}.map{|s| s.to_f}
+      h[k.gsub(/ /, '_')]=arr.pieces(arr.size>cal.size*3?2:3); h}
+    pp hash
+    hash[:calibration_jobs] = cal
+    new(hash)
+  end
+  attr_accessor :calibration_jobs
+  def initialize(hash)
+    hash.each{|k,v| instance_variable_set("@".to_sym + k, v)}
+  end
+  def pflux_graphkit(i)
+    #k = (0..0).to_a.map{|i|
+    k = GraphKit.quick_create([@calibration_jobs, raw_pflux_factor(i)], [(0...(@pflux_factor[i].size)).to_a, @pflux_factor[i]])
+    #}.sum
+    k.data.each{|dk| dk.gp.with = 'lp'}
+    k.data[1].title = 'factor'
+    k
+  end
+  def qflux_graphkit(i)
+    #k = (0..0).to_a.map{|i|
+    k = GraphKit.quick_create([@calibration_jobs, raw_qflux_factor(i)], [(0...(@qflux_factor[i].size)).to_a, @qflux_factor[i]])
+    #}.sum
+    k.data.each{|dk| dk.gp.with = 'lp'}
+    k.data[1].title = 'factor'
+    k
+  end
+  def raw_qflux_factor(i)
+    (@full_qflux[i].to_gslv/@reduced_qflux[i].to_gslv).to_a
+  end
+  def raw_pflux_factor(i)
+    (@full_pflux[i].to_gslv/@reduced_pflux[i].to_gslv).to_a
+  end
+end

data/lib/trinitycrmod/graphs.rb

@@ -124,6 +124,28 @@ class CodeRunner::Trinity
     end
 	end
 
+  # Graph of the ion heat calibration factor
+  def ion_hflux_calibration_graphkit(options)
+    calibs = Calib.analyse_file("#@directory/#@run_name.calib")
+    k = calibs.map{|c| c.qflux_graphkit(0)}.sum
+    k.ylabel = 'Qi'
+    k
+  end
+  # Graph of the electron heat calibration factor
+  def eln_hflux_calibration_graphkit(options)
+    calibs = Calib.analyse_file("#@directory/#@run_name.calib")
+    k = calibs.map{|c| c.qflux_graphkit(1)}.sum
+    k.ylabel = 'Qe'
+    k
+  end
+  # Graph of the particle flux calibration factor
+  def pflux_calibration_graphkit(options)
+    calibs = Calib.analyse_file("#@directory/#@run_name.calib")
+    k = calibs.map{|c| c.pflux_graphkit(1)}.sum
+    k.ylabel = 'Gamma'
+    k
+  end
+
 	include TrinityGraphKits
 
   module TrinityMultiKits
@@ -148,6 +170,19 @@ class CodeRunner::Trinity
       kit
 
     end
+    def calibration_graphkit(options)
+      kit = GraphKit::MultiKit.new(
+        [
+          ion_hflux_calibration_graphkit(options),
+          eln_hflux_calibration_graphkit(options),
+          pflux_calibration_graphkit(options)
+        ]
+      )
+      kit.gp.multiplot = "layout 2,2"
+      kit.gp.key = "tmargin"
+      kit
+    end
+
   end
 
   include TrinityMultiKits

data/lib/trinitycrmod/trinity.rb

@@ -24,6 +24,7 @@ class CodeRunner
     require 'trinitycrmod/check_parameters'
     require 'trinitycrmod/actual_parameter_values'
     require 'trinitycrmod/chease'
+    require 'trinitycrmod/calib'
 
     # Setup gs2 in case people are using it
     CodeRunner.setup_run_class('gs2')

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.6.7 ruby lib
+# stub: trinitycrmod 0.6.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.6.7"
+  s.version = "0.6.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-21"
+  s.date = "2015-02-22"
   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 = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/trinitycrmod.rb",
     "lib/trinitycrmod/actual_parameter_values.rb",
+    "lib/trinitycrmod/calib.rb",
     "lib/trinitycrmod/chease.rb",
     "lib/trinitycrmod/check_parameters.rb",
     "lib/trinitycrmod/deleted_variables.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -140,6 +140,7 @@ files:
 - VERSION
 - lib/trinitycrmod.rb
 - lib/trinitycrmod/actual_parameter_values.rb
+- lib/trinitycrmod/calib.rb
 - lib/trinitycrmod/chease.rb
 - lib/trinitycrmod/check_parameters.rb
 - lib/trinitycrmod/deleted_variables.rb