allow for bool in _parameters again, integer -> int, character -> string

EOS/breakout/_parameters

@@ -1,6 +1,6 @@
 @namespace: eos
 
-eos_gamma            real     0.d0
+eos_gamma            real     0.e0
 
 
 

EOS/gamma_law/_parameters

@@ -1,4 +1,4 @@
 @namespace: eos
 
-eos_gamma            real     5.d0/3.d0
+eos_gamma            real     5.e0/3.e0
 eos_assume_neutral   integer  1

EOS/helmholtz/_parameters

@@ -1,19 +1,19 @@
 @namespace: eos
 
 # use the Coulomb corrections
-use_eos_coulomb                     integer            1
+use_eos_coulomb                     bool           1
 
 # Force the EOS output quantities to match input
-eos_input_is_constant               integer            1
+eos_input_is_constant               bool           1
 
 # Tolerance for iterations with respect to temperature
-eos_ttol                            real               1.0d-8
+eos_ttol                            real               1.0e-8
 
 # Tolerance for iterations with respect to density
-eos_dtol                            real               1.0d-8
+eos_dtol                            real               1.0e-8
 
 # Density target for radiation pressure smoothing (negative means smoothing is disabled)
-prad_limiter_rho_c                  real               -1.0d0
+prad_limiter_rho_c                  real               -1.0e0
 
 # Density gradient for radiation pressure smoothing (negative means smoothing is disabled)
-prad_limiter_delta_rho              real               -1.0d0
+prad_limiter_delta_rho              real               -1.0e0

EOS/multigamma/_parameters

@@ -2,13 +2,13 @@
 
 eos_gamma_default       real          1.4
 
-species_a_name          character     ""
+species_a_name          string        ""
 species_a_gamma         real          1.4
 
-species_b_name          character     ""
+species_b_name          string        ""
 species_b_gamma         real          1.4
 
-species_c_name          character     ""
+species_c_name          string        ""
 species_c_gamma         real          1.4
 
 

EOS/polytrope/_parameters

@@ -1,7 +1,7 @@
 @namespace: eos
 
-polytrope_type       integer  0
-polytrope_gamma      real     0.0d0
-polytrope_K          real     0.0d0
-polytrope_mu_e       real     2.0d0
+polytrope_type       int      0
+polytrope_gamma      real     0.0e0
+polytrope_K          real     0.0e0
+polytrope_mu_e       real     2.0e0
 

EOS/primordial_chem/_parameters

@@ -3,58 +3,58 @@
 eos_gamma_default       real          1.4
 
 # define the specie names, and their masses and gammas
-species_a_name          character     "elec"
+species_a_name          string     "elec"
 species_a_gamma         real          5./3.
 species_a_mass          real          9.10938188e-28
 
-species_b_name          character     "hp"
+species_b_name          string     "hp"
 species_b_gamma         real          5./3.
 species_b_mass          real          1.67262158e-24
 
-species_c_name          character     "h"
+species_c_name          string     "h"
 species_c_gamma         real          5./3.
 species_c_mass          real          1.67353251819e-24
 
-species_d_name          character     "hm"
+species_d_name          string     "hm"
 species_d_gamma         real          5./3.
 species_d_mass          real          1.67444345638e-24
 
-species_e_name          character     "dp"
+species_e_name          string     "dp"
 species_e_gamma         real          5./3.
 species_e_mass          real          3.34512158e-24
 
-species_f_name          character     "d"
+species_f_name          string     "d"
 species_f_gamma         real          5./3.
 species_f_mass          real          3.34603251819e-24
 
-species_g_name          character     "h2p"
+species_g_name          string     "h2p"
 species_g_gamma         real          1.4
 species_g_mass          real          3.34615409819e-24
 
-species_h_name          character     "dm"
+species_h_name          string     "dm"
 species_h_gamma         real          5./3.
 species_h_mass          real          3.34694345638e-24
 
-species_i_name          character     "h2"
+species_i_name          string     "h2"
 species_i_gamma         real          1.4
 species_i_mass          real          3.34706503638e-24
 
-species_j_name          character     "hdp"
+species_j_name          string     "hdp"
 species_j_gamma         real          1.4
 species_j_mass          real          5.01865409819e-24
 
-species_k_name          character     "hd"
+species_k_name          string     "hd"
 species_k_gamma         real          1.4
 species_k_mass          real          5.01956503638e-24
 
-species_l_name          character     "hepp"
+species_l_name          string     "hepp"
 species_l_gamma         real          5./3.
 species_l_mass          real          6.69024316e-24
 
