Skip to content

Commit 037d833

Browse files
zhichen3zhichen3
authored
remove compute_Q and rate= calls in DerivedRate (#1902)
This is to make pynucastro/pynucastro#1207 unit tests to pass. It makes basically makes compute_Q=True the default. Networks can be regenerated in the future.
1 parent 15899a4 commit 037d833

File tree

20 files changed

+3026
-4574
lines changed

20 files changed

+3026
-4574
lines changed

‎Docs/source/networks.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,11 @@ are effectively accounted for in the approximate rates.
336336
There are 2 runtime parameters that can be used
337337
to disable rates:
338338

339-
* ``network.disable_p_c12__n13`` : if set to ``1``, then the rate
339+
* ``network.disable_p_C12_to_N13_reaclib`` : if set to ``1``, then the rate
340340
:math:`\isotm{C}{12}(p,\gamma)\isotm{N}{13}` and its inverse are
341341
disabled.
342342

343-
* ``network.disable_he4_n13__p_o16`` : if set to ``1``, then the rate
343+
* ``network.disable_He4_N13_to_p_O16_reaclib`` : if set to ``1``, then the rate
344344
:math:`\isotm{N}{13}(\alpha,p)\isotm{O}{16}` and its inverse are
345345
disabled.
346346

‎networks/he-burn/ase-iron/ase_iron.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_library():
2828
for r, mp in other_rates:
2929
_r = reaclib_lib.get_rate_by_name(r)
3030
forward_rate = pyna.ModifiedRate(_r, new_products=[mp])
31-
derived_rate = pyna.DerivedRate(rate=forward_rate, compute_Q=True, use_pf=True)
31+
derived_rate = pyna.DerivedRate(forward_rate, use_pf=True)
3232
subch += pyna.Library(rates=[forward_rate, derived_rate])
3333

3434
# C12+Ne20 and reverse
@@ -70,7 +70,7 @@ def get_library():
7070
if fr:
7171
print(f"modifying {r} from {fr}")
7272
subch.remove_rate(r)
73-
d = pyna.DerivedRate(rate=fr, compute_Q=True, use_pf=True)
73+
d = pyna.DerivedRate(fr, use_pf=True)
7474
subch.add_rate(d)
7575

7676
subch.eliminate_duplicates(rate_type_preference="tabular")

‎networks/he-burn/ase/_parameters‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@namespace: network
22

3-
disable_p_C12_to_N13 int 0
4-
disable_He4_N13_to_p_O16 int 0
3+
disable_p_C12_to_N13_reaclib int 0
4+
disable_He4_N13_to_p_O16_reaclib int 0

‎networks/he-burn/ase/actual_network.H‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -197,26 +197,26 @@ namespace Rates
197197
enum NetworkRates :
198198
std::uint8_t
199199
{
200-
k_p_C12_to_N13 = 1,
201-
k_He4_C12_to_O16 = 2,
202-
k_He4_O16_to_Ne20 = 3,
203-
k_He4_Ne20_to_Mg24 = 4,
204-
k_p_Na23_to_Mg24 = 5,
205-
k_He4_Mg24_to_Si28 = 6,
206-
k_p_Al27_to_Si28 = 7,
207-
k_He4_Si28_to_S32 = 8,
208-
k_p_P31_to_S32 = 9,
209-
k_C12_C12_to_p_Na23 = 10,
210-
k_C12_C12_to_He4_Ne20 = 11,
211-
k_He4_N13_to_p_O16 = 12,
212-
k_C12_O16_to_p_Al27 = 13,
213-
k_C12_O16_to_He4_Mg24 = 14,
214-
k_O16_O16_to_p_P31 = 15,
215-
k_O16_O16_to_He4_Si28 = 16,
216-
k_p_Na23_to_He4_Ne20 = 17,
217-
k_p_Al27_to_He4_Mg24 = 18,
218-
k_p_P31_to_He4_Si28 = 19,
219-
k_He4_He4_He4_to_C12 = 20,
200+
k_p_C12_to_N13_reaclib = 1,
201+
k_He4_C12_to_O16_reaclib = 2,
202+
k_He4_O16_to_Ne20_reaclib = 3,
203+
k_He4_Ne20_to_Mg24_reaclib = 4,
204+
k_p_Na23_to_Mg24_reaclib = 5,
205+
k_He4_Mg24_to_Si28_reaclib = 6,
206+
k_p_Al27_to_Si28_reaclib = 7,
207+
k_He4_Si28_to_S32_reaclib = 8,
208+
k_p_P31_to_S32_reaclib = 9,
209+
k_C12_C12_to_p_Na23_reaclib = 10,
210+
k_C12_C12_to_He4_Ne20_reaclib = 11,
211+
k_He4_N13_to_p_O16_reaclib = 12,
212+
k_C12_O16_to_p_Al27_reaclib = 13,
213+
k_C12_O16_to_He4_Mg24_reaclib = 14,
214+
k_O16_O16_to_p_P31_reaclib = 15,
215+
k_O16_O16_to_He4_Si28_reaclib = 16,
216+
k_p_Na23_to_He4_Ne20_reaclib = 17,
217+
k_p_Al27_to_He4_Mg24_reaclib = 18,
218+
k_p_P31_to_He4_Si28_reaclib = 19,
219+
k_He4_He4_He4_to_C12_reaclib = 20,
220220
k_C12_C12_to_n_Mg23_removed = 21,
221221
k_O16_O16_to_n_S31_removed = 22,
222222
k_C12_O16_to_n_Si27_removed = 23,
@@ -276,25 +276,25 @@ namespace Rates
276276
k_Mg24_to_C12_C12_derived = 77,
277277
k_S32_to_O16_O16_derived = 78,
278278
k_Si28_to_C12_O16_derived = 79,
279-
k_He4_S32_to_p_Cl35_derived_removed = 80,
280-
k_Ar36_to_He4_S32_derived_removed = 81,
281-
k_Ar36_to_p_Cl35_derived_removed = 82,
282-
k_He4_Ar36_to_p_K39_derived_removed = 83,
283-
k_Ca40_to_He4_Ar36_derived_removed = 84,
284-
k_Ca40_to_p_K39_derived_removed = 85,
285-
k_He4_Ca40_to_p_Sc43_derived_removed = 86,
286-
k_Ti44_to_He4_Ca40_derived_removed = 87,
287-
k_Ti44_to_p_Sc43_derived_removed = 88,
288-
k_Cr48_to_He4_Ti44_derived_removed = 89,
289-
k_Cr48_to_p_V47_derived_removed = 90,
290-
k_p_V47_to_He4_Ti44_derived_removed = 91,
291-
k_Fe52_to_He4_Cr48_derived_removed = 92,
292-
k_Fe52_to_p_Mn51_derived_removed = 93,
293-
k_p_Mn51_to_He4_Cr48_derived_removed = 94,
294-
k_Ni56_to_He4_Fe52_derived_removed = 95,
295-
k_Ni56_to_p_Co55_derived_removed = 96,
296-
k_p_Co55_to_He4_Fe52_derived_removed = 97,
297-
NumRates = k_p_Co55_to_He4_Fe52_derived_removed
279+
k_He4_S32_to_p_Cl35_removed = 80,
280+
k_Ar36_to_He4_S32_removed = 81,
281+
k_Ar36_to_p_Cl35_removed = 82,
282+
k_He4_Ar36_to_p_K39_removed = 83,
283+
k_Ca40_to_He4_Ar36_removed = 84,
284+
k_Ca40_to_p_K39_removed = 85,
285+
k_He4_Ca40_to_p_Sc43_removed = 86,
286+
k_Ti44_to_He4_Ca40_removed = 87,
287+
k_Ti44_to_p_Sc43_removed = 88,
288+
k_Cr48_to_He4_Ti44_removed = 89,
289+
k_Cr48_to_p_V47_removed = 90,
290+
k_p_V47_to_He4_Ti44_removed = 91,
291+
k_Fe52_to_He4_Cr48_removed = 92,
292+
k_Fe52_to_p_Mn51_removed = 93,
293+
k_p_Mn51_to_He4_Cr48_removed = 94,
294+
k_Ni56_to_He4_Fe52_removed = 95,
295+
k_Ni56_to_p_Co55_removed = 96,
296+
k_p_Co55_to_He4_Fe52_removed = 97,
297+
NumRates = k_p_Co55_to_He4_Fe52_removed
298298
};
299299

300300
// rate names -- note: the rates are 1-based, not zero-based, so we pad
@@ -303,26 +303,26 @@ namespace Rates
303303

304304
static const std::vector<std::string> rate_names = {
305305
"", // 0
306-
"p_C12_to_N13", // 1,
307-
"He4_C12_to_O16", // 2,
308-
"He4_O16_to_Ne20", // 3,
309-
"He4_Ne20_to_Mg24", // 4,
310-
"p_Na23_to_Mg24", // 5,
311-
"He4_Mg24_to_Si28", // 6,
312-
"p_Al27_to_Si28", // 7,
313-
"He4_Si28_to_S32", // 8,
314-
"p_P31_to_S32", // 9,
315-
"C12_C12_to_p_Na23", // 10,
316-
"C12_C12_to_He4_Ne20", // 11,
317-
"He4_N13_to_p_O16", // 12,
318-
"C12_O16_to_p_Al27", // 13,
319-
"C12_O16_to_He4_Mg24", // 14,
320-
"O16_O16_to_p_P31", // 15,
321-
"O16_O16_to_He4_Si28", // 16,
322-
"p_Na23_to_He4_Ne20", // 17,
323-
"p_Al27_to_He4_Mg24", // 18,
324-
"p_P31_to_He4_Si28", // 19,
325-
"He4_He4_He4_to_C12", // 20,
306+
"p_C12_to_N13_reaclib", // 1,
307+
"He4_C12_to_O16_reaclib", // 2,
308+
"He4_O16_to_Ne20_reaclib", // 3,
309+
"He4_Ne20_to_Mg24_reaclib", // 4,
310+
"p_Na23_to_Mg24_reaclib", // 5,
311+
"He4_Mg24_to_Si28_reaclib", // 6,
312+
"p_Al27_to_Si28_reaclib", // 7,
313+
"He4_Si28_to_S32_reaclib", // 8,
314+
"p_P31_to_S32_reaclib", // 9,
315+
"C12_C12_to_p_Na23_reaclib", // 10,
316+
"C12_C12_to_He4_Ne20_reaclib", // 11,
317+
"He4_N13_to_p_O16_reaclib", // 12,
318+
"C12_O16_to_p_Al27_reaclib", // 13,
319+
"C12_O16_to_He4_Mg24_reaclib", // 14,
320+
"O16_O16_to_p_P31_reaclib", // 15,
321+
"O16_O16_to_He4_Si28_reaclib", // 16,
322+
"p_Na23_to_He4_Ne20_reaclib", // 17,
323+
"p_Al27_to_He4_Mg24_reaclib", // 18,
324+
"p_P31_to_He4_Si28_reaclib", // 19,
325+
"He4_He4_He4_to_C12_reaclib", // 20,
326326
"C12_C12_to_n_Mg23_removed", // 21,
327327
"O16_O16_to_n_S31_removed", // 22,
328328
"C12_O16_to_n_Si27_removed", // 23,
@@ -382,24 +382,24 @@ namespace Rates
382382
"Mg24_to_C12_C12_derived", // 77,
383383
"S32_to_O16_O16_derived", // 78,
384384
"Si28_to_C12_O16_derived", // 79,
385-
"He4_S32_to_p_Cl35_derived_removed", // 80,
386-
"Ar36_to_He4_S32_derived_removed", // 81,
387-
"Ar36_to_p_Cl35_derived_removed", // 82,
388-
"He4_Ar36_to_p_K39_derived_removed", // 83,
389-
"Ca40_to_He4_Ar36_derived_removed", // 84,
390-
"Ca40_to_p_K39_derived_removed", // 85,
391-
"He4_Ca40_to_p_Sc43_derived_removed", // 86,
392-
"Ti44_to_He4_Ca40_derived_removed", // 87,
393-
"Ti44_to_p_Sc43_derived_removed", // 88,
394-
"Cr48_to_He4_Ti44_derived_removed", // 89,
395-
"Cr48_to_p_V47_derived_removed", // 90,
396-
"p_V47_to_He4_Ti44_derived_removed", // 91,
397-
"Fe52_to_He4_Cr48_derived_removed", // 92,
398-
"Fe52_to_p_Mn51_derived_removed", // 93,
399-
"p_Mn51_to_He4_Cr48_derived_removed", // 94,
400-
"Ni56_to_He4_Fe52_derived_removed", // 95,
401-
"Ni56_to_p_Co55_derived_removed", // 96,
402-
"p_Co55_to_He4_Fe52_derived_removed" // 97,
385+
"He4_S32_to_p_Cl35_removed", // 80,
386+
"Ar36_to_He4_S32_removed", // 81,
387+
"Ar36_to_p_Cl35_removed", // 82,
388+
"He4_Ar36_to_p_K39_removed", // 83,
389+
"Ca40_to_He4_Ar36_removed", // 84,
390+
"Ca40_to_p_K39_removed", // 85,
391+
"He4_Ca40_to_p_Sc43_removed", // 86,
392+
"Ti44_to_He4_Ca40_removed", // 87,
393+
"Ti44_to_p_Sc43_removed", // 88,
394+
"Cr48_to_He4_Ti44_removed", // 89,
395+
"Cr48_to_p_V47_removed", // 90,
396+
"p_V47_to_He4_Ti44_removed", // 91,
397+
"Fe52_to_He4_Cr48_removed", // 92,
398+
"Fe52_to_p_Mn51_removed", // 93,
399+
"p_Mn51_to_He4_Cr48_removed", // 94,
400+
"Ni56_to_He4_Fe52_removed", // 95,
401+
"Ni56_to_p_Co55_removed", // 96,
402+
"p_Co55_to_He4_Fe52_removed" // 97,
403403
};
404404

405405
}

