trinitycrmod 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a98ed5cc8637ecc4f11c655d233dd213a0b9137
-  data.tar.gz: 6e146e4f704b23b93a456597f2bf0f2ab4def7af
+  metadata.gz: 925946bef2fe6280359f3a783817e14522af3f54
+  data.tar.gz: 4873cc314b7dcdcf90a47186aff8a8777b413e93
 SHA512:
-  metadata.gz: 381985e7fee4f9022dc05fa9e1a602c84f52f2824a4b1d01f241cc862ebfbcd226d97305a3b3ffab12ee45ad5b115ec6116445d51550f38f60cca381d02debb4
-  data.tar.gz: 4aba8a39ed39a865f51cba0cf8dc763fc1124414c65ebcac835069f4eacf94a8be03be73dbb3d7f32ec8b1353245123d7714ace888ab5edd13353d988eff8dd8
+  metadata.gz: 0e2339027e4df5fcc15c20425d5ccd306c88c1a4a8a9c5500e673f0be360443ffd40d8ff212b74afc5256c2570dcc59eed97defdc882ef56d1c4c4ef87d3d898
+  data.tar.gz: b262effae5368d5f5f1df30719dd279e39af88b1fffa3cd5737d6591607b8b3a831294de0e3701d6944667160bfb4f6cd6e2c22376f4cdbb7adddc63c9d17173

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.5

data/lib/trinitycrmod/namelists.rb

@@ -1215,44 +1215,50 @@
        :autoscanned_defaults=>["restart.itercalib"]},
      :rlni=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" initial R/Lni",
+       :help=>" initial R/Lni",
        :code_name=>:rlni,
        :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]},
      :rlne=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" initial R/Lne",
+       :help=>" initial R/Lne",
        :code_name=>:rlne,
        :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]},
      :niedge=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>
+        " initial ni offset. if positive, override init_option for dens",
+       :help=>" initial ni offset. if positive, override init_option for dens",
        :code_name=>:niedge,
        :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]},
      :needge=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>
+        " initial ne offset. if positive, override init_option for dens",
+       :help=>" initial ne offset. if positive, override init_option for dens",
        :code_name=>:needge,
        :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]}}},
  :sources=>
   {:description=>"",
    :should_include=>"true",
@@ -1502,24 +1508,39 @@
        :autoscanned_defaults=>[40.0]},
      :i_powerin_2=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" external secondary ion power input (in MW)",
+       :help=>" external secondary ion power input (in MW)",
        :code_name=>:i_powerin_2,
        :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=>[0.0]},
      :i_powerin_3=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" external tertiary ion power input (in MW)",
+       :help=>" external tertiary ion power input (in MW)",
        :code_name=>:i_powerin_3,
        :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=>[0.0]},
+     :dens_mult=>
+      {:should_include=>"true",
+       :description=>
+        " 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)",
+       :help=>
+        " 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)",
+       :code_name=>:dens_mult,
+       :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,
+       :autoscanned_defaults=>[1.0]}}},
  :physics=>
   {:description=>"",
    :should_include=>"true",
@@ -1583,61 +1604,70 @@
        :autoscanned_defaults=>[".true."]},
      :evolve_density=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" if true, evolve density profile(s)",
+       :help=>" if true, evolve density profile(s)",
        :code_name=>:evolve_density,
        :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."]},
      :evolve_temperature=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" if true, evolve temperature profile(s)",
+       :help=>" if true, evolve temperature profile(s)",
        :code_name=>:evolve_temperature,
        :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."]},
      :evolve_flow=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" if true, evolve toroidal angular momentum",
+       :help=>" if true, evolve toroidal angular momentum",
        :code_name=>:evolve_flow,
        :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."]},
      :te_equal_ti=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>
+        " if true, Te is set equal to Ti instead of being evolved",
+       :help=>" if true, Te is set equal to Ti instead of being evolved",
        :code_name=>:te_equal_ti,
        :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."]},
      :equal_ion_temps=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>
+        " if true, temperature of all ion species is assumed to be the same",
+       :help=>
+        " if true, temperature of all ion species is assumed to be the same",
        :code_name=>:equal_ion_temps,
        :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."]},
      :te_fixed=>
       {:should_include=>"true",
-       :description=>nil,
-       :help=>nil,
+       :description=>" if true, electron temperature stays at initial value",
+       :help=>" if true, electron temperature stays at initial value",
        :code_name=>:te_fixed,
        :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."]}}}}

data/lib/trinitycrmod/trinity.rb

@@ -382,6 +382,12 @@ class CodeRunner
     def generate_component_runs
       #puts "HERE"
       @component_runs ||= []
+      if @running
+        if existing = @runner.component_run_list.find{|r| r.real_id==@id}
+          @component_runs = existing.sort_by{|r| -r.id}
+          return
+        end
+      end
       if flux_gryfx? or flux_gs2?
         fclass = flux_class
 

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.8.3 ruby lib
+# stub: trinitycrmod 0.8.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trinitycrmod"
-  s.version = "0.8.3"
+  s.version = "0.8.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.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Edmund Highcock