lib/trinitycrmod/namelists.rb in trinitycrmod-0.8.7 vs lib/trinitycrmod/namelists.rb in trinitycrmod-0.8.8

@@ -9,11 +9,11 @@
        :code_name=>:geo_option,
        :must_pass=>
         [{:test=>"kind_of? String",
           :explanation=>"This variable must be a string."}],
        :type=>:String,
-       :autoscanned_defaults=>["analytic", "default"]},
+       :autoscanned_defaults=>["default"]},
      :geo_file=>
       {:should_include=>"true",
        :description=>" file with input data",
        :help=>" file with input data",
        :code_name=>:geo_file,
@@ -41,21 +41,21 @@
        :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=>[0.8, 0.95]},
+       :autoscanned_defaults=>[0.95]},
      :nrad=>
       {:should_include=>"true",
        :description=>" number of radial grid points",
        :help=>" number of radial grid points",
        :code_name=>:nrad,
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
        :type=>:Integer,
-       :autoscanned_defaults=>[8, 9]},
+       :autoscanned_defaults=>[9]},
      :bt_in=>
       {:should_include=>"true",
        :description=>
         " if bt_in > 0.0 and overwrite_db_input=T, set bmag = bt_in (B-field strength in Tesla)",
        :help=>
@@ -174,11 +174,11 @@
        :code_name=>:fluxlabel_option,
        :must_pass=>
         [{:test=>"kind_of? String",
           :explanation=>"This variable must be a string."}],
        :type=>:String,
-       :autoscanned_defaults=>["aminor", "default"]},
+       :autoscanned_defaults=>["default"]},
      :phia_in=>
       {:should_include=>"true",
        :description=>
         " if phia_in > 0.0 and overwrite_db_input=T, set psitor_a = phia_in (psitor_a is sqrt(tor flux) at separatrix)",
        :help=>
@@ -287,11 +287,11 @@
        :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, 1.0]},
+       :autoscanned_defaults=>[-1.0]},
      :mi=>
       {:should_include=>"true",
        :description=>
         " old variable for primary ion species mass (kept for backward compatibility)",
        :help=>
@@ -300,11 +300,11 @@
        :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, 1.0]},
+       :autoscanned_defaults=>[-1.0]},
      :zeff_in=>
       {:should_include=>"true",
        :description=>" effective charge",
        :help=>" effective charge",
        :code_name=>:zeff_in,
@@ -476,11 +476,11 @@
        :code_name=>:ntstep,
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
        :type=>:Integer,
-       :autoscanned_defaults=>[10, 20]},
+       :autoscanned_defaults=>[20]},
      :niter=>
       {:should_include=>"true",
        :description=>" max number of newton iterations per time step",
        :help=>" max number of newton iterations per time step",
        :code_name=>:niter,
@@ -497,11 +497,11 @@
        :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=>[0.01, 0.2]},
+       :autoscanned_defaults=>[0.01]},
      :ntdelt_max=>
       {:should_include=>"true",
        :description=>" maximum size of transport time step",
        :help=>" maximum size of transport time step",
        :code_name=>:ntdelt_max,
@@ -531,22 +531,22 @@
        :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=>[0.2, 1.0]},
+       :autoscanned_defaults=>[0.2]},
      :errflr=>
       {:should_include=>"true",
        :description=>" relative error below which we stop iterating",
        :help=>" relative error below which we stop iterating",
        :code_name=>:errflr,
        :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=>[0.005, 0.03]},
+       :autoscanned_defaults=>[0.005]},
      :flrfac=>
       {:should_include=>"true",
        :description=>
         " if relative error below errflr/flrfac, decrease ntdelt by factor of 2",
        :help=>
@@ -555,22 +555,33 @@
        :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, 2.0]},
+       :autoscanned_defaults=>[2.0]},
      :nensembles=>
       {:should_include=>"true",
        :description=>
         " # of ensembles to use in ensemble (time) average of fluxes",
        :help=>" # of ensembles to use in ensemble (time) average of fluxes",
        :code_name=>:nensembles,
        :must_pass=>
         [{:test=>"kind_of? Integer",
           :explanation=>"This variable must be an integer."}],
        :type=>:Integer,
-       :autoscanned_defaults=>[1]}}},
+       :autoscanned_defaults=>[1]},
+     :convergetol=>
+      {:should_include=>"true",
+       :description=>" convergence tolerance when seeking steady state",
+       :help=>" convergence tolerance when seeking steady state",
+       :code_name=>:convergetol,
+       :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]}}},
  :fluxes=>
   {:description=>"",
    :should_include=>"true",
    :variables=>
     {:flux_option=>
@@ -580,11 +591,11 @@
        :code_name=>:flux_option,
        :must_pass=>
         [{:test=>"kind_of? String",
           :explanation=>"This variable must be a string."}],
        :type=>:String,
-       :autoscanned_defaults=>["default", "test1"]},
+       :autoscanned_defaults=>["default"]},
      :flxmult=>
       {:should_include=>"true",
        :description=>" coefficient multiplying fluxes (for testing)",
        :help=>" coefficient multiplying fluxes (for testing)",
        :code_name=>:flxmult,
@@ -657,22 +668,22 @@
        :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=>[0.1, 1.0]},
