Skip to content

update pynucastro nets to pynucastro >= 3.0 #2049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zingale wants to merge 8 commits into
base: development
Choose a base branch
from
Open

update pynucastro nets to pynucastro >= 3.0 #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bed7041
update pynucastro nets to pynucastro >= 3.0
zingale Aug 27, 2026
b3fdd1c
update
zingale Aug 27, 2026
d035bcf
missing
zingale Aug 27, 2026
9cf4e3b
update
zingale Aug 28, 2026
033f3b3
Merge branch 'development' into update_pynucastro_nets_3
zingale Sep 3, 2026
2559009
more updates to sync with C++ changes
zingale Sep 3, 2026
288eafa
update
zingale Sep 4, 2026
6e19dca
update benchmark
zingale Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions networks/CNO_extras/Make.package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ ifeq ($(USE_REACT),TRUE)
CEXE_headers += rate_type.H
CEXE_headers += reaclib_rates.H
CEXE_headers += approximate_rates.H
CEXE_headers += branched_rates.H
CEXE_headers += modified_rates.H
CEXE_headers += table_rates.H
CEXE_headers += temperature_table_rates.H
CEXE_headers += tabular_weak_rates.H
CEXE_headers += derived_rates.H
USE_SCREENING = TRUE
USE_NEUTRINOS = TRUE
Expand Down
262 changes: 131 additions & 131 deletions networks/CNO_extras/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef actual_network_H
#define actual_network_H
#ifndef ACTUAL_NETWORK_H
#define ACTUAL_NETWORK_H

