trinitycrmod 0.8.0 → 0.8.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/trinitycrmod/actual_parameter_values.rb +18 -0
- data/lib/trinitycrmod/trinity.rb +25 -12
- 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: 6a2373f7b753a2f744b9a07cb5adc7cd9bdd7d3f
|
4
|
+
data.tar.gz: 1e645ec0276738e7001b17e75821d9009a72a77c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 230a9fe8131f2bdfbab61d7536837b5b2f919d4c3a27aec157355165468addf26462ba2940f4353f589bd2adfb034a0e75a8b30f55a24ef25d7ad82bfa0dacd2
|
7
|
+
data.tar.gz: a8cd710412b60378313da3426441fe4b9e453183db73c205bae386455a3691025e6cb9fd3a7cf5fde1e0c660f14ba86db556bd33d1d1db93e86250a76562c903
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.8.
|
1
|
+
0.8.1
|
@@ -13,6 +13,24 @@ class CodeRunner::Trinity
|
|
13
13
|
def fork_flag_actual
|
14
14
|
@fork_flag or ".true."
|
15
15
|
end
|
16
|
+
def evolve_temperature_actual
|
17
|
+
@evolve_temperature or ".true."
|
18
|
+
end
|
19
|
+
def evolve_density_actual
|
20
|
+
@evolve_density or ".true."
|
21
|
+
end
|
22
|
+
def evolve_flow_actual
|
23
|
+
@evolve_flow or ".false."
|
24
|
+
end
|
25
|
+
def equal_ion_temps_actual
|
26
|
+
@equal_ion_temps or ".true."
|
27
|
+
end
|
28
|
+
def te_fixed_actual
|
29
|
+
@te_fixed or ".false."
|
30
|
+
end
|
31
|
+
def te_equal_ti_actual
|
32
|
+
@te_equal_ti or ".false."
|
33
|
+
end
|
16
34
|
end
|
17
35
|
include ActualParameterValues
|
18
36
|
end
|
data/lib/trinitycrmod/trinity.rb
CHANGED
@@ -247,18 +247,31 @@ class CodeRunner
|
|
247
247
|
# The number of separate flux tube results needed for the jacobian
|
248
248
|
def n_flux_tubes_jac
|
249
249
|
d1 = dflx_stencil_actual - 1
|
250
|
-
ngrads =d1 * case @grad_option
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
250
|
+
ngrads = d1 * case @grad_option
|
251
|
+
when nil
|
252
|
+
n = 0
|
253
|
+
n = n + @nspec-1 if (evolve_density_actual.fortran_true?)
|
254
|
+
if (evolve_temperature_actual.fortran_true?)
|
255
|
+
if (equal_ion_temps_actual.fortran_true?) then
|
256
|
+
n = n + 1
|
257
|
+
else
|
258
|
+
n = n + n_ion_spec
|
259
|
+
end
|
260
|
+
n=n+1 if (te_equal_ti_actual.fortran_false? and te_fixed_actual.fortran_false?)
|
261
|
+
n = n + 1 if (evolve_flow_actual.fortran_true?)
|
262
|
+
end
|
263
|
+
n
|
264
|
+
when "tigrad", "ngrad", "lgrad"
|
265
|
+
1
|
266
|
+
when "tgrads"
|
267
|
+
2
|
268
|
+
when "ltgrads", "ntgrads"
|
269
|
+
3
|
270
|
+
when "all"
|
271
|
+
4
|
272
|
+
else
|
273
|
+
raise "unknown grad_option: #@grad_option"
|
274
|
+
end
|
262
275
|
if evolve_grads_only_actual.fortran_true?
|
263
276
|
njac = ngrads + 1
|
264
277
|
else
|
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.8.
|
5
|
+
# stub: trinitycrmod 0.8.1 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "trinitycrmod"
|
9
|
-
s.version = "0.8.
|
9
|
+
s.version = "0.8.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-09-
|
14
|
+
s.date = "2015-09-28"
|
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.8.
|
4
|
+
version: 0.8.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-09-
|
11
|
+
date: 2015-09-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: coderunner
|