trinitycrmod 0.8.3 → 0.8.5
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/namelists.rb +66 -36
- data/lib/trinitycrmod/trinity.rb +6 -0
- data/trinitycrmod.gemspec +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 925946bef2fe6280359f3a783817e14522af3f54
|
4
|
+
data.tar.gz: 4873cc314b7dcdcf90a47186aff8a8777b413e93
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0e2339027e4df5fcc15c20425d5ccd306c88c1a4a8a9c5500e673f0be360443ffd40d8ff212b74afc5256c2570dcc59eed97defdc882ef56d1c4c4ef87d3d898
|
7
|
+
data.tar.gz: b262effae5368d5f5f1df30719dd279e39af88b1fffa3cd5737d6591607b8b3a831294de0e3701d6944667160bfb4f6cd6e2c22376f4cdbb7adddc63c9d17173
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.8.
|
1
|
+
0.8.5
|
@@ -1215,44 +1215,50 @@
|
|
1215
1215
|
:autoscanned_defaults=>["restart.itercalib"]},
|
1216
1216
|
:rlni=>
|
1217
1217
|
{:should_include=>"true",
|
1218
|
-
:description=>
|
1219
|
-
:help=>
|
1218
|
+
:description=>" initial R/Lni",
|
1219
|
+
:help=>" initial R/Lni",
|
1220
1220
|
:code_name=>:rlni,
|
1221
1221
|
:must_pass=>
|
1222
1222
|
[{:test=>"kind_of? Numeric",
|
1223
1223
|
:explanation=>
|
1224
1224
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1225
|
-
:type=>:Float
|
1225
|
+
:type=>:Float,
|
1226
|
+
:autoscanned_defaults=>[1.0]},
|
1226
1227
|
:rlne=>
|
1227
1228
|
{:should_include=>"true",
|
1228
|
-
:description=>
|
1229
|
-
:help=>
|
1229
|
+
:description=>" initial R/Lne",
|
1230
|
+
:help=>" initial R/Lne",
|
1230
1231
|
:code_name=>:rlne,
|
1231
1232
|
:must_pass=>
|
1232
1233
|
[{:test=>"kind_of? Numeric",
|
1233
1234
|
:explanation=>
|
1234
1235
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1235
|
-
:type=>:Float
|
1236
|
+
:type=>:Float,
|
1237
|
+
:autoscanned_defaults=>[1.0]},
|
1236
1238
|
:niedge=>
|
1237
1239
|
{:should_include=>"true",
|
1238
|
-
:description=>
|
1239
|
-
|
1240
|
+
:description=>
|
1241
|
+
" initial ni offset. if positive, override init_option for dens",
|
1242
|
+
:help=>" initial ni offset. if positive, override init_option for dens",
|
1240
1243
|
:code_name=>:niedge,
|
1241
1244
|
:must_pass=>
|
1242
1245
|
[{:test=>"kind_of? Numeric",
|
1243
1246
|
:explanation=>
|
1244
1247
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1245
|
-
:type=>:Float
|
1248
|
+
:type=>:Float,
|
1249
|
+
:autoscanned_defaults=>[-1.0]},
|
1246
1250
|
:needge=>
|
1247
1251
|
{:should_include=>"true",
|
1248
|
-
:description=>
|
1249
|
-
|
1252
|
+
:description=>
|
1253
|
+
" initial ne offset. if positive, override init_option for dens",
|
1254
|
+
:help=>" initial ne offset. if positive, override init_option for dens",
|
1250
1255
|
:code_name=>:needge,
|
1251
1256
|
:must_pass=>
|
1252
1257
|
[{:test=>"kind_of? Numeric",
|
1253
1258
|
:explanation=>
|
1254
1259
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1255
|
-
:type=>:Float
|
1260
|
+
:type=>:Float,
|
1261
|
+
:autoscanned_defaults=>[-1.0]}}},
|
1256
1262
|
:sources=>
|
1257
1263
|
{:description=>"",
|
1258
1264
|
:should_include=>"true",
|
@@ -1502,24 +1508,39 @@
|
|
1502
1508
|
:autoscanned_defaults=>[40.0]},
|
1503
1509
|
:i_powerin_2=>
|
1504
1510
|
{:should_include=>"true",
|
1505
|
-
:description=>
|
1506
|
-
:help=>
|
1511
|
+
:description=>" external secondary ion power input (in MW)",
|
1512
|
+
:help=>" external secondary ion power input (in MW)",
|
1507
1513
|
:code_name=>:i_powerin_2,
|
1508
1514
|
:must_pass=>
|
1509
1515
|
[{:test=>"kind_of? Numeric",
|
1510
1516
|
:explanation=>
|
1511
1517
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1512
|
-
:type=>:Float
|
1518
|
+
:type=>:Float,
|
1519
|
+
:autoscanned_defaults=>[0.0]},
|
1513
1520
|
:i_powerin_3=>
|
1514
1521
|
{:should_include=>"true",
|
1515
|
-
:description=>
|
1516
|
-
:help=>
|
1522
|
+
:description=>" external tertiary ion power input (in MW)",
|
1523
|
+
:help=>" external tertiary ion power input (in MW)",
|
1517
1524
|
:code_name=>:i_powerin_3,
|
1518
1525
|
:must_pass=>
|
1519
1526
|
[{:test=>"kind_of? Numeric",
|
1520
1527
|
:explanation=>
|
1521
1528
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1522
|
-
:type=>:Float
|
1529
|
+
:type=>:Float,
|
1530
|
+
:autoscanned_defaults=>[0.0]},
|
1531
|
+
:dens_mult=>
|
1532
|
+
{:should_include=>"true",
|
1533
|
+
:description=>
|
1534
|
+
" multiplies overall density source when using the tokamak profile db, may not be self consistent when using TORQ for torque input (as opposed to pioq)",
|
1535
|
+
:help=>
|
1536
|
+
" multiplies overall density source when using the tokamak profile db, may not be self consistent when using TORQ for torque input (as opposed to pioq)",
|
1537
|
+
:code_name=>:dens_mult,
|
1538
|
+
:must_pass=>
|
1539
|
+
[{:test=>"kind_of? Numeric",
|
1540
|
+
:explanation=>
|
1541
|
+
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1542
|
+
:type=>:Float,
|
1543
|
+
:autoscanned_defaults=>[1.0]}}},
|
1523
1544
|
:physics=>
|
1524
1545
|
{:description=>"",
|
1525
1546
|
:should_include=>"true",
|
@@ -1583,61 +1604,70 @@
|
|
1583
1604
|
:autoscanned_defaults=>[".true."]},
|
1584
1605
|
:evolve_density=>
|
1585
1606
|
{:should_include=>"true",
|
1586
|
-
:description=>
|
1587
|
-
:help=>
|
1607
|
+
:description=>" if true, evolve density profile(s)",
|
1608
|
+
:help=>" if true, evolve density profile(s)",
|
1588
1609
|
:code_name=>:evolve_density,
|
1589
1610
|
:must_pass=>
|
1590
1611
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1591
1612
|
:explanation=>
|
1592
1613
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1593
|
-
:type=>:Fortran_Bool
|
1614
|
+
:type=>:Fortran_Bool,
|
1615
|
+
:autoscanned_defaults=>[".true."]},
|
1594
1616
|
:evolve_temperature=>
|
1595
1617
|
{:should_include=>"true",
|
1596
|
-
:description=>
|
1597
|
-
:help=>
|
1618
|
+
:description=>" if true, evolve temperature profile(s)",
|
1619
|
+
:help=>" if true, evolve temperature profile(s)",
|
1598
1620
|
:code_name=>:evolve_temperature,
|
1599
1621
|
:must_pass=>
|
1600
1622
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1601
1623
|
:explanation=>
|
1602
1624
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1603
|
-
:type=>:Fortran_Bool
|
1625
|
+
:type=>:Fortran_Bool,
|
1626
|
+
:autoscanned_defaults=>[".true."]},
|
1604
1627
|
:evolve_flow=>
|
1605
1628
|
{:should_include=>"true",
|
1606
|
-
:description=>
|
1607
|
-
:help=>
|
1629
|
+
:description=>" if true, evolve toroidal angular momentum",
|
1630
|
+
:help=>" if true, evolve toroidal angular momentum",
|
1608
1631
|
:code_name=>:evolve_flow,
|
1609
1632
|
:must_pass=>
|
1610
1633
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1611
1634
|
:explanation=>
|
1612
1635
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1613
|
-
:type=>:Fortran_Bool
|
1636
|
+
:type=>:Fortran_Bool,
|
1637
|
+
:autoscanned_defaults=>[".false."]},
|
1614
1638
|
:te_equal_ti=>
|
1615
1639
|
{:should_include=>"true",
|
1616
|
-
:description=>
|
1617
|
-
|
1640
|
+
:description=>
|
1641
|
+
" if true, Te is set equal to Ti instead of being evolved",
|
1642
|
+
:help=>" if true, Te is set equal to Ti instead of being evolved",
|
1618
1643
|
:code_name=>:te_equal_ti,
|
1619
1644
|
:must_pass=>
|
1620
1645
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1621
1646
|
:explanation=>
|
1622
1647
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1623
|
-
:type=>:Fortran_Bool
|
1648
|
+
:type=>:Fortran_Bool,
|
1649
|
+
:autoscanned_defaults=>[".false."]},
|
1624
1650
|
:equal_ion_temps=>
|
1625
1651
|
{:should_include=>"true",
|
1626
|
-
:description=>
|
1627
|
-
|
1652
|
+
:description=>
|
1653
|
+
" if true, temperature of all ion species is assumed to be the same",
|
1654
|
+
:help=>
|
1655
|
+
" if true, temperature of all ion species is assumed to be the same",
|
1628
1656
|
:code_name=>:equal_ion_temps,
|
1629
1657
|
:must_pass=>
|
1630
1658
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1631
1659
|
:explanation=>
|
1632
1660
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1633
|
-
:type=>:Fortran_Bool
|
1661
|
+
:type=>:Fortran_Bool,
|
1662
|
+
:autoscanned_defaults=>[".true."]},
|
1634
1663
|
:te_fixed=>
|
1635
1664
|
{:should_include=>"true",
|
1636
|
-
:description=>
|
1637
|
-
:help=>
|
1665
|
+
:description=>" if true, electron temperature stays at initial value",
|
1666
|
+
:help=>" if true, electron temperature stays at initial value",
|
1638
1667
|
:code_name=>:te_fixed,
|
1639
1668
|
:must_pass=>
|
1640
1669
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1641
1670
|
:explanation=>
|
1642
1671
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1643
|
-
:type=>:Fortran_Bool
|
1672
|
+
:type=>:Fortran_Bool,
|
1673
|
+
:autoscanned_defaults=>[".false."]}}}}
|
data/lib/trinitycrmod/trinity.rb
CHANGED
@@ -382,6 +382,12 @@ class CodeRunner
|
|
382
382
|
def generate_component_runs
|
383
383
|
#puts "HERE"
|
384
384
|
@component_runs ||= []
|
385
|
+
if @running
|
386
|
+
if existing = @runner.component_run_list.find{|r| r.real_id==@id}
|
387
|
+
@component_runs = existing.sort_by{|r| -r.id}
|
388
|
+
return
|
389
|
+
end
|
390
|
+
end
|
385
391
|
if flux_gryfx? or flux_gs2?
|
386
392
|
fclass = flux_class
|
387
393
|
|
data/trinitycrmod.gemspec
CHANGED
@@ -2,11 +2,11 @@
|
|
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.5 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.5"
|
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"]
|