#include <random>
#include <string_view>
Expand Down Expand Up @@ -222,47 +222,47 @@ namespace Rates
enum NetworkRates :
std::uint8_t
{
k_N13_to_C13_reaclib = 1,
k_O14_to_N14_reaclib = 2,
k_O15_to_N15_reaclib = 3,
k_p_C12_to_N13_reaclib = 4,
k_He4_C12_to_O16_reaclib = 5,
k_p_C13_to_N14_reaclib = 6,
k_p_N13_to_O14_reaclib = 7,
k_p_N14_to_O15_reaclib = 8,
k_He4_N14_to_F18_reaclib = 9,
k_p_N15_to_O16_reaclib = 10,
k_He4_N15_to_F19_reaclib = 11,
k_He4_O14_to_Ne18_reaclib = 12,
k_He4_O15_to_Ne19_reaclib = 13,
k_p_O16_to_F17_reaclib = 14,
k_He4_O16_to_Ne20_reaclib = 15,
k_p_O17_to_F18_reaclib = 16,
k_p_O18_to_F19_reaclib = 17,
k_p_F17_to_Ne18_reaclib = 18,
k_p_F18_to_Ne19_reaclib = 19,
k_p_F19_to_Ne20_reaclib = 20,
k_He4_Ne18_to_Mg22_reaclib = 21,
k_He4_Ne20_to_Mg24_reaclib = 22,
k_N13_to_C13_beta_pos_reaclib = 1,
k_O14_to_N14_beta_pos_reaclib = 2,
k_O15_to_N15_beta_pos_reaclib = 3,
k_C12_p_to_N13_reaclib = 4,
k_C12_He4_to_O16_reaclib = 5,
k_C13_p_to_N14_reaclib = 6,
k_N13_p_to_O14_reaclib = 7,
k_N14_p_to_O15_reaclib = 8,
k_N14_He4_to_F18_reaclib = 9,
k_N15_p_to_O16_reaclib = 10,
k_N15_He4_to_F19_reaclib = 11,
k_O14_He4_to_Ne18_reaclib = 12,
k_O15_He4_to_Ne19_reaclib = 13,
k_O16_p_to_F17_reaclib = 14,
k_O16_He4_to_Ne20_reaclib = 15,
k_O17_p_to_F18_reaclib = 16,
k_O18_p_to_F19_reaclib = 17,
k_F17_p_to_Ne18_reaclib = 18,
k_F18_p_to_Ne19_reaclib = 19,
k_F19_p_to_Ne20_reaclib = 20,
k_Ne18_He4_to_Mg22_reaclib = 21,
k_Ne20_He4_to_Mg24_reaclib = 22,
k_C12_C12_to_He4_Ne20_reaclib = 23,
k_He4_N13_to_p_O16_reaclib = 24,
k_p_N15_to_He4_C12_reaclib = 25,
k_He4_O14_to_p_F17_reaclib = 26,
k_C12_O16_to_He4_Mg24_reaclib = 27,
k_p_O17_to_He4_N14_reaclib = 28,
k_p_O18_to_He4_N15_reaclib = 29,
k_p_F18_to_He4_O15_reaclib = 30,
k_p_F19_to_He4_O16_reaclib = 31,
k_p_Ne20_to_He4_F17_reaclib = 32,
k_N13_He4_to_p_O16_reaclib = 24,
k_N15_p_to_He4_C12_reaclib = 25,
k_O14_He4_to_p_F17_reaclib = 26,
k_O16_C12_to_He4_Mg24_reaclib = 27,
k_O17_p_to_He4_N14_reaclib = 28,
k_O18_p_to_He4_N15_reaclib = 29,
k_F18_p_to_He4_O15_reaclib = 30,
k_F19_p_to_He4_O16_reaclib = 31,
k_Ne20_p_to_He4_F17_reaclib = 32,
k_He4_He4_He4_to_C12_reaclib = 33,
k_F17_to_O17_weaktab = 34,
k_O17_to_F17_weaktab = 35,
k_F18_to_Ne18_weaktab = 36,
k_F18_to_O18_weaktab = 37,
k_Ne18_to_F18_weaktab = 38,
k_O18_to_F18_weaktab = 39,
k_F19_to_Ne19_weaktab = 40,
k_Ne19_to_F19_weaktab = 41,
k_F17_to_O17_electron_capture_weaktab = 34,
k_O17_to_F17_beta_neg_weaktab = 35,
k_F18_to_Ne18_beta_neg_weaktab = 36,
k_F18_to_O18_electron_capture_weaktab = 37,
k_Ne18_to_F18_electron_capture_weaktab = 38,
k_O18_to_F18_beta_neg_weaktab = 39,
k_F19_to_Ne19_beta_neg_weaktab = 40,
k_Ne19_to_F19_electron_capture_weaktab = 41,
k_N13_to_p_C12_derived = 42,
k_N14_to_p_C13_derived = 43,
k_O14_to_p_N13_derived = 44,
Expand All @@ -282,18 +282,18 @@ namespace Rates
k_Ne20_to_He4_O16_derived = 58,
k_Mg22_to_He4_Ne18_derived = 59,
k_Mg24_to_He4_Ne20_derived = 60,
k_C12_to_He4_He4_He4_derived = 61,
k_He4_C12_to_p_N15_derived = 62,
k_He4_N14_to_p_O17_derived = 63,
k_He4_N15_to_p_O18_derived = 64,
k_He4_O15_to_p_F18_derived = 65,
k_p_O16_to_He4_N13_derived = 66,
k_He4_O16_to_p_F19_derived = 67,
k_p_F17_to_He4_O14_derived = 68,
k_He4_F17_to_p_Ne20_derived = 69,
k_He4_Ne20_to_C12_C12_derived = 70,
k_He4_Mg24_to_C12_O16_derived = 71,
NumRates = k_He4_Mg24_to_C12_O16_derived
k_C12_to_3He4_derived = 61,
k_C12_He4_to_p_N15_derived = 62,
k_N14_He4_to_p_O17_derived = 63,
k_N15_He4_to_p_O18_derived = 64,
k_O15_He4_to_p_F18_derived = 65,
k_O16_p_to_He4_N13_derived = 66,
k_O16_He4_to_p_F19_derived = 67,
k_F17_p_to_He4_O14_derived = 68,
k_F17_He4_to_p_Ne20_derived = 69,
k_Ne20_He4_to_C12_C12_derived = 70,
k_Mg24_He4_to_C12_O16_derived = 71,
NumRates = k_Mg24_He4_to_C12_O16_derived
};