‎networks/he-burn/ase/actual_network_data.cpp‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
namespace NSE_INDEX
66
{
77
AMREX_GPU_MANAGED amrex::Array2D<std::int8_t, 1, Rates::NumRates, 1, 7, amrex::Order::C> rate_indices {
8-
-1, 0, 2, -1, -1, 3, 57, // p_C12_to_N13
9-
-1, 1, 2, -1, -1, 4, 58, // He4_C12_to_O16
10-
-1, 1, 4, -1, -1, 5, 59, // He4_O16_to_Ne20
11-
-1, 1, 5, -1, -1, 7, 61, // He4_Ne20_to_Mg24
12-
-1, 0, 6, -1, -1, 7, 60, // p_Na23_to_Mg24
13-
-1, 1, 7, -1, -1, 9, 63, // He4_Mg24_to_Si28
14-
-1, 0, 8, -1, -1, 9, 62, // p_Al27_to_Si28
15-
-1, 1, 9, -1, -1, 11, 65, // He4_Si28_to_S32
16-
-1, 0, 10, -1, -1, 11, 64, // p_P31_to_S32
17-
-1, 2, 2, -1, 0, 6, 70, // C12_C12_to_p_Na23
18-
-1, 2, 2, -1, 1, 5, 69, // C12_C12_to_He4_Ne20
19-
-1, 1, 3, -1, 0, 4, 67, // He4_N13_to_p_O16
20-
-1, 2, 4, -1, 0, 8, 73, // C12_O16_to_p_Al27
21-
-1, 2, 4, -1, 1, 7, 72, // C12_O16_to_He4_Mg24
22-
-1, 4, 4, -1, 0, 10, 76, // O16_O16_to_p_P31
23-
-1, 4, 4, -1, 1, 9, 75, // O16_O16_to_He4_Si28
24-
-1, 0, 6, -1, 1, 5, 68, // p_Na23_to_He4_Ne20
25-
-1, 0, 8, -1, 1, 7, 71, // p_Al27_to_He4_Mg24
26-
-1, 0, 10, -1, 1, 9, 74, // p_P31_to_He4_Si28
27-
1, 1, 1, -1, -1, 2, 66, // He4_He4_He4_to_C12
8+
-1, 0, 2, -1, -1, 3, 57, // p_C12_to_N13_reaclib
9+
-1, 1, 2, -1, -1, 4, 58, // He4_C12_to_O16_reaclib
10+
-1, 1, 4, -1, -1, 5, 59, // He4_O16_to_Ne20_reaclib
11+
-1, 1, 5, -1, -1, 7, 61, // He4_Ne20_to_Mg24_reaclib
12+
-1, 0, 6, -1, -1, 7, 60, // p_Na23_to_Mg24_reaclib
13+
-1, 1, 7, -1, -1, 9, 63, // He4_Mg24_to_Si28_reaclib
14+
-1, 0, 8, -1, -1, 9, 62, // p_Al27_to_Si28_reaclib
15+
-1, 1, 9, -1, -1, 11, 65, // He4_Si28_to_S32_reaclib
16+
-1, 0, 10, -1, -1, 11, 64, // p_P31_to_S32_reaclib
17+
-1, 2, 2, -1, 0, 6, 70, // C12_C12_to_p_Na23_reaclib
18+
-1, 2, 2, -1, 1, 5, 69, // C12_C12_to_He4_Ne20_reaclib
19+
-1, 1, 3, -1, 0, 4, 67, // He4_N13_to_p_O16_reaclib
20+
-1, 2, 4, -1, 0, 8, 73, // C12_O16_to_p_Al27_reaclib
21+
-1, 2, 4, -1, 1, 7, 72, // C12_O16_to_He4_Mg24_reaclib
22+
-1, 4, 4, -1, 0, 10, 76, // O16_O16_to_p_P31_reaclib
23+
-1, 4, 4, -1, 1, 9, 75, // O16_O16_to_He4_Si28_reaclib
24+
-1, 0, 6, -1, 1, 5, 68, // p_Na23_to_He4_Ne20_reaclib
25+
-1, 0, 8, -1, 1, 7, 71, // p_Al27_to_He4_Mg24_reaclib
26+
-1, 0, 10, -1, 1, 9, 74, // p_P31_to_He4_Si28_reaclib
27+
1, 1, 1, -1, -1, 2, 66, // He4_He4_He4_to_C12_reaclib
2828
-1, -1, -1, -1, -1, -1, -1, // C12_C12_to_n_Mg23_removed
2929
-1, -1, -1, -1, -1, -1, -1, // O16_O16_to_n_S31_removed
3030
-1, -1, -1, -1, -1, -1, -1, // C12_O16_to_n_Si27_removed
@@ -84,24 +84,24 @@ namespace NSE_INDEX
8484
-1, -1, 7, -1, 2, 2, -1, // Mg24_to_C12_C12_derived
8585
-1, -1, 11, -1, 4, 4, -1, // S32_to_O16_O16_derived
8686
-1, -1, 9, -1, 2, 4, -1, // Si28_to_C12_O16_derived
87-
-1, -1, -1, -1, -1, -1, -1, // He4_S32_to_p_Cl35_derived_removed
88-
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_He4_S32_derived_removed
89-
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_p_Cl35_derived_removed
90-
-1, -1, -1, -1, -1, -1, -1, // He4_Ar36_to_p_K39_derived_removed
91-
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_He4_Ar36_derived_removed
92-
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_p_K39_derived_removed
93-
-1, -1, -1, -1, -1, -1, -1, // He4_Ca40_to_p_Sc43_derived_removed
94-
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_He4_Ca40_derived_removed
95-
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_p_Sc43_derived_removed
96-
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_He4_Ti44_derived_removed
97-
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_p_V47_derived_removed
98-
-1, -1, -1, -1, -1, -1, -1, // p_V47_to_He4_Ti44_derived_removed
99-
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_He4_Cr48_derived_removed
100-
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_p_Mn51_derived_removed
101-
-1, -1, -1, -1, -1, -1, -1, // p_Mn51_to_He4_Cr48_derived_removed
102-
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_He4_Fe52_derived_removed
103-
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_p_Co55_derived_removed
104-
-1, -1, -1, -1, -1, -1, -1 // p_Co55_to_He4_Fe52_derived_removed
87+
-1, -1, -1, -1, -1, -1, -1, // He4_S32_to_p_Cl35_removed
88+
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_He4_S32_removed
89+
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_p_Cl35_removed
90+
-1, -1, -1, -1, -1, -1, -1, // He4_Ar36_to_p_K39_removed
91+
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_He4_Ar36_removed
92+
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_p_K39_removed
93+
-1, -1, -1, -1, -1, -1, -1, // He4_Ca40_to_p_Sc43_removed
94+
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_He4_Ca40_removed
95+
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_p_Sc43_removed
96+
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_He4_Ti44_removed
97+
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_p_V47_removed
98+
-1, -1, -1, -1, -1, -1, -1, // p_V47_to_He4_Ti44_removed
99+
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_He4_Cr48_removed
100+
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_p_Mn51_removed
101+
-1, -1, -1, -1, -1, -1, -1, // p_Mn51_to_He4_Cr48_removed
102+
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_He4_Fe52_removed
103+
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_p_Co55_removed
104+
-1, -1, -1, -1, -1, -1, -1 // p_Co55_to_He4_Fe52_removed
105105
};
106106
}
107107
#endif

0 commit comments

Comments
 (0)