Skip to content
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

update networks, benchmarks, and NSE_index due to specie name capitalization #1362

Merged
merged 9 commits into from
Oct 23, 2023
Merged

update networks, benchmarks, and NSE_index due to specie name capitalization #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e25a7f5
update benchmarks networks and nse_index
zhichen3 Oct 20, 2023
402e928
update network and benchmark
zhichen3 Oct 20, 2023
004663c
update benchmark
zhichen3 Oct 21, 2023
5a4e367
update
zhichen3 Oct 23, 2023
546435b
Merge branch 'development' into update_nuc_capitalize
zhichen3 Oct 23, 2023
f1f30e0
update test_rhs ecsn benchmark
zhichen3 Oct 23, 2023
33e83d6
Merge branch 'update_nuc_capitalize' of github.com:zhichen3/Microphys…
zhichen3 Oct 23, 2023
9a172d5
Merge branch 'development' into update_nuc_capitalize
zhichen3 Oct 23, 2023
c853749
add white space
zhichen3 Oct 23, 2023
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
156 changes: 78 additions & 78 deletions networks/CNO_extras/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,44 +24,44 @@ namespace Rates

enum NetworkRates
{
k_n13_to_c13_weak_wc12 = 1,
k_o14_to_n14_weak_wc12 = 2,
k_o15_to_n15_weak_wc12 = 3,
k_f17_to_o17_weak_wc12 = 4,
k_f18_to_o18_weak_wc12 = 5,
k_ne18_to_f18_weak_wc12 = 6,
k_ne19_to_f19_weak_wc12 = 7,
k_p_c12_to_n13 = 8,
k_he4_c12_to_o16 = 9,
k_p_c13_to_n14 = 10,
k_p_n13_to_o14 = 11,
k_p_n14_to_o15 = 12,
k_he4_n14_to_f18 = 13,
k_p_n15_to_o16 = 14,
k_he4_n15_to_f19 = 15,
k_he4_o14_to_ne18 = 16,
k_he4_o15_to_ne19 = 17,
k_p_o16_to_f17 = 18,
k_he4_o16_to_ne20 = 19,
k_p_o17_to_f18 = 20,
k_p_o18_to_f19 = 21,
k_p_f17_to_ne18 = 22,
k_p_f18_to_ne19 = 23,
k_p_f19_to_ne20 = 24,
k_he4_ne18_to_mg22 = 25,
k_he4_ne20_to_mg24 = 26,
k_c12_c12_to_he4_ne20 = 27,
k_he4_n13_to_p_o16 = 28,
k_p_n15_to_he4_c12 = 29,
k_he4_o14_to_p_f17 = 30,
k_c12_o16_to_he4_mg24 = 31,
k_p_o17_to_he4_n14 = 32,
k_p_o18_to_he4_n15 = 33,
k_p_f18_to_he4_o15 = 34,
k_p_f19_to_he4_o16 = 35,
k_p_ne20_to_he4_f17 = 36,
k_he4_he4_he4_to_c12 = 37,
NumRates = k_he4_he4_he4_to_c12
k_N13_to_C13_weak_wc12 = 1,
k_O14_to_N14_weak_wc12 = 2,
k_O15_to_N15_weak_wc12 = 3,
k_F17_to_O17_weak_wc12 = 4,
k_F18_to_O18_weak_wc12 = 5,
k_Ne18_to_F18_weak_wc12 = 6,
k_Ne19_to_F19_weak_wc12 = 7,
k_p_C12_to_N13 = 8,
k_He4_C12_to_O16 = 9,
k_p_C13_to_N14 = 10,
k_p_N13_to_O14 = 11,
k_p_N14_to_O15 = 12,
k_He4_N14_to_F18 = 13,
k_p_N15_to_O16 = 14,
k_He4_N15_to_F19 = 15,
k_He4_O14_to_Ne18 = 16,
k_He4_O15_to_Ne19 = 17,
k_p_O16_to_F17 = 18,
k_He4_O16_to_Ne20 = 19,
k_p_O17_to_F18 = 20,
k_p_O18_to_F19 = 21,
k_p_F17_to_Ne18 = 22,
k_p_F18_to_Ne19 = 23,
k_p_F19_to_Ne20 = 24,
k_He4_Ne18_to_Mg22 = 25,
k_He4_Ne20_to_Mg24 = 26,
k_C12_C12_to_He4_Ne20 = 27,
k_He4_N13_to_p_O16 = 28,
k_p_N15_to_He4_C12 = 29,
k_He4_O14_to_p_F17 = 30,
k_C12_O16_to_He4_Mg24 = 31,
k_p_O17_to_He4_N14 = 32,
k_p_O18_to_He4_N15 = 33,
k_p_F18_to_He4_O15 = 34,
k_p_F19_to_He4_O16 = 35,
k_p_Ne20_to_He4_F17 = 36,
k_He4_He4_He4_to_C12 = 37,
NumRates = k_He4_He4_He4_to_C12
};