enum ScreenPairs :
Expand Down Expand Up @@ -335,47 +335,47 @@ namespace Rates

static const std::vector<std::string> rate_names = {
"", // 0
"N13_to_C13_reaclib", // 1,
"O14_to_N14_reaclib", // 2,
"O15_to_N15_reaclib", // 3,
"p_C12_to_N13_reaclib", // 4,
"He4_C12_to_O16_reaclib", // 5,
"p_C13_to_N14_reaclib", // 6,
"p_N13_to_O14_reaclib", // 7,
"p_N14_to_O15_reaclib", // 8,
"He4_N14_to_F18_reaclib", // 9,
"p_N15_to_O16_reaclib", // 10,
"He4_N15_to_F19_reaclib", // 11,
"He4_O14_to_Ne18_reaclib", // 12,
"He4_O15_to_Ne19_reaclib", // 13,
"p_O16_to_F17_reaclib", // 14,
"He4_O16_to_Ne20_reaclib", // 15,
"p_O17_to_F18_reaclib", // 16,
"p_O18_to_F19_reaclib", // 17,
"p_F17_to_Ne18_reaclib", // 18,
"p_F18_to_Ne19_reaclib", // 19,
"p_F19_to_Ne20_reaclib", // 20,
"He4_Ne18_to_Mg22_reaclib", // 21,
"He4_Ne20_to_Mg24_reaclib", // 22,
"N13_to_C13_beta_pos_reaclib", // 1,
"O14_to_N14_beta_pos_reaclib", // 2,
"O15_to_N15_beta_pos_reaclib", // 3,
"C12_p_to_N13_reaclib", // 4,
"C12_He4_to_O16_reaclib", // 5,
"C13_p_to_N14_reaclib", // 6,
"N13_p_to_O14_reaclib", // 7,
"N14_p_to_O15_reaclib", // 8,
"N14_He4_to_F18_reaclib", // 9,
"N15_p_to_O16_reaclib", // 10,
"N15_He4_to_F19_reaclib", // 11,
"O14_He4_to_Ne18_reaclib", // 12,
"O15_He4_to_Ne19_reaclib", // 13,
"O16_p_to_F17_reaclib", // 14,
"O16_He4_to_Ne20_reaclib", // 15,
"O17_p_to_F18_reaclib", // 16,
"O18_p_to_F19_reaclib", // 17,
"F17_p_to_Ne18_reaclib", // 18,
"F18_p_to_Ne19_reaclib", // 19,
"F19_p_to_Ne20_reaclib", // 20,
"Ne18_He4_to_Mg22_reaclib", // 21,
"Ne20_He4_to_Mg24_reaclib", // 22,
"C12_C12_to_He4_Ne20_reaclib", // 23,
"He4_N13_to_p_O16_reaclib", // 24,
"p_N15_to_He4_C12_reaclib", // 25,
"He4_O14_to_p_F17_reaclib", // 26,
"C12_O16_to_He4_Mg24_reaclib", // 27,
"p_O17_to_He4_N14_reaclib", // 28,
"p_O18_to_He4_N15_reaclib", // 29,
"p_F18_to_He4_O15_reaclib", // 30,
"p_F19_to_He4_O16_reaclib", // 31,
"p_Ne20_to_He4_F17_reaclib", // 32,
"N13_He4_to_p_O16_reaclib", // 24,
"N15_p_to_He4_C12_reaclib", // 25,
"O14_He4_to_p_F17_reaclib", // 26,
"O16_C12_to_He4_Mg24_reaclib", // 27,
"O17_p_to_He4_N14_reaclib", // 28,
"O18_p_to_He4_N15_reaclib", // 29,
"F18_p_to_He4_O15_reaclib", // 30,
"F19_p_to_He4_O16_reaclib", // 31,
"Ne20_p_to_He4_F17_reaclib", // 32,
"He4_He4_He4_to_C12_reaclib", // 33,
"F17_to_O17_weaktab", // 34,
"O17_to_F17_weaktab", // 35,
"F18_to_Ne18_weaktab", // 36,
"F18_to_O18_weaktab", // 37,
"Ne18_to_F18_weaktab", // 38,
"O18_to_F18_weaktab", // 39,
"F19_to_Ne19_weaktab", // 40,
"Ne19_to_F19_weaktab", // 41,
"F17_to_O17_electron_capture_weaktab", // 34,
"O17_to_F17_beta_neg_weaktab", // 35,
"F18_to_Ne18_beta_neg_weaktab", // 36,
"F18_to_O18_electron_capture_weaktab", // 37,
"Ne18_to_F18_electron_capture_weaktab", // 38,
"O18_to_F18_beta_neg_weaktab", // 39,
"F19_to_Ne19_beta_neg_weaktab", // 40,
"Ne19_to_F19_electron_capture_weaktab", // 41,
"N13_to_p_C12_derived", // 42,
"N14_to_p_C13_derived", // 43,
"O14_to_p_N13_derived", // 44,
Expand All @@ -395,17 +395,17 @@ namespace Rates
"Ne20_to_He4_O16_derived", // 58,
"Mg22_to_He4_Ne18_derived", // 59,
"Mg24_to_He4_Ne20_derived", // 60,
"C12_to_He4_He4_He4_derived", // 61,
"He4_C12_to_p_N15_derived", // 62,
"He4_N14_to_p_O17_derived", // 63,
"He4_N15_to_p_O18_derived", // 64,
"He4_O15_to_p_F18_derived", // 65,
"p_O16_to_He4_N13_derived", // 66,
"He4_O16_to_p_F19_derived", // 67,
"p_F17_to_He4_O14_derived", // 68,
"He4_F17_to_p_Ne20_derived", // 69,
"He4_Ne20_to_C12_C12_derived", // 70,
"He4_Mg24_to_C12_O16_derived" // 71,
"C12_to_3He4_derived", // 61,
"C12_He4_to_p_N15_derived", // 62,
"N14_He4_to_p_O17_derived", // 63,
"N15_He4_to_p_O18_derived", // 64,
"O15_He4_to_p_F18_derived", // 65,
"O16_p_to_He4_N13_derived", // 66,
"O16_He4_to_p_F19_derived", // 67,
"F17_p_to_He4_O14_derived", // 68,
"F17_He4_to_p_Ne20_derived", // 69,
"Ne20_He4_to_C12_C12_derived", // 70,
"Mg24_He4_to_C12_O16_derived" // 71,
};

