trinitycrmod 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8d7d9cf9529283fc52bceac1cab24670502094
-  data.tar.gz: acf2a208a53b90eed4e1abe25e679fd08f2f4408
+  metadata.gz: d7919944687c2fa43e8d3b38cf2b5717467fa134
+  data.tar.gz: d3faffc05009a3eebce02705c45879bff7dfc773
 SHA512:
-  metadata.gz: e2c24f3684d4a53bb37561177a1a7f4689b17ab3641e9de9aff536822253df5fcf78ce12a29e6563787505b0aefb596605d26b7e09decb945ac6ceef0cc24b97
-  data.tar.gz: 510cac280af8ffbb5af6885a2b76d3a6afeb43e81a57da7137071d0d063de6d5fbe052422fd10d5cbaad708d0bc61f1db8bb30823905ee1b266fb3fd8a5026bf
+  metadata.gz: 3b625be1b551fb5288ac56ea7b9007f55392938050d74a7a667284eebb4d4d00ca9545713dcac980515423b9690d27df5f3dfb5774afca9a1d35e797ef011b3f
+  data.tar.gz: 4b677fad6c7d7afde623f5d61a0420417de1167028964a3cf0d7d8c63b268395ddf0e6c483e803940819ada85ec28bc0537f4f77485fc83ee6e289147a7d0776

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.9

data/lib/trinitycrmod/graphs.rb

@@ -153,24 +153,51 @@ class CodeRunner::Trinity
     def profiles_graphkit(options)
       kit = GraphKit::MultiKit.new(
         [
-          ion_temp_prof_graphkit(options),
-          eln_temp_prof_graphkit(options),
-          dens_prof_graphkit(options),
-          ang_mom_prof_graphkit(options)
+          #ion_temp_prof_graphkit(options),
+          #eln_temp_prof_graphkit(options),
+          #dens_prof_graphkit(options),
+          #ang_mom_prof_graphkit(options)
+          smart_graphkit(options.absorb graphkit_name: 'nc_temp_grid', tspec_index: 2),
+          smart_graphkit(options.absorb graphkit_name: 'nc_temp_grid', tspec_index: 1),
+          smart_graphkit(options.absorb graphkit_name: 'nc_dens_grid', tspec_index: 1),
+          smart_graphkit(options.absorb graphkit_name: 'nc_omega_grid'),
       ]
       )
+      kit.each{|k| k.title = "nil"; k.gp.key = "off"}
+      kit[0].ylabel = "Ion Temp (keV)"
+      kit[1].ylabel = "Electron Temp (keV)"
+      kit[2].ylabel = "Electron Dens (10^20 m^-3)"
+      kit[3].ylabel = "Toroidal Rotation (rad s^-1)"
       kit.each{|k| k.title = nil}
-      if options[:horizontal]
-        kit.slice(0..2).each{|k| k.xlabel = nil; k.gp.xtics = "format ''"}
-        kit[3].gp.xtics = 'format "%2.1f"'
-      else
-        kit.values_at(0,2).each{|k| k.xlabel = nil; k.gp.xtics = "format ''"}
+      #if options[:horizontal]
+        #kit.slice(0..2).each{|k| k.xlabel = nil; k.gp.xtics = "format ''"}
+        #kit[3].gp.xtics = 'format "%2.1f"'
+      #else
+        #kit.values_at(0,2).each{|k| k.xlabel = nil; k.gp.xtics = "format ''"}
         kit.gp.multiplot = "layout 2,2"
-        kit.gp.key = "tmargin"
-      end
+        #kit[1].gp.key = "top"
+        kit[0].xlabel = nil
+        kit[1].xlabel = nil
+      #end
       kit
 
     end
+    def geometry_graphkit(options)
+      kit = GraphKit::MultiKit.new(
+        [
+          smart_graphkit(options.absorb graphkit_name: 'nc_area_grid'),
+          smart_graphkit(options.absorb graphkit_name: 'nc_qval_grid'),
+          smart_graphkit(options.absorb graphkit_name: 'nc_shat_grid'),
+          smart_graphkit(options.absorb graphkit_name: 'nc_kappa_grid'),
+          smart_graphkit(options.absorb graphkit_name: 'nc_kapprim_grid'),
+          smart_graphkit(options.absorb graphkit_name: 'nc_delta_grid'),
+          smart_graphkit(options.absorb graphkit_name: 'nc_deltprim_grid'),
+        ]
+      )
+      kit.each{|k| k.ylabel.sub!(/\(inout.*/, ''); k.gp.key="off"; k.title=nil}
+      kit.gp.multiplot = "layout 2,4"
+      kit
+    end
     def calibration_graphkit(options)
       kit = GraphKit::MultiKit.new(
         [

data/lib/trinitycrmod/read_netcdf.rb

@@ -133,6 +133,7 @@ class NetcdfSmartReader
     opts.delete(:graphkit_name)
     #kit.data[0].title += " with options: " + opts.to_s
     kit.data[0].title += " " + opts.to_s.gsub(/_(index|element)/, '')
+    kit.data[0].gp.with = "lp"
     if kit.zlabel
       kit.zlabel = "'#{kit.zlabel}' rotate by 90"
       #kit.zlabel = nil

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.8.8 ruby lib
+# stub: trinitycrmod 0.8.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   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 = "2016-02-29"
+  s.date = "2016-03-19"
   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 = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/edmundhighcock/trinitycrmod"
   s.licenses = ["GPLv3"]
-  s.rubygems_version = "2.2.0"
+  s.rubygems_version = "2.4.8"
   s.summary = "CodeRunner module for the Trinity simulation software."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: CodeRunner module for the Trinity simulation software.