-species_m_name          character     "hep"
+species_m_name          string     "hep"
 species_m_gamma         real          5./3.
 species_m_mass          real          6.69115409819e-24
 
-species_n_name          character     "he"
+species_n_name          string     "he"
 species_n_gamma         real          5./3.
 species_n_mass          real          6.69206503638e-24

EOS/rad_power_law/_parameters

@@ -1,5 +1,5 @@
 @namespace: eos
 
-eos_const_c_v        real     -1.d0
-eos_c_v_exp_m        real      0.d0
-eos_c_v_exp_n        real      0.d0
+eos_const_c_v        real     -1.e0
+eos_c_v_exp_m        real      0.e0
+eos_c_v_exp_n        real      0.e0

conductivity/constant/_parameters

@@ -1,6 +1,6 @@
 @namespace: conductivity
 
-const_conductivity   real     1.0d0
+const_conductivity   real     1.0e0
 
 
 

conductivity/constant_opacity/_parameters

@@ -1,6 +1,6 @@
 @namespace: conductivity
 
-const_opacity        real     7.0d-2
+const_opacity        real     7.0e-2
 
 
 

integration/RKC/_parameters

@@ -2,11 +2,11 @@
 
 # do we scale the ODE system we integrate to make it O(1)?
 # for Strang, this simply means scaling e by the initial energy?
-scale_system              integer         1            100
+scale_system              bool         1            100
 
 
 # use the Gershgorin circle theorem to estimate the spectral radius?
 # note: requires integrator.scale_system = 1
-use_circle_theorem       integer          1
+use_circle_theorem       bool          1
 
 

integration/_parameters

@@ -6,103 +6,102 @@
 # the current internal energy. This is done with an EOS call, which can
 # be turned off if desired. This will freeze the temperature and specific heat
 # to the values at the beginning of the burn, which is inaccurate but cheaper.
-call_eos_in_rhs          integer   1
+call_eos_in_rhs          bool   1
 
 # Allow the energy integration to be disabled by setting the RHS to zero.
-integrate_energy         integer   1
+integrate_energy         bool   1
 
 # Whether to use an analytical or numerical Jacobian.
 # 1 == Analytical
 # 2 == Numerical
-# 3 == Numerical for reactions; analytic for primitive -> conserved (simplified-SDC only)
-jacobian                 integer   1
+jacobian                 int      1
 
 # Should we print out diagnostic output after the solve?
-burner_verbose           integer   0
+burner_verbose           bool     0
 
 # Tolerances for the solver (relative and absolute), for the
 # species and energy equations.
-rtol_spec                real      1.d-12
-rtol_enuc                real      1.d-6
+rtol_spec                real      1.e-12
+rtol_enuc                real      1.e-6
 
-atol_spec                real      1.d-8
-atol_enuc                real      1.d-6
+atol_spec                real      1.e-8
+atol_enuc                real      1.e-6
 
 # Whether to renormalize the mass fractions at each step in the evolution
 # so that they sum to unity.
-renormalize_abundances   integer   0
+renormalize_abundances   bool   0
 
 # The absolute cutoff for species -- note that this might be larger
 # than ``small_x``, but the issue is that we need to prevent underflow
 # issues and keep mass fractions positive in the integrator.  You may
-# have to increase the floor to, e.g. 1.d-20 if your rates are large.
-SMALL_X_SAFE                 real            1.0d-30
+# have to increase the floor to, e.g. 1.e-20 if your rates are large.
+SMALL_X_SAFE                 real            1.0e-30
 
 # The maximum temperature for reactions in the integration.
-MAX_TEMP                     real            1.0d11
+MAX_TEMP                     real            1.0e11
 
 # boost the reaction rates by a factor > 1
-react_boost                 real         -1.d0
+react_boost                 real         -1.e0
 
 # maximum number of timesteps for the integrator
-ode_max_steps              integer      150000
+ode_max_steps              int      150000
 
 # maximum timestep for the integrator
-ode_max_dt                 real         1.d30
+ode_max_dt                 real         1.e30
 
 # Whether to use Jacobian caching in VODE
-use_jacobian_caching    integer    1
+use_jacobian_caching    bool    1
 
 # Inputs for generating a Nonaka Plot (TM)
-nonaka_i                integer           0
-nonaka_j                integer           0
-nonaka_k                integer           0
-nonaka_level            integer           0
-nonaka_file             character         "nonaka_plot.dat"
+nonaka_i                int           0
+nonaka_j                int           0
+nonaka_k                int           0
+nonaka_level            int           0
+nonaka_file             string       "nonaka_plot.dat"
 
 # do we retry a failed burn with different parameters?