template<std::uint8_t rate>
Expand Down Expand Up @@ -438,34 +438,34 @@ namespace NSE_INDEX
constexpr int NumNSERatePairs = 28;

inline AMREX_GPU_MANAGED amrex::Array2D<std::int8_t, 1, NumNSERatePairs, 1, 10, amrex::Order::C> rate_pair_data {
H1, C12, -1, N13, -1, -1, C12, N13, k_p_C12_to_N13_reaclib, k_N13_to_p_C12_derived,
He4, C12, -1, O16, -1, -1, C12, O16, k_He4_C12_to_O16_reaclib, k_O16_to_He4_C12_derived,
H1, C13, -1, N14, -1, -1, C13, N14, k_p_C13_to_N14_reaclib, k_N14_to_p_C13_derived,
H1, N13, -1, O14, -1, -1, N13, O14, k_p_N13_to_O14_reaclib, k_O14_to_p_N13_derived,
H1, N14, -1, O15, -1, -1, N14, O15, k_p_N14_to_O15_reaclib, k_O15_to_p_N14_derived,
He4, N14, -1, F18, -1, -1, N14, F18, k_He4_N14_to_F18_reaclib, k_F18_to_He4_N14_derived,
H1, N15, -1, O16, -1, -1, N15, O16, k_p_N15_to_O16_reaclib, k_O16_to_p_N15_derived,
He4, N15, -1, F19, -1, -1, N15, F19, k_He4_N15_to_F19_reaclib, k_F19_to_He4_N15_derived,
He4, O14, -1, Ne18, -1, -1, O14, Ne18, k_He4_O14_to_Ne18_reaclib, k_Ne18_to_He4_O14_derived,
He4, O15, -1, Ne19, -1, -1, O15, Ne19, k_He4_O15_to_Ne19_reaclib, k_Ne19_to_He4_O15_derived,
H1, O16, -1, F17, -1, -1, O16, F17, k_p_O16_to_F17_reaclib, k_F17_to_p_O16_derived,
He4, O16, -1, Ne20, -1, -1, O16, Ne20, k_He4_O16_to_Ne20_reaclib, k_Ne20_to_He4_O16_derived,
H1, O17, -1, F18, -1, -1, O17, F18, k_p_O17_to_F18_reaclib, k_F18_to_p_O17_derived,
H1, O18, -1, F19, -1, -1, O18, F19, k_p_O18_to_F19_reaclib, k_F19_to_p_O18_derived,
H1, F17, -1, Ne18, -1, -1, F17, Ne18, k_p_F17_to_Ne18_reaclib, k_Ne18_to_p_F17_derived,
H1, F18, -1, Ne19, -1, -1, F18, Ne19, k_p_F18_to_Ne19_reaclib, k_Ne19_to_p_F18_derived,
H1, F19, -1, Ne20, -1, -1, F19, Ne20, k_p_F19_to_Ne20_reaclib, k_Ne20_to_p_F19_derived,
He4, Ne18, -1, Mg22, -1, -1, Ne18, Mg22, k_He4_Ne18_to_Mg22_reaclib, k_Mg22_to_He4_Ne18_derived,
He4, Ne20, -1, Mg24, -1, -1, Ne20, Mg24, k_He4_Ne20_to_Mg24_reaclib, k_Mg24_to_He4_Ne20_derived,
He4, N13, -1, H1, O16, -1, N13, O16, k_He4_N13_to_p_O16_reaclib, k_p_O16_to_He4_N13_derived,
H1, N15, -1, He4, C12, -1, N15, C12, k_p_N15_to_He4_C12_reaclib, k_He4_C12_to_p_N15_derived,
He4, O14, -1, H1, F17, -1, O14, F17, k_He4_O14_to_p_F17_reaclib, k_p_F17_to_He4_O14_derived,
H1, O17, -1, He4, N14, -1, O17, N14, k_p_O17_to_He4_N14_reaclib, k_He4_N14_to_p_O17_derived,
H1, O18, -1, He4, N15, -1, O18, N15, k_p_O18_to_He4_N15_reaclib, k_He4_N15_to_p_O18_derived,
H1, F18, -1, He4, O15, -1, F18, O15, k_p_F18_to_He4_O15_reaclib, k_He4_O15_to_p_F18_derived,
H1, F19, -1, He4, O16, -1, F19, O16, k_p_F19_to_He4_O16_reaclib, k_He4_O16_to_p_F19_derived,
He4, He4, He4, C12, -1, -1, C12, -1, k_He4_He4_He4_to_C12_reaclib, k_C12_to_He4_He4_He4_derived,
He4, F17, -1, H1, Ne20, -1, F17, Ne20, k_He4_F17_to_p_Ne20_derived, k_p_Ne20_to_He4_F17_reaclib
H1, C12, -1, N13, -1, -1, C12, N13, k_C12_p_to_N13_reaclib, k_N13_to_p_C12_derived,
He4, C12, -1, O16, -1, -1, C12, O16, k_C12_He4_to_O16_reaclib, k_O16_to_He4_C12_derived,
H1, C13, -1, N14, -1, -1, C13, N14, k_C13_p_to_N14_reaclib, k_N14_to_p_C13_derived,
H1, N13, -1, O14, -1, -1, N13, O14, k_N13_p_to_O14_reaclib, k_O14_to_p_N13_derived,
H1, N14, -1, O15, -1, -1, N14, O15, k_N14_p_to_O15_reaclib, k_O15_to_p_N14_derived,
He4, N14, -1, F18, -1, -1, N14, F18, k_N14_He4_to_F18_reaclib, k_F18_to_He4_N14_derived,
H1, N15, -1, O16, -1, -1, N15, O16, k_N15_p_to_O16_reaclib, k_O16_to_p_N15_derived,
He4, N15, -1, F19, -1, -1, N15, F19, k_N15_He4_to_F19_reaclib, k_F19_to_He4_N15_derived,
He4, O14, -1, Ne18, -1, -1, O14, Ne18, k_O14_He4_to_Ne18_reaclib, k_Ne18_to_He4_O14_derived,
He4, O15, -1, Ne19, -1, -1, O15, Ne19, k_O15_He4_to_Ne19_reaclib, k_Ne19_to_He4_O15_derived,
H1, O16, -1, F17, -1, -1, O16, F17, k_O16_p_to_F17_reaclib, k_F17_to_p_O16_derived,
He4, O16, -1, Ne20, -1, -1, O16, Ne20, k_O16_He4_to_Ne20_reaclib, k_Ne20_to_He4_O16_derived,
H1, O17, -1, F18, -1, -1, O17, F18, k_O17_p_to_F18_reaclib, k_F18_to_p_O17_derived,
H1, O18, -1, F19, -1, -1, O18, F19, k_O18_p_to_F19_reaclib, k_F19_to_p_O18_derived,
H1, F17, -1, Ne18, -1, -1, F17, Ne18, k_F17_p_to_Ne18_reaclib, k_Ne18_to_p_F17_derived,
H1, F18, -1, Ne19, -1, -1, F18, Ne19, k_F18_p_to_Ne19_reaclib, k_Ne19_to_p_F18_derived,
H1, F19, -1, Ne20, -1, -1, F19, Ne20, k_F19_p_to_Ne20_reaclib, k_Ne20_to_p_F19_derived,
He4, Ne18, -1, Mg22, -1, -1, Ne18, Mg22, k_Ne18_He4_to_Mg22_reaclib, k_Mg22_to_He4_Ne18_derived,
He4, Ne20, -1, Mg24, -1, -1, Ne20, Mg24, k_Ne20_He4_to_Mg24_reaclib, k_Mg24_to_He4_Ne20_derived,
He4, N13, -1, H1, O16, -1, N13, O16, k_N13_He4_to_p_O16_reaclib, k_O16_p_to_He4_N13_derived,
H1, N15, -1, He4, C12, -1, N15, C12, k_N15_p_to_He4_C12_reaclib, k_C12_He4_to_p_N15_derived,
He4, O14, -1, H1, F17, -1, O14, F17, k_O14_He4_to_p_F17_reaclib, k_F17_p_to_He4_O14_derived,
H1, O17, -1, He4, N14, -1, O17, N14, k_O17_p_to_He4_N14_reaclib, k_N14_He4_to_p_O17_derived,
H1, O18, -1, He4, N15, -1, O18, N15, k_O18_p_to_He4_N15_reaclib, k_N15_He4_to_p_O18_derived,
H1, F18, -1, He4, O15, -1, F18, O15, k_F18_p_to_He4_O15_reaclib, k_O15_He4_to_p_F18_derived,
H1, F19, -1, He4, O16, -1, F19, O16, k_F19_p_to_He4_O16_reaclib, k_O16_He4_to_p_F19_derived,
He4, He4, He4, C12, -1, -1, C12, -1, k_He4_He4_He4_to_C12_reaclib, k_C12_to_3He4_derived,
He4, F17, -1, H1, Ne20, -1, F17, Ne20, k_F17_He4_to_p_Ne20_derived, k_Ne20_p_to_He4_F17_reaclib
};
}
#endif
Expand Down
Loading
Loading