// number of reaclib rates
Expand All @@ -78,53 +78,53 @@ namespace Rates

static const std::vector<std::string> rate_names = {
"", // 0
"n13_to_c13_weak_wc12", // 1,
"o14_to_n14_weak_wc12", // 2,
"o15_to_n15_weak_wc12", // 3,
"f17_to_o17_weak_wc12", // 4,
"f18_to_o18_weak_wc12", // 5,
"ne18_to_f18_weak_wc12", // 6,
"ne19_to_f19_weak_wc12", // 7,
"p_c12_to_n13", // 8,
"he4_c12_to_o16", // 9,
"p_c13_to_n14", // 10,
"p_n13_to_o14", // 11,
"p_n14_to_o15", // 12,
"he4_n14_to_f18", // 13,
"p_n15_to_o16", // 14,
"he4_n15_to_f19", // 15,
"he4_o14_to_ne18", // 16,
"he4_o15_to_ne19", // 17,
"p_o16_to_f17", // 18,
"he4_o16_to_ne20", // 19,
"p_o17_to_f18", // 20,
"p_o18_to_f19", // 21,
"p_f17_to_ne18", // 22,
"p_f18_to_ne19", // 23,
"p_f19_to_ne20", // 24,
"he4_ne18_to_mg22", // 25,
"he4_ne20_to_mg24", // 26,
"c12_c12_to_he4_ne20", // 27,
"he4_n13_to_p_o16", // 28,
"p_n15_to_he4_c12", // 29,
"he4_o14_to_p_f17", // 30,
"c12_o16_to_he4_mg24", // 31,
"p_o17_to_he4_n14", // 32,
"p_o18_to_he4_n15", // 33,
"p_f18_to_he4_o15", // 34,
"p_f19_to_he4_o16", // 35,
"p_ne20_to_he4_f17", // 36,
"he4_he4_he4_to_c12" // 37,
"N13_to_C13_weak_wc12", // 1,
"O14_to_N14_weak_wc12", // 2,
"O15_to_N15_weak_wc12", // 3,
"F17_to_O17_weak_wc12", // 4,
"F18_to_O18_weak_wc12", // 5,
"Ne18_to_F18_weak_wc12", // 6,
"Ne19_to_F19_weak_wc12", // 7,
"p_C12_to_N13", // 8,
"He4_C12_to_O16", // 9,
"p_C13_to_N14", // 10,
"p_N13_to_O14", // 11,
"p_N14_to_O15", // 12,
"He4_N14_to_F18", // 13,
"p_N15_to_O16", // 14,
"He4_N15_to_F19", // 15,
"He4_O14_to_Ne18", // 16,
"He4_O15_to_Ne19", // 17,
"p_O16_to_F17", // 18,
"He4_O16_to_Ne20", // 19,
"p_O17_to_F18", // 20,
"p_O18_to_F19", // 21,
"p_F17_to_Ne18", // 22,
"p_F18_to_Ne19", // 23,
"p_F19_to_Ne20", // 24,
"He4_Ne18_to_Mg22", // 25,
"He4_Ne20_to_Mg24", // 26,
"C12_C12_to_He4_Ne20", // 27,
"He4_N13_to_p_O16", // 28,
"p_N15_to_He4_C12", // 29,
"He4_O14_to_p_F17", // 30,
"C12_O16_to_He4_Mg24", // 31,
"p_O17_to_He4_N14", // 32,
"p_O18_to_He4_N15", // 33,
"p_F18_to_He4_O15", // 34,
"p_F19_to_He4_O16", // 35,
"p_Ne20_to_He4_F17", // 36,
"He4_He4_He4_to_C12" // 37,
};

}

#ifdef NSE_NET
namespace NSE_INDEX
{
constexpr int h1_index = 0;
constexpr int n_index = -1;
constexpr int he4_index = 1;
constexpr int H1_index = 0;
constexpr int N_index = -1;
constexpr int He4_index = 1;

// Each row corresponds to the rate in NetworkRates enum
// First 3 row indices for reactants, followed by 3 product indices
Expand Down
Loading