-use_burn_retry            integer   0
+use_burn_retry            bool    0
 
 # do we swap the Jacobian (from analytic to numerical or vice versa) on
 # a retry?
-retry_swap_jacobian       integer     1
+retry_swap_jacobian       bool    1
 
 # Tolerances for the solver (relative and absolute), for the
 # species and energy equations.
-retry_rtol_spec                real      1.d-12
-retry_rtol_enuc                real      1.d-6
+retry_rtol_spec                real      1.e-12
+retry_rtol_enuc                real      1.e-6
 
-retry_atol_spec                real      1.d-8
-retry_atol_enuc                real      1.d-6
+retry_atol_spec                real      1.e-8
+retry_atol_enuc                real      1.e-6
 
 # in the clean_state process, do we clip the species such that they
 # are in [0, 1]?
-do_species_clip              integer          1
+do_species_clip              bool         1
 
 # flag for turning on the use of number densities for all species
-use_number_densities     integer     0
+use_number_densities     bool     0
 
 # flag for tuning on the subtraction of internal energy
-subtract_internal_energy   integer     1
+subtract_internal_energy   bool     1
 
 # SDC iteration tolerance adjustment factor
 sdc_burn_tol_factor          real         1.d0
 
 # do we scale the ODE system we integrate to make it O(1)?
 # for Strang, this simply means scaling e by the initial energy?
-scale_system              integer         0
+scale_system              bool         0
 
 # for the NSE update predictor-corrector, how many iterations
 # do we take to get the new time NSE state
-nse_iters                 integer         3
+nse_iters                 int        3
 
 # for SDC+NSE, when estimating the derivatives of the NSE table
 # quantities, what fraction of dt do we use for the finite-difference
 # estimate
 nse_deriv_dt_factor        real           0.05
 
 # for NSE update, do we include the weak rate neutrino losses?
-nse_include_enu_weak       integer        1
+nse_include_enu_weak       bool        1
 
 # for the linear algebra, do we allow pivoting?
-linalg_do_pivoting         integer        1
+linalg_do_pivoting         bool        1

networks/_parameters

@@ -1,10 +1,10 @@
 @namespace: network
 
 # cutoff for species mass fractions
-small_x                              real               1.d-30
+small_x                              real               1.e-30
 
 # Should we use rate tables if they are present in the network?
-use_tables                           integer            0
+use_tables                           bool            0
 
 # Should we use Deboer + 2017 rate for c12(a,g)o16?
-use_c12ag_deboer17                   integer            0
+use_c12ag_deboer17                   bool            0

networks/powerlaw/_parameters

@@ -34,15 +34,15 @@
 # energy, such that r = 0 for T < f_act*T_0
 
 # the coefficient for the reaction rate
-rtilde        real    1.d0
+rtilde        real    1.e0
 
 # exponent for the temperature
-nu            real    4.d0
+nu            real    4.e0
 
 # reaction specific q-value (in erg/g)
-specific_q_burn        real   10.d0
+specific_q_burn        real   10.e0
 
 # reaction thresholds (for the power law)
-T_burn_ref    real   1.0d0     # T_0 in the notation above
-rho_burn_ref  real   1.0d0     # rho_0 in the notation above
-f_act         real   1.0d0     # activation T factor (f_act*T_burn_ref)
+T_burn_ref    real   1.0e0     # T_0 in the notation above
+rho_burn_ref  real   1.0e0     # rho_0 in the notation above
+f_act         real   1.0e0     # activation T factor (f_act*T_burn_ref)

networks/rprox/_parameters

@@ -12,4 +12,4 @@ atol_enuc                real      1.0e-8  100
 rtol_enuc                real      1.0e-8  100
 
 # override so that the default is an analytical Jacobian
-jacobian                 integer   1       100
+jacobian                 int       1       100

networks/triple_alpha_plus_cago/_parameters

@@ -12,4 +12,4 @@ atol_enuc                real      1.0e-8  100
 rtol_enuc                real      1.0e-6  100
 
 # override so that the default is an analytical Jacobian
-jacobian                 integer   1       100
+jacobian                 int       1       100

nse_solver/_parameters

@@ -1,11 +1,11 @@
 @namespace: nse
 
-max_nse_iters           integer    500
-use_hybrid_solver       integer    1
+max_nse_iters           int        500
+use_hybrid_solver       int        1
 ase_tol                 real       0.1
 nse_abs_tol             real       0.005
 nse_rel_tol             real       0.2
-nse_dx_independent      integer    0
-nse_molar_independent   integer    0
-nse_skip_molar          integer    0
+nse_dx_independent      int        0
+nse_molar_independent   int        0
+nse_skip_molar          int        0
 T_nse_net               real       -1.0