trinitycrmod 0.7.0 → 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/trinitycrmod/namelists.rb +18 -7
- data/lib/trinitycrmod/read_netcdf.rb +4 -2
- data/trinitycrmod.gemspec +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d90504584a62e7216eee2917390573860b12426d
|
|
4
|
+
data.tar.gz: c7059d24c91fc0a6d73a4a2f35c67fa421062ce7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 747fa52db5b5cdaac4555bc7721c460c5ba75cd1bc7a35878c126c9d8f9d77b3222e410a2a11fdff1b4ce54734e757c64062d6c6155479edb0364307b95e3c0a
|
|
7
|
+
data.tar.gz: 55857124b3639edebe7b2aa7d5b4fdaec02c86eff0bfa01054dfa2974ee8e71d28d42479c9e5c316f618a6a229f7c21ee8ef26a4aaabc646c48f0aecc81e4e2d
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.7.
|
|
1
|
+
0.7.1
|
|
@@ -912,20 +912,31 @@
|
|
|
912
912
|
:autoscanned_defaults=>["default"]},
|
|
913
913
|
:n_gpus=>
|
|
914
914
|
{:should_include=>"true",
|
|
915
|
-
:description=>"
|
|
916
|
-
:help=>
|
|
917
|
-
"If running with gryfx, specify the number of gpus, i.e. the number of simulataneous gryfx simulations.",
|
|
915
|
+
:description=>" For gryfx, number of avail gpus",
|
|
916
|
+
:help=>" For gryfx, number of avail gpus",
|
|
918
917
|
:code_name=>:n_gpus,
|
|
919
918
|
:must_pass=>
|
|
920
919
|
[{:test=>"kind_of? Integer",
|
|
921
920
|
:explanation=>"This variable must be an integer."}],
|
|
922
|
-
:type=>:Integer
|
|
921
|
+
:type=>:Integer,
|
|
922
|
+
:autoscanned_defaults=>[1]},
|
|
923
923
|
:flux_shell_script=>
|
|
924
924
|
{:should_include=>"true",
|
|
925
|
-
:description=>
|
|
926
|
-
:help=>
|
|
927
|
-
"When running with flux_option = shell, a shell script to calculate the fluxes that is executed during get fluxes.",
|
|
925
|
+
:description=>nil,
|
|
926
|
+
:help=>nil,
|
|
928
927
|
:code_name=>:flux_shell_script,
|
|
928
|
+
:must_pass=>
|
|
929
|
+
[{:test=>"kind_of? String",
|
|
930
|
+
:explanation=>"This variable must be a string."}],
|
|
931
|
+
:type=>:String,
|
|
932
|
+
:autoscanned_defaults=>[""]},
|
|
933
|
+
:replay_filename=>
|
|
934
|
+
{:should_include=>"true",
|
|
935
|
+
:description=>
|
|
936
|
+
"Name of the netcdf output file that contains the fluxes to be read.",
|
|
937
|
+
:help=>
|
|
938
|
+
"If running in replay mode, gives the filename of the trinity netcdf output file that contains the fluxes to be read.",
|
|
939
|
+
:code_name=>:replay_filename,
|
|
929
940
|
:must_pass=>
|
|
930
941
|
[{:test=>"kind_of? String",
|
|
931
942
|
:explanation=>"This variable must be a string."}],
|
|
@@ -58,6 +58,8 @@ class NetcdfSmartReader
|
|
|
58
58
|
hsh
|
|
59
59
|
}
|
|
60
60
|
narray = options[:modify_variable].call(varname, narray, myhsh)
|
|
61
|
+
elsif options[:invert_matrix]
|
|
62
|
+
narray = GSL::Linalg::LU.invert(narray.to_gm_view).to_na_ref
|
|
61
63
|
end
|
|
62
64
|
shape = narray.shape
|
|
63
65
|
shape.delete_if{|i| i==1}
|
|
@@ -99,14 +101,14 @@ class NetcdfSmartReader
|
|
|
99
101
|
|
|
100
102
|
def axiskit(variable, options)
|
|
101
103
|
case variable
|
|
102
|
-
when '
|
|
104
|
+
when 'mrow', 'mcol', 'ivar', 'tspec', 'iter', 'jac', 'grad'
|
|
103
105
|
return GraphKit::AxisKit.autocreate(data: GSL::Vector.linspace(1, sz=@file.dim(variable).length, sz), title: variable)
|
|
104
106
|
end
|
|
105
107
|
GraphKit::AxisKit.autocreate(data: read_variable(variable, options), units: @file.var(variable).att('units').get, title: @file.var(variable).att('description').get.sub(/(,|summed|average).*$/, '').sub(/[vV]alues of (the )?/, '').sub(/ coordinate/, ''))
|
|
106
108
|
end
|
|
107
109
|
def dimension_variable_name(n)
|
|
108
110
|
case n
|
|
109
|
-
when 't','tspec', 'iter', 'rad', 'cc', '
|
|
111
|
+
when 't','tspec', 'iter', 'rad', 'cc', 'mrow', 'mcol', 'ivar', 'jac', 'grad'
|
|
110
112
|
n
|
|
111
113
|
else
|
|
112
114
|
raise "Unknown dimension #{n}"
|
data/trinitycrmod.gemspec
CHANGED
|
@@ -2,16 +2,16 @@
|
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
|
5
|
-
# stub: trinitycrmod 0.7.
|
|
5
|
+
# stub: trinitycrmod 0.7.1 ruby lib
|
|
6
6
|
|
|
7
7
|
Gem::Specification.new do |s|
|
|
8
8
|
s.name = "trinitycrmod"
|
|
9
|
-
s.version = "0.7.
|
|
9
|
+
s.version = "0.7.1"
|
|
10
10
|
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
12
12
|
s.require_paths = ["lib"]
|
|
13
13
|
s.authors = ["Edmund Highcock"]
|
|
14
|
-
s.date = "2015-07-
|
|
14
|
+
s.date = "2015-07-15"
|
|
15
15
|
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."
|
|
16
16
|
s.email = "edmundhighcock@sourceforge.net"
|
|
17
17
|
s.extra_rdoc_files = [
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: trinitycrmod
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Edmund Highcock
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-07-
|
|
11
|
+
date: 2015-07-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: coderunner
|