Skip to content

Commit

Permalink
regenerate the subch family nets with the latest pynucastro
Browse files Browse the repository at this point in the history
this fixed partition function with HIP and updates the binding
energies to the latest Nubase
  • Loading branch information
zingale committed Dec 9, 2024
1 parent b5a9fec commit 00904c6
Show file tree
Hide file tree
Showing 14 changed files with 217 additions and 1,113 deletions.
Binary file modified networks/He-C-Fe-group/He-C-Fe-group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions networks/He-C-Fe-group/Make.package
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ ifeq ($(USE_REACT),TRUE)
CEXE_headers += actual_network.H
CEXE_headers += tfactors.H
CEXE_headers += partition_functions.H
CEXE_sources += partition_functions_data.cpp
CEXE_headers += actual_rhs.H
CEXE_headers += reaclib_rates.H
CEXE_headers += table_rates.H
Expand Down
68 changes: 34 additions & 34 deletions networks/He-C-Fe-group/actual_network.H
Original file line number Diff line number Diff line change
Expand Up @@ -33,106 +33,106 @@ namespace network
return 0.0_rt;
}
else if constexpr (spec == He4) {
return 28.29566_rt;
return 28.295662457999697_rt;
}
else if constexpr (spec == C12) {
return 92.16172800000001_rt;
return 92.16173498399803_rt;
}
else if constexpr (spec == N13) {
return 94.105219_rt;
return 94.10522604799917_rt;
}
else if constexpr (spec == N14) {
return 104.65859599999999_rt;
return 104.65860734799753_rt;
}
else if constexpr (spec == O16) {
return 127.619296_rt;
return 127.6193154119992_rt;
}
else if constexpr (spec == F18) {
return 137.369484_rt;
return 137.36950247599816_rt;
}
else if constexpr (spec == Ne20) {
return 160.6448_rt;
return 160.64482384000075_rt;
}
else if constexpr (spec == Ne21) {
return 167.405973_rt;
return 167.40598973999658_rt;
}
else if constexpr (spec == Na22) {
return 174.144674_rt;
return 174.14457080400098_rt;
}
else if constexpr (spec == Na23) {
return 186.56433900000002_rt;
return 186.56435240400242_rt;
}
else if constexpr (spec == Mg24) {
return 198.25701600000002_rt;
return 198.2570479679962_rt;
}
else if constexpr (spec == Al27) {
return 224.951931_rt;
return 224.95193723199915_rt;
}
else if constexpr (spec == Si28) {
return 236.536832_rt;
return 236.53684539599638_rt;
}
else if constexpr (spec == P31) {
return 262.91617699999995_rt;
return 262.9161999600037_rt;
}
else if constexpr (spec == S32) {
return 271.78012800000005_rt;
return 271.78016372399725_rt;
}
else if constexpr (spec == Ar36) {
return 306.716724_rt;
return 306.7167469519991_rt;
}
else if constexpr (spec == Ca40) {
return 342.05212000000006_rt;
return 342.05218528000114_rt;
}
else if constexpr (spec == Ti44) {
return 375.47488000000004_rt;
return 375.47496160800074_rt;
}
else if constexpr (spec == Cr48) {
return 411.46891200000005_rt;
return 411.4679399359957_rt;
}
else if constexpr (spec == Mn51) {
return 440.32237200000003_rt;
return 440.321747199996_rt;
}
else if constexpr (spec == Mn55) {
return 482.07621_rt;
return 482.07635959999607_rt;
}
else if constexpr (spec == Fe52) {
return 447.697848_rt;
return 447.6996182639923_rt;
}
else if constexpr (spec == Fe53) {
return 458.386347_rt;
return 458.38633636399754_rt;
}
else if constexpr (spec == Fe54) {
return 471.76462799999996_rt;
return 471.76475446399854_rt;
}
else if constexpr (spec == Fe55) {
return 481.06272499999994_rt;
return 481.06287256399816_rt;
}
else if constexpr (spec == Fe56) {
return 492.2598239999999_rt;
return 492.2599506639962_rt;
}
else if constexpr (spec == Co55) {
return 476.82899_rt;
return 476.82912552799826_rt;
}
else if constexpr (spec == Co56) {
return 486.91081599999995_rt;
return 486.91094362799777_rt;
}
else if constexpr (spec == Co57) {
return 498.287274_rt;
return 498.28746172798856_rt;
}
else if constexpr (spec == Ni56) {
return 483.995624_rt;
return 483.9956965919919_rt;
}
else if constexpr (spec == Ni57) {
return 494.2431810000001_rt;
return 494.2434146919986_rt;
}
else if constexpr (spec == Ni58) {
return 506.45942199999996_rt;
return 506.4596327920008_rt;
}
else if constexpr (spec == Cu59) {
return 509.878_rt;
return 509.8782038560021_rt;
}
else if constexpr (spec == Zn60) {
return 514.983_rt;
return 514.9831749199948_rt;
}


