Skip to content

Commit 4fdcab3

Browse files
authored
Merge branch 'development' into param_stuct
2 parents 7babc3b + 8e7e375 commit 4fdcab3

File tree

43 files changed

+317
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+317
-319
lines changed

EOS/breakout/_parameters

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@namespace: eos
22

3-
eos_gamma real 0.d0
3+
eos_gamma real 0.e0
44

55

66

EOS/gamma_law/_parameters

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@namespace: eos
22

3-
eos_gamma real 5.d0/3.d0
4-
eos_assume_neutral integer 1
3+
eos_gamma real 5.e0/3.e0
4+
eos_assume_neutral bool 1

EOS/helmholtz/_parameters

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
@namespace: eos
22

33
# use the Coulomb corrections
4-
use_eos_coulomb integer 1
4+
use_eos_coulomb bool 1
55

66
# Force the EOS output quantities to match input
7-
eos_input_is_constant integer 1
7+
eos_input_is_constant bool 1
88

99
# Tolerance for iterations with respect to temperature
10-
eos_ttol real 1.0d-8
10+
eos_ttol real 1.0e-8
1111

1212
# Tolerance for iterations with respect to density
13-
eos_dtol real 1.0d-8
13+
eos_dtol real 1.0e-8
1414

1515
# Density target for radiation pressure smoothing (negative means smoothing is disabled)
16-
prad_limiter_rho_c real -1.0d0
16+
prad_limiter_rho_c real -1.0e0
1717

1818
# Density gradient for radiation pressure smoothing (negative means smoothing is disabled)
19-
prad_limiter_delta_rho real -1.0d0
19+
prad_limiter_delta_rho real -1.0e0

EOS/multigamma/_parameters

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
eos_gamma_default real 1.4
44

5-
species_a_name character ""
5+
species_a_name string ""
66
species_a_gamma real 1.4
77

8-
species_b_name character ""
8+
species_b_name string ""
99
species_b_gamma real 1.4
1010

11-
species_c_name character ""
11+
species_c_name string ""
1212
species_c_gamma real 1.4
1313

1414

EOS/polytrope/_parameters

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@namespace: eos
22

3-
polytrope_type integer 0
4-
polytrope_gamma real 0.0d0
5-
polytrope_K real 0.0d0
6-
polytrope_mu_e real 2.0d0
3+
polytrope_type int 0
4+
polytrope_gamma real 0.0e0
5+
polytrope_K real 0.0e0
6+
polytrope_mu_e real 2.0e0
77

EOS/primordial_chem/_parameters

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,58 @@
33
eos_gamma_default real 1.4
44

55
# define the specie names, and their masses and gammas
6-
species_a_name character "elec"
6+
species_a_name string "elec"
77
species_a_gamma real 5./3.
88
species_a_mass real 9.10938188e-28
99

10-
species_b_name character "hp"
10+
species_b_name string "hp"
1111
species_b_gamma real 5./3.
1212
species_b_mass real 1.67262158e-24
1313

14-
species_c_name character "h"
14+
species_c_name string "h"
1515
species_c_gamma real 5./3.
1616
species_c_mass real 1.67353251819e-24
1717

18-
species_d_name character "hm"
18+
species_d_name string "hm"
1919
species_d_gamma real 5./3.
2020
species_d_mass real 1.67444345638e-24
2121

22-
species_e_name character "dp"
22+
species_e_name string "dp"
2323
species_e_gamma real 5./3.
2424
species_e_mass real 3.34512158e-24
2525

26-
species_f_name character "d"
26+
species_f_name string "d"
2727
species_f_gamma real 5./3.
2828
species_f_mass real 3.34603251819e-24
2929

30-
species_g_name character "h2p"
30+
species_g_name string "h2p"
3131
species_g_gamma real 1.4
3232
species_g_mass real 3.34615409819e-24
3333

34-
species_h_name character "dm"
34+
species_h_name string "dm"
3535
species_h_gamma real 5./3.
3636
species_h_mass real 3.34694345638e-24
3737

38-
species_i_name character "h2"
38+
species_i_name string "h2"
3939
species_i_gamma real 1.4
4040
species_i_mass real 3.34706503638e-24
4141

42-
species_j_name character "hdp"
42+
species_j_name string "hdp"
4343
species_j_gamma real 1.4
4444
species_j_mass real 5.01865409819e-24
4545

46-
species_k_name character "hd"
46+
species_k_name string "hd"
4747
species_k_gamma real 1.4
4848
species_k_mass real 5.01956503638e-24
4949

50-
species_l_name character "hepp"
50+
species_l_name string "hepp"
5151
species_l_gamma real 5./3.
5252
species_l_mass real 6.69024316e-24
5353

54-
species_m_name character "hep"
54+
species_m_name string "hep"
5555
species_m_gamma real 5./3.
5656
species_m_mass real 6.69115409819e-24
5757

