Skip to content

Commit 29eb867

Browse files
zingalezingale
authored
Merge branch 'development' into remove_nse_aprox_nets
2 parents 3a1c364 + 48e4acd commit 29eb867

File tree

212 files changed

+74959
-68691
lines changed

Some content is hidden

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

212 files changed

+74959
-68691
lines changed

‎networks/CNO_extras/Make.package‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
PYNUCASTRO_NETWORK = TRUE
12
CEXE_headers += network_properties.H
23

34
ifeq ($(USE_REACT),TRUE)
@@ -11,6 +12,8 @@ ifeq ($(USE_REACT),TRUE)
1112
CEXE_headers += reaclib_rates.H
1213
CEXE_headers += table_rates.H
1314
CEXE_sources += table_rates_data.cpp
15+
CEXE_headers += temperature_table_rates.H
16+
CEXE_headers += derived_rates.H
1417
USE_SCREENING = TRUE
1518
USE_NEUTRINOS = TRUE
1619
endif

‎networks/CNO_extras/actual_network.H‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -215,47 +215,47 @@ namespace Rates
215215
enum NetworkRates :
216216
std::uint8_t
217217
{
218-
k_N13_to_C13_weak_wc12 = 1,
219-
k_O14_to_N14_weak_wc12 = 2,
220-
k_O15_to_N15_weak_wc12 = 3,
221-
k_p_C12_to_N13 = 4,
222-
k_He4_C12_to_O16 = 5,
223-
k_p_C13_to_N14 = 6,
224-
k_p_N13_to_O14 = 7,
225-
k_p_N14_to_O15 = 8,
226-
k_He4_N14_to_F18 = 9,
227-
k_p_N15_to_O16 = 10,
228-
k_He4_N15_to_F19 = 11,
229-
k_He4_O14_to_Ne18 = 12,
230-
k_He4_O15_to_Ne19 = 13,
231-
k_p_O16_to_F17 = 14,
232-
k_He4_O16_to_Ne20 = 15,
233-
k_p_O17_to_F18 = 16,
234-
k_p_O18_to_F19 = 17,
235-
k_p_F17_to_Ne18 = 18,
236-
k_p_F18_to_Ne19 = 19,
237-
k_p_F19_to_Ne20 = 20,
238-
k_He4_Ne18_to_Mg22 = 21,
239-
k_He4_Ne20_to_Mg24 = 22,
240-
k_C12_C12_to_He4_Ne20 = 23,
241-
k_He4_N13_to_p_O16 = 24,
242-
k_p_N15_to_He4_C12 = 25,
243-
k_He4_O14_to_p_F17 = 26,
244-
k_C12_O16_to_He4_Mg24 = 27,
245-
k_p_O17_to_He4_N14 = 28,
246-
k_p_O18_to_He4_N15 = 29,
247-
k_p_F18_to_He4_O15 = 30,
248-
k_p_F19_to_He4_O16 = 31,
249-
k_p_Ne20_to_He4_F17 = 32,
250-
k_He4_He4_He4_to_C12 = 33,
251-
k_F17_to_O17 = 34,
252-
k_O17_to_F17 = 35,
253-
k_F18_to_Ne18 = 36,
254-
k_F18_to_O18 = 37,
255-
k_Ne18_to_F18 = 38,
256-
k_O18_to_F18 = 39,
257-
k_F19_to_Ne19 = 40,
258-
k_Ne19_to_F19 = 41,
218+
k_N13_to_C13_reaclib = 1,
219+
k_O14_to_N14_reaclib = 2,
220+
k_O15_to_N15_reaclib = 3,
221+
k_p_C12_to_N13_reaclib = 4,
222+
k_He4_C12_to_O16_reaclib = 5,
223+
k_p_C13_to_N14_reaclib = 6,
224+
k_p_N13_to_O14_reaclib = 7,
225+
k_p_N14_to_O15_reaclib = 8,
226+
k_He4_N14_to_F18_reaclib = 9,
227+
k_p_N15_to_O16_reaclib = 10,
228+
k_He4_N15_to_F19_reaclib = 11,
229+
k_He4_O14_to_Ne18_reaclib = 12,
230+
k_He4_O15_to_Ne19_reaclib = 13,
231+
k_p_O16_to_F17_reaclib = 14,
232+
k_He4_O16_to_Ne20_reaclib = 15,
233+
k_p_O17_to_F18_reaclib = 16,
234+
k_p_O18_to_F19_reaclib = 17,
235+
k_p_F17_to_Ne18_reaclib = 18,
236+
k_p_F18_to_Ne19_reaclib = 19,
237+
k_p_F19_to_Ne20_reaclib = 20,
238+
k_He4_Ne18_to_Mg22_reaclib = 21,
239+
k_He4_Ne20_to_Mg24_reaclib = 22,
240+
k_C12_C12_to_He4_Ne20_reaclib = 23,
241+
k_He4_N13_to_p_O16_reaclib = 24,
242+
k_p_N15_to_He4_C12_reaclib = 25,
243+
k_He4_O14_to_p_F17_reaclib = 26,
244+
k_C12_O16_to_He4_Mg24_reaclib = 27,
245+
k_p_O17_to_He4_N14_reaclib = 28,
246+
k_p_O18_to_He4_N15_reaclib = 29,
247+
k_p_F18_to_He4_O15_reaclib = 30,
248+
k_p_F19_to_He4_O16_reaclib = 31,
249+
k_p_Ne20_to_He4_F17_reaclib = 32,
250+
k_He4_He4_He4_to_C12_reaclib = 33,
251+
k_F17_to_O17_weaktab = 34,
252+
k_O17_to_F17_weaktab = 35,
253+
k_F18_to_Ne18_weaktab = 36,
254+
k_F18_to_O18_weaktab = 37,
255+
k_Ne18_to_F18_weaktab = 38,
256+
k_O18_to_F18_weaktab = 39,
257+
k_F19_to_Ne19_weaktab = 40,
258+
k_Ne19_to_F19_weaktab = 41,
259259
k_N13_to_p_C12_derived = 42,
260260
k_N14_to_p_C13_derived = 43,
261261
k_O14_to_p_N13_derived = 44,
@@ -295,47 +295,47 @@ namespace Rates
295295

296296
static const std::vector<std::string> rate_names = {
297297
"", // 0
298-
"N13_to_C13_weak_wc12", // 1,
299-
"O14_to_N14_weak_wc12", // 2,
300-
"O15_to_N15_weak_wc12", // 3,
301-
"p_C12_to_N13", // 4,
302-
"He4_C12_to_O16", // 5,
303-
"p_C13_to_N14", // 6,
304-
"p_N13_to_O14", // 7,
305-
"p_N14_to_O15", // 8,
306-
"He4_N14_to_F18", // 9,
307-
"p_N15_to_O16", // 10,
308-
"He4_N15_to_F19", // 11,
309-
"He4_O14_to_Ne18", // 12,
310-
"He4_O15_to_Ne19", // 13,
311-
"p_O16_to_F17", // 14,
312-
"He4_O16_to_Ne20", // 15,
313-
"p_O17_to_F18", // 16,
314-
"p_O18_to_F19", // 17,
315-
"p_F17_to_Ne18", // 18,
316-
"p_F18_to_Ne19", // 19,
317-
"p_F19_to_Ne20", // 20,
318-
"He4_Ne18_to_Mg22", // 21,
319-
"He4_Ne20_to_Mg24", // 22,
320-
"C12_C12_to_He4_Ne20", // 23,
321-
"He4_N13_to_p_O16", // 24,
322-
"p_N15_to_He4_C12", // 25,
323-
"He4_O14_to_p_F17", // 26,
324-
"C12_O16_to_He4_Mg24", // 27,
325-
"p_O17_to_He4_N14", // 28,
326-
"p_O18_to_He4_N15", // 29,
327-
"p_F18_to_He4_O15", // 30,
328-
"p_F19_to_He4_O16", // 31,
329-
"p_Ne20_to_He4_F17", // 32,
330-
"He4_He4_He4_to_C12", // 33,
331-
"F17_to_O17", // 34,
332-
"O17_to_F17", // 35,
333-
"F18_to_Ne18", // 36,
334-
"F18_to_O18", // 37,
335-
"Ne18_to_F18", // 38,
336-
"O18_to_F18", // 39,
337-
"F19_to_Ne19", // 40,
338-
"Ne19_to_F19", // 41,
298+
"N13_to_C13_reaclib", // 1,
299+
"O14_to_N14_reaclib", // 2,
300+
"O15_to_N15_reaclib", // 3,
301+
"p_C12_to_N13_reaclib", // 4,
302+
"He4_C12_to_O16_reaclib", // 5,
303+
"p_C13_to_N14_reaclib", // 6,
304+
"p_N13_to_O14_reaclib", // 7,
305+
"p_N14_to_O15_reaclib", // 8,
306+
"He4_N14_to_F18_reaclib", // 9,
307+
"p_N15_to_O16_reaclib", // 10,
308+
"He4_N15_to_F19_reaclib", // 11,
309+
"He4_O14_to_Ne18_reaclib", // 12,
310+
"He4_O15_to_Ne19_reaclib", // 13,
311+
"p_O16_to_F17_reaclib", // 14,
312+
"He4_O16_to_Ne20_reaclib", // 15,
313+
"p_O17_to_F18_reaclib", // 16,
314+
"p_O18_to_F19_reaclib", // 17,
315+
"p_F17_to_Ne18_reaclib", // 18,
316+
"p_F18_to_Ne19_reaclib", // 19,
317+
"p_F19_to_Ne20_reaclib", // 20,
318+
"He4_Ne18_to_Mg22_reaclib", // 21,
319+
"He4_Ne20_to_Mg24_reaclib", // 22,
320+
"C12_C12_to_He4_Ne20_reaclib", // 23,
321+
"He4_N13_to_p_O16_reaclib", // 24,
322+
"p_N15_to_He4_C12_reaclib", // 25,
323+
"He4_O14_to_p_F17_reaclib", // 26,
324+
"C12_O16_to_He4_Mg24_reaclib", // 27,
325+
"p_O17_to_He4_N14_reaclib", // 28,
326+
"p_O18_to_He4_N15_reaclib", // 29,
327+
"p_F18_to_He4_O15_reaclib", // 30,
328+
"p_F19_to_He4_O16_reaclib", // 31,
329+
"p_Ne20_to_He4_F17_reaclib", // 32,
330+
"He4_He4_He4_to_C12_reaclib", // 33,
331+
"F17_to_O17_weaktab", // 34,
332+
"O17_to_F17_weaktab", // 35,
333+
"F18_to_Ne18_weaktab", // 36,
334+
"F18_to_O18_weaktab", // 37,
335+
"Ne18_to_F18_weaktab", // 38,
336+
"O18_to_F18_weaktab", // 39,
337+
"F19_to_Ne19_weaktab", // 40,
338+
"Ne19_to_F19_weaktab", // 41,
339339
"N13_to_p_C12_derived", // 42,
340340
"N14_to_p_C13_derived", // 43,
341341
"O14_to_p_N13_derived", // 44,

‎networks/CNO_extras/actual_network_data.cpp‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@
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, -1, 4, -1, -1, 3, -1, // N13_to_C13_weak_wc12
9-
-1, -1, 7, -1, -1, 5, -1, // O14_to_N14_weak_wc12
10-
-1, -1, 8, -1, -1, 6, -1, // O15_to_N15_weak_wc12
11-
-1, 0, 2, -1, -1, 4, 42, // p_C12_to_N13
12-
-1, 1, 2, -1, -1, 9, 47, // He4_C12_to_O16
13-
-1, 0, 3, -1, -1, 5, 43, // p_C13_to_N14
14-
-1, 0, 4, -1, -1, 7, 44, // p_N13_to_O14
15-
-1, 0, 5, -1, -1, 8, 45, // p_N14_to_O15
16-
-1, 1, 5, -1, -1, 13, 50, // He4_N14_to_F18
17-
-1, 0, 6, -1, -1, 9, 46, // p_N15_to_O16
18-
-1, 1, 6, -1, -1, 14, 52, // He4_N15_to_F19
19-
-1, 1, 7, -1, -1, 15, 54, // He4_O14_to_Ne18
20-
-1, 1, 8, -1, -1, 16, 56, // He4_O15_to_Ne19
21-
-1, 0, 9, -1, -1, 12, 48, // p_O16_to_F17
22-
-1, 1, 9, -1, -1, 17, 58, // He4_O16_to_Ne20
23-
-1, 0, 10, -1, -1, 13, 49, // p_O17_to_F18
24-
-1, 0, 11, -1, -1, 14, 51, // p_O18_to_F19
25-
-1, 0, 12, -1, -1, 15, 53, // p_F17_to_Ne18
26-
-1, 0, 13, -1, -1, 16, 55, // p_F18_to_Ne19
27-
-1, 0, 14, -1, -1, 17, 57, // p_F19_to_Ne20
28-
-1, 1, 15, -1, -1, 18, 59, // He4_Ne18_to_Mg22
29-
-1, 1, 17, -1, -1, 19, 60, // He4_Ne20_to_Mg24
30-
-1, 2, 2, -1, 1, 17, 70, // C12_C12_to_He4_Ne20
31-
-1, 1, 4, -1, 0, 9, 66, // He4_N13_to_p_O16
32-
-1, 0, 6, -1, 1, 2, 62, // p_N15_to_He4_C12
33-
-1, 1, 7, -1, 0, 12, 68, // He4_O14_to_p_F17
34-
-1, 2, 9, -1, 1, 19, 71, // C12_O16_to_He4_Mg24
35-
-1, 0, 10, -1, 1, 5, 63, // p_O17_to_He4_N14
36-
-1, 0, 11, -1, 1, 6, 64, // p_O18_to_He4_N15
37-
-1, 0, 13, -1, 1, 8, 65, // p_F18_to_He4_O15
38-
-1, 0, 14, -1, 1, 9, 67, // p_F19_to_He4_O16
39-
-1, 0, 17, -1, 1, 12, -1, // p_Ne20_to_He4_F17
40-
1, 1, 1, -1, -1, 2, 61, // He4_He4_He4_to_C12
41-
-1, -1, 12, -1, -1, 10, 35, // F17_to_O17
42-
-1, -1, 10, -1, -1, 12, -1, // O17_to_F17
43-
-1, -1, 13, -1, -1, 15, -1, // F18_to_Ne18
44-
-1, -1, 13, -1, -1, 11, 39, // F18_to_O18
45-
-1, -1, 15, -1, -1, 13, 36, // Ne18_to_F18
46-
-1, -1, 11, -1, -1, 13, -1, // O18_to_F18
47-
-1, -1, 14, -1, -1, 16, -1, // F19_to_Ne19
48-
-1, -1, 16, -1, -1, 14, 40, // Ne19_to_F19
8+
-1, -1, -1, -1, -1, -1, -1, // N13_to_C13_reaclib
9+
-1, -1, -1, -1, -1, -1, -1, // O14_to_N14_reaclib
10+
-1, -1, -1, -1, -1, -1, -1, // O15_to_N15_reaclib
11+
-1, 0, 2, -1, -1, 4, 42, // p_C12_to_N13_reaclib
12+
-1, 1, 2, -1, -1, 9, 47, // He4_C12_to_O16_reaclib
13+
-1, 0, 3, -1, -1, 5, 43, // p_C13_to_N14_reaclib
14+
-1, 0, 4, -1, -1, 7, 44, // p_N13_to_O14_reaclib
15+
-1, 0, 5, -1, -1, 8, 45, // p_N14_to_O15_reaclib
16+
-1, 1, 5, -1, -1, 13, 50, // He4_N14_to_F18_reaclib
17+
-1, 0, 6, -1, -1, 9, 46, // p_N15_to_O16_reaclib
18+
-1, 1, 6, -1, -1, 14, 52, // He4_N15_to_F19_reaclib
19+
-1, 1, 7, -1, -1, 15, 54, // He4_O14_to_Ne18_reaclib
20+
-1, 1, 8, -1, -1, 16, 56, // He4_O15_to_Ne19_reaclib
21+
-1, 0, 9, -1, -1, 12, 48, // p_O16_to_F17_reaclib
22+
-1, 1, 9, -1, -1, 17, 58, // He4_O16_to_Ne20_reaclib
23+
-1, 0, 10, -1, -1, 13, 49, // p_O17_to_F18_reaclib
24+
-1, 0, 11, -1, -1, 14, 51, // p_O18_to_F19_reaclib
25+
-1, 0, 12, -1, -1, 15, 53, // p_F17_to_Ne18_reaclib
26+
-1, 0, 13, -1, -1, 16, 55, // p_F18_to_Ne19_reaclib
27+
-1, 0, 14, -1, -1, 17, 57, // p_F19_to_Ne20_reaclib
28+
-1, 1, 15, -1, -1, 18, 59, // He4_Ne18_to_Mg22_reaclib
29+
-1, 1, 17, -1, -1, 19, 60, // He4_Ne20_to_Mg24_reaclib
30+
-1, 2, 2, -1, 1, 17, 70, // C12_C12_to_He4_Ne20_reaclib
31+
-1, 1, 4, -1, 0, 9, 66, // He4_N13_to_p_O16_reaclib
32+
-1, 0, 6, -1, 1, 2, 62, // p_N15_to_He4_C12_reaclib
33+
-1, 1, 7, -1, 0, 12, 68, // He4_O14_to_p_F17_reaclib
34+
-1, 2, 9, -1, 1, 19, 71, // C12_O16_to_He4_Mg24_reaclib
35+
-1, 0, 10, -1, 1, 5, 63, // p_O17_to_He4_N14_reaclib
36+
-1, 0, 11, -1, 1, 6, 64, // p_O18_to_He4_N15_reaclib
37+
-1, 0, 13, -1, 1, 8, 65, // p_F18_to_He4_O15_reaclib
38+
-1, 0, 14, -1, 1, 9, 67, // p_F19_to_He4_O16_reaclib
39+
-1, 0, 17, -1, 1, 12, -1, // p_Ne20_to_He4_F17_reaclib
40+
1, 1, 1, -1, -1, 2, 61, // He4_He4_He4_to_C12_reaclib
41+
-1, -1, -1, -1, -1, -1, -1, // F17_to_O17_weaktab
42+
-1, -1, -1, -1, -1, -1, -1, // O17_to_F17_weaktab
43+
-1, -1, -1, -1, -1, -1, -1, // F18_to_Ne18_weaktab
44+
-1, -1, -1, -1, -1, -1, -1, // F18_to_O18_weaktab
45+
-1, -1, -1, -1, -1, -1, -1, // Ne18_to_F18_weaktab
46+
-1, -1, -1, -1, -1, -1, -1, // O18_to_F18_weaktab
47+
-1, -1, -1, -1, -1, -1, -1, // F19_to_Ne19_weaktab
48+
-1, -1, -1, -1, -1, -1, -1, // Ne19_to_F19_weaktab
4949
-1, -1, 4, -1, 0, 2, -1, // N13_to_p_C12_derived
5050
-1, -1, 5, -1, 0, 3, -1, // N14_to_p_C13_derived
5151
-1, -1, 7, -1, 0, 4, -1, // O14_to_p_N13_derived

0 commit comments

Comments
 (0)