Expand Down
2 changes: 1 addition & 1 deletion networks/He-C-Fe-group/actual_network_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace NSE_INDEX
-1, -1, 26, -1, -1, 22, 89,
-1, -1, 27, -1, -1, 29, -1,
-1, -1, 22, -1, -1, 26, -1,
-1, -1, 0, -1, -1, 1, -1,
-1, -1, 0, -1, -1, 1, 93,
-1, -1, 31, -1, -1, 29, 84,
-1, -1, 32, -1, -1, 30, 85,
-1, -1, 1, -1, -1, 0, -1,
Expand Down
12 changes: 4 additions & 8 deletions networks/He-C-Fe-group/actual_rhs.H
Original file line number Diff line number Diff line change
Expand Up @@ -1468,12 +1468,10 @@ void get_ydot_weak(const burn_t& state,
auto screened_rates = rate_eval.screened_rates;

ydot_nuc(N) =
-screened_rates(k_n_to_p)*Y(N) +
screened_rates(k_p_to_n)*Y(H1);
(-screened_rates(k_n_to_p)*Y(N) + screened_rates(k_p_to_n)*Y(H1));

ydot_nuc(H1) =
screened_rates(k_n_to_p)*Y(N) +
-screened_rates(k_p_to_n)*Y(H1);
(screened_rates(k_n_to_p)*Y(N) + -screened_rates(k_p_to_n)*Y(H1));

ydot_nuc(He4) = 0.0_rt;

Expand Down Expand Up @@ -1585,8 +1583,7 @@ void rhs_nuc(const burn_t& state,
(-screened_rates(k_n_Ni58_to_He4_Fe55)*Y(Ni58)*Y(N)*state.rho + screened_rates(k_He4_Fe55_to_n_Ni58_derived)*Y(Fe55)*Y(He4)*state.rho) +
(-screened_rates(k_n_Cu59_to_He4_Co56)*Y(Cu59)*Y(N)*state.rho + screened_rates(k_He4_Co56_to_n_Cu59_derived)*Y(Co56)*Y(He4)*state.rho) +
(-screened_rates(k_n_Zn60_to_He4_Ni57)*Y(Zn60)*Y(N)*state.rho + screened_rates(k_He4_Ni57_to_n_Zn60_derived)*Y(He4)*Y(Ni57)*state.rho) +
-screened_rates(k_n_to_p)*Y(N) +
screened_rates(k_p_to_n)*Y(H1);
(-screened_rates(k_n_to_p)*Y(N) + screened_rates(k_p_to_n)*Y(H1));

ydot_nuc(H1) =
(-screened_rates(k_p_C12_to_N13)*Y(C12)*Y(H1)*state.rho + screened_rates(k_N13_to_p_C12_derived)*Y(N13)) +
Expand Down Expand Up @@ -1624,8 +1621,7 @@ void rhs_nuc(const burn_t& state,
(-screened_rates(k_p_Co57_to_He4_Fe54)*Y(Co57)*Y(H1)*state.rho + screened_rates(k_He4_Fe54_to_p_Co57_derived)*Y(Fe54)*Y(He4)*state.rho) +
(screened_rates(k_n_Ni56_to_p_Co56)*Y(Ni56)*Y(N)*state.rho + -screened_rates(k_p_Co56_to_n_Ni56_derived)*Y(Co56)*Y(H1)*state.rho) +
(screened_rates(k_n_Ni57_to_p_Co57)*Y(Ni57)*Y(N)*state.rho + -screened_rates(k_p_Co57_to_n_Ni57_derived)*Y(Co57)*Y(H1)*state.rho) +
screened_rates(k_n_to_p)*Y(N) +
-screened_rates(k_p_to_n)*Y(H1);
(screened_rates(k_n_to_p)*Y(N) + -screened_rates(k_p_to_n)*Y(H1));

ydot_nuc(He4) =
(-screened_rates(k_He4_C12_to_O16)*Y(C12)*Y(He4)*state.rho + screened_rates(k_O16_to_He4_C12_derived)*Y(O16)) +
Expand Down
Loading

0 comments on commit 00904c6

Please sign in to comment.