58-
species_n_name character "he"
58+
species_n_name string "he"
5959
species_n_gamma real 5./3.
6060
species_n_mass real 6.69206503638e-24

EOS/rad_power_law/_parameters

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@namespace: eos
22

3-
eos_const_c_v real -1.d0
4-
eos_c_v_exp_m real 0.d0
5-
eos_c_v_exp_n real 0.d0
3+
eos_const_c_v real -1.e0
4+
eos_c_v_exp_m real 0.e0
5+
eos_c_v_exp_n real 0.e0

conductivity/constant/_parameters

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@namespace: conductivity
22

3-
const_conductivity real 1.0d0
3+
const_conductivity real 1.0e0
44

55

66

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@namespace: conductivity
22

3-
const_opacity real 7.0d-2
3+
const_opacity real 7.0e-2
44

55

66

integration/BackwardEuler/_parameters

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
maximum_timestep_change_factor real 1.01
55

66
# Maximum number of iterations for the Newton solve
7-
max_iter integer 25
7+
max_iter int 25
88

99
# tolerance for the Newton solve
1010
tol real 1.e-10

integration/QSS/_parameters

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ predictor_corrector_tolerance real 0.01
77
tolerance_safety_factor real 10.0
88

99
# Maximum number of iterations on the timestep constraint loop
10-
num_timestep_iters integer 10
10+
num_timestep_iters int 10
1111

1212
# Maximum number of iterations on the corrector loop
13-
num_corrector_iters integer 1
13+
num_corrector_iters int 1
1414

1515
# Maximum factor that dt is allowed to grow per timestep
1616
dt_max_change_factor real 1.05

integration/RKC/_parameters

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
# do we scale the ODE system we integrate to make it O(1)?
44
# for Strang, this simply means scaling e by the initial energy?
5-
scale_system integer 1 100
5+
scale_system bool 1 100
66

77

88
# use the Gershgorin circle theorem to estimate the spectral radius?
99
# note: requires integrator.scale_system = 1
10-
use_circle_theorem integer 1
10+
use_circle_theorem bool 1
1111

1212

integration/_parameters

+35-36
Original file line numberDiff line numberDiff line change
@@ -6,103 +6,102 @@
66
# the current internal energy. This is done with an EOS call, which can
77
# be turned off if desired. This will freeze the temperature and specific heat
88
# to the values at the beginning of the burn, which is inaccurate but cheaper.
9-
call_eos_in_rhs integer 1
9+
call_eos_in_rhs bool 1
1010

1111
# Allow the energy integration to be disabled by setting the RHS to zero.
12-
integrate_energy integer 1
12+
integrate_energy bool 1
1313

1414
# Whether to use an analytical or numerical Jacobian.
1515
# 1 == Analytical
1616
# 2 == Numerical
17-
# 3 == Numerical for reactions; analytic for primitive -> conserved (simplified-SDC only)
18-
jacobian integer 1
17+
jacobian int 1
1918

2019
# Should we print out diagnostic output after the solve?
21-
burner_verbose integer 0
20+
burner_verbose bool 0
2221

2322
# Tolerances for the solver (relative and absolute), for the
2423
# species and energy equations.
25-
rtol_spec real 1.d-12
26-
rtol_enuc real 1.d-6
24+
rtol_spec real 1.e-12
25+
rtol_enuc real 1.e-6
2726

28-
atol_spec real 1.d-8
29-
atol_enuc real 1.d-6
27+
atol_spec real 1.e-8
28+
atol_enuc real 1.e-6
3029

3130
# Whether to renormalize the mass fractions at each step in the evolution
3231
# so that they sum to unity.
33-
renormalize_abundances integer 0
32+
renormalize_abundances bool 0
3433

3534
# The absolute cutoff for species -- note that this might be larger
3635
# than ``small_x``, but the issue is that we need to prevent underflow
3736
# issues and keep mass fractions positive in the integrator. You may
38-
# have to increase the floor to, e.g. 1.d-20 if your rates are large.
39-
SMALL_X_SAFE real 1.0d-30
37+
# have to increase the floor to, e.g. 1.e-20 if your rates are large.
38+
SMALL_X_SAFE real 1.0e-30
4039

4140
# The maximum temperature for reactions in the integration.
42-
MAX_TEMP real 1.0d11
41+
MAX_TEMP real 1.0e11
4342

4443
# boost the reaction rates by a factor > 1
45-
react_boost real -1.d0
44+
react_boost real -1.e0
4645

4746
# maximum number of timesteps for the integrator
48-
ode_max_steps integer 150000
47+
ode_max_steps int 150000
4948

5049
# maximum timestep for the integrator
51-
ode_max_dt real 1.d30
50+
ode_max_dt real 1.e30
5251

5352
# Whether to use Jacobian caching in VODE
54-
use_jacobian_caching integer 1
53+
use_jacobian_caching bool 1
5554