+       :autoscanned_defaults=>[0.1]},
      :dtprim=>
       {:should_include=>"true",
        :description=>" step size for R/LT is R/LT * dtprim",
        :help=>" step size for R/LT is R/LT * dtprim",
        :code_name=>:dtprim,
        :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=>[0.1, 1.0]},
+       :autoscanned_defaults=>[0.1]},
      :dgexb=>
       {:should_include=>"true",
        :description=>" step size for gexb is gexb * dgexb",
        :help=>" step size for gexb is gexb * dgexb",
        :code_name=>:dgexb,
@@ -712,11 +723,11 @@
        :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,
-       :autoscanned_defaults=>[".false.", ".true."]},
+       :autoscanned_defaults=>[".false."]},
      :dflx_stencil=>
       {:should_include=>"true",
        :description=>" number of fluxes to use for flux derivatives",
        :help=>" number of fluxes to use for flux derivatives",
        :code_name=>:dflx_stencil,
@@ -1083,11 +1094,11 @@
        :code_name=>:init_option,
        :must_pass=>
         [{:test=>"kind_of? String",
           :explanation=>"This variable must be a string."}],
        :type=>:String,
-       :autoscanned_defaults=>["analytic", "default"]},
+       :autoscanned_defaults=>["default"]},
      :init_file=>
       {:should_include=>"true",
        :description=>" file with input data",
        :help=>" file with input data",
        :code_name=>:init_file,
@@ -1207,10 +1218,22 @@
         [{: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=>[0.0]},
+     :restart_file=>
+      {:should_include=>"true",
+       :description=>
+        "Netcdf file with restart data (gradually replacing old restart files).",
+       :help=>
+        "Netcdf file with restart data (gradually replacing old restart files).",
+       :code_name=>:restart_file,
+       :must_pass=>
+        [{:test=>"kind_of? String",
+          :explanation=>"This variable must be a string."}],
+       :type=>:String,
+       :autoscanned_defaults=>[""]},
      :iternt_file=>
       {:should_include=>"true",
        :description=>
         " file with old profile data for restarts in the middle of a timestep",
        :help=>
@@ -1333,11 +1356,21 @@
        :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]}}},
+       :autoscanned_defaults=>[-1.0]},
+     :density_boost=>
+      {:should_include=>"true",
+       :description=>"Increase initial density at constant pressure.",
+       :help=>"Increase initial density at constant pressure.",
+       :code_name=>:density_boost,
+       :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}}},
  :sources=>
   {:description=>"",
    :should_include=>"true",
    :variables=>
     {:source_option=>
@@ -1347,11 +1380,11 @@
        :code_name=>:source_option,
        :must_pass=>
         [{:test=>"kind_of? String",
           :explanation=>"This variable must be a string."}],
        :type=>:String,
-       :autoscanned_defaults=>["analytic", "default"]},
+       :autoscanned_defaults=>["default"]},
      :source_file=>
       {:should_include=>"true",
        :description=>" file with input data",
        :help=>" file with input data",
        :code_name=>:source_file,
@@ -1436,22 +1469,22 @@
        :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,
-       :autoscanned_defaults=>[".false.", ".true."]},
+       :autoscanned_defaults=>[".true."]},
      :include_radiation=>
       {:should_include=>"true",
        :description=>" include bremstrahlung radiation",
        :help=>" include bremstrahlung radiation",
        :code_name=>:include_radiation,
        :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,
-       :autoscanned_defaults=>[".false.", ".true."]},
+       :autoscanned_defaults=>[".true."]},
      :pioq=>
       {:should_include=>"true",
        :description=>" ratio of momentum to heat input",
        :help=>" ratio of momentum to heat input",
        :code_name=>:pioq,
@@ -1632,32 +1665,32 @@
        :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,
-       :autoscanned_defaults=>[".false.", ".true."]},
+       :autoscanned_defaults=>[".true."]},
      :temp_equil=>
       {:should_include=>"true",
        :description=>" set to false to neglect temperature equilibration",
        :help=>" set to false to neglect temperature equilibration",
        :code_name=>:temp_equil,
        :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,
-       :autoscanned_defaults=>[".false.", ".true."]},
+       :autoscanned_defaults=>[".true."]},
      :turb_heat=>
       {:should_include=>"true",
        :description=>" set to false to neglect turbulent heating",
        :help=>" set to false to neglect turbulent heating",
        :code_name=>:turb_heat,
        :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,
-       :autoscanned_defaults=>[".false.", ".true."]},
+       :autoscanned_defaults=>[".true."]},
      :numult=>
       {:should_include=>"true",
        :description=>" multiplier of collision frequency for testing",
        :help=>" multiplier of collision frequency for testing",
        :code_name=>:numult,