trinitycrmod 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77964126d573cc9049d3cbd59d288bea65caa039
-  data.tar.gz: fc8023b31db6fd017ddc5a5c3a4a19eab94a748e
+  metadata.gz: 9857b0c81f740cfc21b3db62b4a56621f0a70a27
+  data.tar.gz: 9f103e1c753525bb9fe7318ca2c8c82a9f34b04f
 SHA512:
-  metadata.gz: 0396359b0204b2a96ee73ee5cd646cc99e6fa5ad052c2d278f5c3c57973de3dc5733de653aa389704a78abd771743e8bdcbf29667834e17f7e6b54661cfe9c68
-  data.tar.gz: 1d4e5185c2f5bb5a6b40af491908aa80af4d19c0c05af1a436c95d807610d719d80963f909696fe1ff69b4df0b7640d282390fff7577fb3cb7003a5662ee14db
+  metadata.gz: b3f1b1121235ad7f70c69345b48fe21e81201216db1588439e0edd4316a1ec276f258311cd658c4d332053fe1a8639702329b0f041bf17b32ee0c12a429cc844
+  data.tar.gz: a3e61eb2f7365849b1244a2ff67c5d1fbb763c26192f9c56ca74f4f36c55c38c9ad398cc6b362586e1a41b44bb123ad20efe80e9d431465cefe94d7372369466

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/trinitycrmod/namelists.rb

@@ -857,36 +857,38 @@
        :autoscanned_defaults=>[1.0]},
      :ncc_calibrate=>
       {:should_include=>"true",
-       :description=>"Number of calibration jobs.",
-       :help=>
-        "Number of calibration jobs. Minimum 1, maximum number of cell centers. Only applies when neval_calibrate > 0.",
+       :description=>
+        " Number of flux tubes to use for calibration of reduced model",
+       :help=>" Number of flux tubes to use for calibration of reduced model",
        :code_name=>:ncc_calibrate,
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
-       :type=>:Integer},
+       :type=>:Integer,
+       :autoscanned_defaults=>[1]},
      :neval_calibrate=>
       {:should_include=>"true",
-       :description=>"Number of flux evaluations between recalibrations.",
+       :description=>
+        " Num. calls to get_fluxes between calibrations (set positive to activate)",
        :help=>
-        "Number of flux evaluations between recalibrations. Set > 0 to trigger calibration mode.",
+        " Num. calls to get_fluxes between calibrations (set positive to activate)",
        :code_name=>:neval_calibrate,
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
-       :type=>:Integer},
+       :type=>:Integer,
+       :autoscanned_defaults=>[-1]},
      :match_gs2_species=>
       {:should_include=>"true",
-       :description=>
-        "If true, try to match gs2 species to trinity species by examining species properties.",
-       :help=>
-        "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.",
+       :description=>" If true, try to match gs2 species to ",
+       :help=>" If true, try to match gs2 species to ",
        :code_name=>:match_gs2_species,
        :must_pass=>
         [{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
           :explanation=>
            "This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
-       :type=>:Fortran_Bool}}},
+       :type=>:Fortran_Bool,
+       :autoscanned_defaults=>[".true."]}}},
  :init=>
   {:description=>"",
    :should_include=>"true",
@@ -1096,27 +1098,38 @@
        :autoscanned_defaults=>["nproc/njobs"]},
      :dyn_load_balance=>
       {:should_include=>"true",
-       :description=>"Activate dynamic load balancing for gs2.",
-       :help=>
-        "Activate dynamic load balancing for gs2. Jobs which fail to converge are given successively larger proportions of processors.",
+       :description=>
+        " set to true to dynamically reallocate processes at runtime",
+       :help=>" set to true to dynamically reallocate processes at runtime",
        :code_name=>:dyn_load_balance,
        :must_pass=>
         [{:test=>"kind_of? String and FORTRAN_BOOLS.include? self",
           :explanation=>
            "This variable must be a fortran boolean. (In Ruby this is represented as a string: e.g. '.true.')"}],
-       :type=>:Fortran_Bool},
+       :type=>:Fortran_Bool,
+       :autoscanned_defaults=>[".false.", ".true."]},
      :peaking_factor=>
       {:should_include=>"true",
        :description=>
-        "Experimental. Enhance all gradients. Negative off, 1.0 no change.",
+        " If >0 then changes peaking of profiles (1.0 leaves profs unchanged)",
        :help=>
-        "Experimental. Enhance the peakedness, i.e. the gradient, of all profiles. Negative off, 1.0 no change.",
+        " If >0 then changes peaking of profiles (1.0 leaves profs unchanged)",
        :code_name=>:peaking_factor,
        :must_pass=>
         [{:test=>"kind_of? Numeric",
           :explanation=>
            "This variable must be a floating point number (an integer is also acceptable: it will be converted into a floating point number)."}],
-       :type=>:Float}}},
+       :type=>:Float,
+       :autoscanned_defaults=>[-1.0]},
+     :itercalib_file=>
+      {:should_include=>"true",
+       :description=>"Name of file with calibration restart information.",
+       :help=>"Name of file with calibration restart information.",
+       :code_name=>:itercalib_file,
+       :must_pass=>
+        [{:test=>"kind_of? String",
+          :explanation=>"This variable must be a string."}],
+       :type=>:String}}},
  :sources=>
   {:description=>"",
    :should_include=>"true",

data/lib/trinitycrmod/trinity.rb

@@ -112,6 +112,7 @@ class CodeRunner
 			new_run.init_option = "restart"
 			new_run.iternt_file = @run_name + ".iternt"
 			new_run.iterflx_file = @run_name + ".iterflx"
+			new_run.itercalib_file = @run_name + ".itercalib"
 			new_run.init_file = @run_name + ".tmp"
 			@runner.nprocs = @nprocs if @runner.nprocs == "1" # 1 is the default so this means the user probably didn't specify nprocs 
       # This is unnecessary for single restart file.
@@ -127,7 +128,8 @@ class CodeRunner
 			new_run.run_name += '_t'
 			eputs 'Copying Trinity Restart files', ''
 			#system "ls #@directory"
-			['iternt', 'iterflx', 'tmp'].each do |ext|
+			['iternt', 'iterflx', 'tmp', 'itercalib'].each do |ext|
+        next if ext=='itercalib' and not FileTest.exist?("#@directory/#@run_name.#{ext}")
 				FileUtils.cp("#@directory/#@run_name.#{ext}", "#{new_run.directory}/.")
 			end
 			if new_run.flux_option == "gs2" and @flux_option == "gs2" and not new_run.no_restart_gs2

data/trinitycrmod.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trinitycrmod 0.5.4 ruby lib
+# stub: trinitycrmod 0.5.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trinitycrmod
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Edmund Highcock