trinitycrmod 0.5.4 → 0.5.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 +32 -19
- data/lib/trinitycrmod/trinity.rb +3 -1
- 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: 9857b0c81f740cfc21b3db62b4a56621f0a70a27
|
4
|
+
data.tar.gz: 9f103e1c753525bb9fe7318ca2c8c82a9f34b04f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b3f1b1121235ad7f70c69345b48fe21e81201216db1588439e0edd4316a1ec276f258311cd658c4d332053fe1a8639702329b0f041bf17b32ee0c12a429cc844
|
7
|
+
data.tar.gz: a3e61eb2f7365849b1244a2ff67c5d1fbb763c26192f9c56ca74f4f36c55c38c9ad398cc6b362586e1a41b44bb123ad20efe80e9d431465cefe94d7372369466
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.5.
|
1
|
+
0.5.5
|
@@ -857,36 +857,38 @@
|
|
857
857
|
:autoscanned_defaults=>[1.0]},
|
858
858
|
:ncc_calibrate=>
|
859
859
|
{:should_include=>"true",
|
860
|
-
:description=>
|
861
|
-
|
862
|
-
|
860
|
+
:description=>
|
861
|
+
" Number of flux tubes to use for calibration of reduced model",
|
862
|
+
:help=>" Number of flux tubes to use for calibration of reduced model",
|
863
863
|
:code_name=>:ncc_calibrate,
|
864
864
|
:must_pass=>
|
865
865
|
[{:test=>"kind_of? Integer",
|
866
866
|
:explanation=>"This variable must be an integer."}],
|
867
|
-
:type=>:Integer
|
867
|
+
:type=>:Integer,
|
868
|
+
:autoscanned_defaults=>[1]},
|
868
869
|
:neval_calibrate=>
|
869
870
|
{:should_include=>"true",
|
870
|
-
:description=>
|
871
|
+
:description=>
|
872
|
+
" Num. calls to get_fluxes between calibrations (set positive to activate)",
|
871
873
|
:help=>
|
872
|
-
"
|
874
|
+
" Num. calls to get_fluxes between calibrations (set positive to activate)",
|
873
875
|
:code_name=>:neval_calibrate,
|
874
876
|
:must_pass=>
|
875
877
|
[{:test=>"kind_of? Integer",
|
876
878
|
:explanation=>"This variable must be an integer."}],
|
877
|
-
:type=>:Integer
|
879
|
+
:type=>:Integer,
|
880
|
+
:autoscanned_defaults=>[-1]},
|
878
881
|
:match_gs2_species=>
|
879
882
|
{:should_include=>"true",
|
880
|
-
:description=>
|
881
|
-
|
882
|
-
:help=>
|
883
|
-
"If true, try to match gs2 species to trinity species by examining species properties. If false, gs2 species must be in the same order as trinity species.",
|
883
|
+
:description=>" If true, try to match gs2 species to ",
|
884
|
+
:help=>" If true, try to match gs2 species to ",
|
884
885
|
:code_name=>:match_gs2_species,
|
885
886
|
:must_pass=>
|
886
887
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
887
888
|
:explanation=>
|
888
889
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
889
|
-
:type=>:Fortran_Bool
|
890
|
+
:type=>:Fortran_Bool,
|
891
|
+
:autoscanned_defaults=>[".true."]}}},
|
890
892
|
:init=>
|
891
893
|
{:description=>"",
|
892
894
|
:should_include=>"true",
|
@@ -1096,27 +1098,38 @@
|
|
1096
1098
|
:autoscanned_defaults=>["nproc/njobs"]},
|
1097
1099
|
:dyn_load_balance=>
|
1098
1100
|
{:should_include=>"true",
|
1099
|
-
:description=>
|
1100
|
-
|
1101
|
-
|
1101
|
+
:description=>
|
1102
|
+
" set to true to dynamically reallocate processes at runtime",
|
1103
|
+
:help=>" set to true to dynamically reallocate processes at runtime",
|
1102
1104
|
:code_name=>:dyn_load_balance,
|
1103
1105
|
:must_pass=>
|
1104
1106
|
[{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
|
1105
1107
|
:explanation=>
|
1106
1108
|
"This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
|
1107
|
-
:type=>:Fortran_Bool
|
1109
|
+
:type=>:Fortran_Bool,
|
1110
|
+
:autoscanned_defaults=>[".false.", ".true."]},
|
1108
1111
|
:peaking_factor=>
|
1109
1112
|
{:should_include=>"true",
|
1110
1113
|
:description=>
|
1111
|
-
"
|
1114
|
+
" If >0 then changes peaking of profiles (1.0 leaves profs unchanged)",
|
1112
1115
|
:help=>
|
1113
|
-
"
|
1116
|
+
" If >0 then changes peaking of profiles (1.0 leaves profs unchanged)",
|
1114
1117
|
:code_name=>:peaking_factor,
|
1115
1118
|
:must_pass=>
|
1116
1119
|
[{:test=>"kind_of? Numeric",
|
1117
1120
|
:explanation=>
|
1118
1121
|
"This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
|
1119
|
-
:type=>:Float
|
1122
|
+
:type=>:Float,
|
1123
|
+
:autoscanned_defaults=>[-1.0]},
|
1124
|
+
:itercalib_file=>
|
1125
|
+
{:should_include=>"true",
|
1126
|
+
:description=>"Name of file with calibration restart information.",
|
1127
|
+
:help=>"Name of file with calibration restart information.",
|
1128
|
+
:code_name=>:itercalib_file,
|
1129
|
+
:must_pass=>
|
1130
|
+
[{:test=>"kind_of? String",
|
1131
|
+
:explanation=>"This variable must be a string."}],
|
1132
|
+
:type=>:String}}},
|
1120
1133
|
:sources=>
|
1121
1134
|
{:description=>"",
|
1122
1135
|
:should_include=>"true",
|
data/lib/trinitycrmod/trinity.rb
CHANGED
@@ -112,6 +112,7 @@ class CodeRunner
|
|
112
112
|
new_run.init_option = "restart"
|
113
113
|
new_run.iternt_file = @run_name + ".iternt"
|
114
114
|
new_run.iterflx_file = @run_name + ".iterflx"
|
115
|
+
new_run.itercalib_file = @run_name + ".itercalib"
|
115
116
|
new_run.init_file = @run_name + ".tmp"
|
116
117
|
@runner.nprocs = @nprocs if @runner.nprocs == "1" # 1 is the default so this means the user probably didn't specify nprocs
|
117
118
|
# This is unnecessary for single restart file.
|
@@ -127,7 +128,8 @@ class CodeRunner
|
|
127
128
|
new_run.run_name += '_t'
|
128
129
|
eputs 'Copying Trinity Restart files', ''
|
129
130
|
#system "ls #@directory"
|
130
|
-
['iternt', 'iterflx', 'tmp'].each do |ext|
|
131
|
+
['iternt', 'iterflx', 'tmp', 'itercalib'].each do |ext|
|
132
|
+
next if ext=='itercalib' and not FileTest.exist?("#@directory/#@run_name.#{ext}")
|
131
133
|
FileUtils.cp("#@directory/#@run_name.#{ext}", "#{new_run.directory}/.")
|
132
134
|
end
|
133
135
|
if new_run.flux_option == "gs2" and @flux_option == "gs2" and not new_run.no_restart_gs2
|
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.5.
|
5
|
+
# stub: trinitycrmod 0.5.5 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "trinitycrmod"
|
9
|
-
s.version = "0.5.
|
9
|
+
s.version = "0.5.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"]
|