5655
# Inputs for generating a Nonaka Plot (TM)
57-
nonaka_i integer 0
58-
nonaka_j integer 0
59-
nonaka_k integer 0
60-
nonaka_level integer 0
61-
nonaka_file character "nonaka_plot.dat"
56+
nonaka_i int 0
57+
nonaka_j int 0
58+
nonaka_k int 0
59+
nonaka_level int 0
60+
nonaka_file string "nonaka_plot.dat"
6261

6362
# do we retry a failed burn with different parameters?
64-
use_burn_retry integer 0
63+
use_burn_retry bool 0
6564

6665
# do we swap the Jacobian (from analytic to numerical or vice versa) on
6766
# a retry?
68-
retry_swap_jacobian integer 1
67+
retry_swap_jacobian bool 1
6968

7069
# Tolerances for the solver (relative and absolute), for the
7170
# species and energy equations.
72-
retry_rtol_spec real 1.d-12
73-
retry_rtol_enuc real 1.d-6
71+
retry_rtol_spec real 1.e-12
72+
retry_rtol_enuc real 1.e-6
7473

75-
retry_atol_spec real 1.d-8
76-
retry_atol_enuc real 1.d-6
74+
retry_atol_spec real 1.e-8
75+
retry_atol_enuc real 1.e-6
7776

7877
# in the clean_state process, do we clip the species such that they
7978
# are in [0, 1]?
80-
do_species_clip integer 1
79+
do_species_clip bool 1
8180

8281
# flag for turning on the use of number densities for all species
83-
use_number_densities integer 0
82+
use_number_densities bool 0
8483

8584
# flag for tuning on the subtraction of internal energy
86-
subtract_internal_energy integer 1
85+
subtract_internal_energy bool 1
8786

8887
# SDC iteration tolerance adjustment factor
89-
sdc_burn_tol_factor real 1.d0
88+
sdc_burn_tol_factor real 1.e0
9089

9190
# do we scale the ODE system we integrate to make it O(1)?
9291
# for Strang, this simply means scaling e by the initial energy?
93-
scale_system integer 0
92+
scale_system bool 0
9493

9594
# for the NSE update predictor-corrector, how many iterations
9695
# do we take to get the new time NSE state
97-
nse_iters integer 3
96+
nse_iters int 3
9897

9998
# for SDC+NSE, when estimating the derivatives of the NSE table
10099
# quantities, what fraction of dt do we use for the finite-difference
101100
# estimate
102101
nse_deriv_dt_factor real 0.05
103102

104103
# for NSE update, do we include the weak rate neutrino losses?
105-
nse_include_enu_weak integer 1
104+
nse_include_enu_weak bool 1
106105

107106
# for the linear algebra, do we allow pivoting?
108-
linalg_do_pivoting integer 1
107+
linalg_do_pivoting bool 1

networks/_parameters

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@namespace: network
22

33
# cutoff for species mass fractions
4-
small_x real 1.d-30
4+
small_x real 1.e-30
55

66
# Should we use rate tables if they are present in the network?
7-
use_tables integer 0
7+
use_tables bool 0
88

99
# Should we use Deboer + 2017 rate for c12(a,g)o16?
10-
use_c12ag_deboer17 integer 0
10+
use_c12ag_deboer17 bool 0

networks/powerlaw/_parameters

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
# energy, such that r = 0 for T < f_act*T_0
3535

3636
# the coefficient for the reaction rate
37-
rtilde real 1.d0
37+
rtilde real 1.e0
3838

3939
# exponent for the temperature
40-
nu real 4.d0
40+
nu real 4.e0
4141

4242
# reaction specific q-value (in erg/g)
43-
specific_q_burn real 10.d0
43+
specific_q_burn real 10.e0
4444

4545
# reaction thresholds (for the power law)
46-
T_burn_ref real 1.0d0 # T_0 in the notation above
47-
rho_burn_ref real 1.0d0 # rho_0 in the notation above
48-
f_act real 1.0d0 # activation T factor (f_act*T_burn_ref)
46+
T_burn_ref real 1.0e0 # T_0 in the notation above
47+
rho_burn_ref real 1.0e0 # rho_0 in the notation above
48+
f_act real 1.0e0 # activation T factor (f_act*T_burn_ref)

networks/rprox/_parameters

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ atol_enuc real 1.0e-8 100
1212
rtol_enuc real 1.0e-8 100
1313

1414
# override so that the default is an analytical Jacobian
15-
jacobian integer 1 100
15+
jacobian int 1 100

networks/triple_alpha_plus_cago/_parameters

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ atol_enuc real 1.0e-8 100
1212
rtol_enuc real 1.0e-6 100
1313

1414
# override so that the default is an analytical Jacobian
15-
jacobian integer 1 100
15+
jacobian int 1 100

0 commit comments

Comments
 (0)