Skip to content

remove compute_Q and rate= calls in DerivedRate #1902

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

Merged
zingale merged 6 commits into from
Dec 18, 2025
Merged

remove compute_Q and rate= calls in DerivedRate #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03d661b
remove compute_Q and rate= calss in DerivedRate
zhichen3 Dec 16, 2025
cfc364e
update somenetwork
zhichen3 Dec 16, 2025
e6d8091
update ci
zhichen3 Dec 16, 2025
5a16e7a
update ci ref again
zhichen3 Dec 16, 2025
e6a07e1
update docs
zhichen3 Dec 18, 2025
5bc1bcb
Merge branch 'update_derived_calls' of github.com:zhichen3/Microphysi…
zhichen3 Dec 18, 2025
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
4 changes: 2 additions & 2 deletions Docs/source/networks.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,11 @@ are effectively accounted for in the approximate rates.
There are 2 runtime parameters that can be used
to disable rates:

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

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

Expand Down
4 changes: 2 additions & 2 deletions networks/he-burn/ase-iron/ase_iron.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def get_library():
for r, mp in other_rates:
_r = reaclib_lib.get_rate_by_name(r)
forward_rate = pyna.ModifiedRate(_r, new_products=[mp])
derived_rate = pyna.DerivedRate(rate=forward_rate, compute_Q=True, use_pf=True)
derived_rate = pyna.DerivedRate(forward_rate, use_pf=True)
subch += pyna.Library(rates=[forward_rate, derived_rate])

# C12+Ne20 and reverse
Expand Down Expand Up @@ -70,7 +70,7 @@ def get_library():
if fr:
print(f"modifying {r} from {fr}")
subch.remove_rate(r)
d = pyna.DerivedRate(rate=fr, compute_Q=True, use_pf=True)
d = pyna.DerivedRate(fr, use_pf=True)
subch.add_rate(d)

subch.eliminate_duplicates(rate_type_preference="tabular")
Expand Down
4 changes: 2 additions & 2 deletions networks/he-burn/ase/_parameters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@namespace: network

disable_p_C12_to_N13 int 0
disable_He4_N13_to_p_O16 int 0
disable_p_C12_to_N13_reaclib int 0
disable_He4_N13_to_p_O16_reaclib int 0
154 changes: 77 additions & 77 deletions networks/he-burn/ase/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,26 +197,26 @@ namespace Rates
enum NetworkRates :
std::uint8_t
{
k_p_C12_to_N13 = 1,
k_He4_C12_to_O16 = 2,
k_He4_O16_to_Ne20 = 3,
k_He4_Ne20_to_Mg24 = 4,
k_p_Na23_to_Mg24 = 5,
k_He4_Mg24_to_Si28 = 6,
k_p_Al27_to_Si28 = 7,
k_He4_Si28_to_S32 = 8,
k_p_P31_to_S32 = 9,
k_C12_C12_to_p_Na23 = 10,
k_C12_C12_to_He4_Ne20 = 11,
k_He4_N13_to_p_O16 = 12,
k_C12_O16_to_p_Al27 = 13,
k_C12_O16_to_He4_Mg24 = 14,
k_O16_O16_to_p_P31 = 15,
k_O16_O16_to_He4_Si28 = 16,
k_p_Na23_to_He4_Ne20 = 17,
k_p_Al27_to_He4_Mg24 = 18,
k_p_P31_to_He4_Si28 = 19,
k_He4_He4_He4_to_C12 = 20,
k_p_C12_to_N13_reaclib = 1,
k_He4_C12_to_O16_reaclib = 2,
k_He4_O16_to_Ne20_reaclib = 3,
k_He4_Ne20_to_Mg24_reaclib = 4,
k_p_Na23_to_Mg24_reaclib = 5,
k_He4_Mg24_to_Si28_reaclib = 6,
k_p_Al27_to_Si28_reaclib = 7,
k_He4_Si28_to_S32_reaclib = 8,
k_p_P31_to_S32_reaclib = 9,
k_C12_C12_to_p_Na23_reaclib = 10,
k_C12_C12_to_He4_Ne20_reaclib = 11,
k_He4_N13_to_p_O16_reaclib = 12,
k_C12_O16_to_p_Al27_reaclib = 13,
k_C12_O16_to_He4_Mg24_reaclib = 14,
k_O16_O16_to_p_P31_reaclib = 15,
k_O16_O16_to_He4_Si28_reaclib = 16,
k_p_Na23_to_He4_Ne20_reaclib = 17,
k_p_Al27_to_He4_Mg24_reaclib = 18,
k_p_P31_to_He4_Si28_reaclib = 19,
k_He4_He4_He4_to_C12_reaclib = 20,
k_C12_C12_to_n_Mg23_removed = 21,
k_O16_O16_to_n_S31_removed = 22,
k_C12_O16_to_n_Si27_removed = 23,
Expand Down Expand Up @@ -276,25 +276,25 @@ namespace Rates
k_Mg24_to_C12_C12_derived = 77,
k_S32_to_O16_O16_derived = 78,
k_Si28_to_C12_O16_derived = 79,
k_He4_S32_to_p_Cl35_derived_removed = 80,
k_Ar36_to_He4_S32_derived_removed = 81,
k_Ar36_to_p_Cl35_derived_removed = 82,
k_He4_Ar36_to_p_K39_derived_removed = 83,
k_Ca40_to_He4_Ar36_derived_removed = 84,
k_Ca40_to_p_K39_derived_removed = 85,
k_He4_Ca40_to_p_Sc43_derived_removed = 86,
k_Ti44_to_He4_Ca40_derived_removed = 87,
k_Ti44_to_p_Sc43_derived_removed = 88,
k_Cr48_to_He4_Ti44_derived_removed = 89,
k_Cr48_to_p_V47_derived_removed = 90,
k_p_V47_to_He4_Ti44_derived_removed = 91,
k_Fe52_to_He4_Cr48_derived_removed = 92,
k_Fe52_to_p_Mn51_derived_removed = 93,
k_p_Mn51_to_He4_Cr48_derived_removed = 94,
k_Ni56_to_He4_Fe52_derived_removed = 95,
k_Ni56_to_p_Co55_derived_removed = 96,
k_p_Co55_to_He4_Fe52_derived_removed = 97,
NumRates = k_p_Co55_to_He4_Fe52_derived_removed
k_He4_S32_to_p_Cl35_removed = 80,
k_Ar36_to_He4_S32_removed = 81,
k_Ar36_to_p_Cl35_removed = 82,
k_He4_Ar36_to_p_K39_removed = 83,
k_Ca40_to_He4_Ar36_removed = 84,
k_Ca40_to_p_K39_removed = 85,
k_He4_Ca40_to_p_Sc43_removed = 86,
k_Ti44_to_He4_Ca40_removed = 87,
k_Ti44_to_p_Sc43_removed = 88,
k_Cr48_to_He4_Ti44_removed = 89,
k_Cr48_to_p_V47_removed = 90,
k_p_V47_to_He4_Ti44_removed = 91,
k_Fe52_to_He4_Cr48_removed = 92,
k_Fe52_to_p_Mn51_removed = 93,
k_p_Mn51_to_He4_Cr48_removed = 94,
k_Ni56_to_He4_Fe52_removed = 95,
k_Ni56_to_p_Co55_removed = 96,
k_p_Co55_to_He4_Fe52_removed = 97,
NumRates = k_p_Co55_to_He4_Fe52_removed
};

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

static const std::vector<std::string> rate_names = {
"", // 0
"p_C12_to_N13", // 1,
"He4_C12_to_O16", // 2,
"He4_O16_to_Ne20", // 3,
"He4_Ne20_to_Mg24", // 4,
"p_Na23_to_Mg24", // 5,
"He4_Mg24_to_Si28", // 6,
"p_Al27_to_Si28", // 7,
"He4_Si28_to_S32", // 8,
"p_P31_to_S32", // 9,
"C12_C12_to_p_Na23", // 10,
"C12_C12_to_He4_Ne20", // 11,
"He4_N13_to_p_O16", // 12,
"C12_O16_to_p_Al27", // 13,
"C12_O16_to_He4_Mg24", // 14,
"O16_O16_to_p_P31", // 15,
"O16_O16_to_He4_Si28", // 16,
"p_Na23_to_He4_Ne20", // 17,
"p_Al27_to_He4_Mg24", // 18,
"p_P31_to_He4_Si28", // 19,
"He4_He4_He4_to_C12", // 20,
"p_C12_to_N13_reaclib", // 1,
"He4_C12_to_O16_reaclib", // 2,
"He4_O16_to_Ne20_reaclib", // 3,
"He4_Ne20_to_Mg24_reaclib", // 4,
"p_Na23_to_Mg24_reaclib", // 5,
"He4_Mg24_to_Si28_reaclib", // 6,
"p_Al27_to_Si28_reaclib", // 7,
"He4_Si28_to_S32_reaclib", // 8,
"p_P31_to_S32_reaclib", // 9,
"C12_C12_to_p_Na23_reaclib", // 10,
"C12_C12_to_He4_Ne20_reaclib", // 11,
"He4_N13_to_p_O16_reaclib", // 12,
"C12_O16_to_p_Al27_reaclib", // 13,
"C12_O16_to_He4_Mg24_reaclib", // 14,
"O16_O16_to_p_P31_reaclib", // 15,
"O16_O16_to_He4_Si28_reaclib", // 16,
"p_Na23_to_He4_Ne20_reaclib", // 17,
"p_Al27_to_He4_Mg24_reaclib", // 18,
"p_P31_to_He4_Si28_reaclib", // 19,
"He4_He4_He4_to_C12_reaclib", // 20,
"C12_C12_to_n_Mg23_removed", // 21,
"O16_O16_to_n_S31_removed", // 22,
"C12_O16_to_n_Si27_removed", // 23,
Expand Down Expand Up @@ -382,24 +382,24 @@ namespace Rates
"Mg24_to_C12_C12_derived", // 77,
"S32_to_O16_O16_derived", // 78,
"Si28_to_C12_O16_derived", // 79,
"He4_S32_to_p_Cl35_derived_removed", // 80,
"Ar36_to_He4_S32_derived_removed", // 81,
"Ar36_to_p_Cl35_derived_removed", // 82,
"He4_Ar36_to_p_K39_derived_removed", // 83,
"Ca40_to_He4_Ar36_derived_removed", // 84,
"Ca40_to_p_K39_derived_removed", // 85,
"He4_Ca40_to_p_Sc43_derived_removed", // 86,
"Ti44_to_He4_Ca40_derived_removed", // 87,
"Ti44_to_p_Sc43_derived_removed", // 88,
"Cr48_to_He4_Ti44_derived_removed", // 89,
"Cr48_to_p_V47_derived_removed", // 90,
"p_V47_to_He4_Ti44_derived_removed", // 91,
"Fe52_to_He4_Cr48_derived_removed", // 92,
"Fe52_to_p_Mn51_derived_removed", // 93,
"p_Mn51_to_He4_Cr48_derived_removed", // 94,
"Ni56_to_He4_Fe52_derived_removed", // 95,
"Ni56_to_p_Co55_derived_removed", // 96,
"p_Co55_to_He4_Fe52_derived_removed" // 97,
"He4_S32_to_p_Cl35_removed", // 80,
"Ar36_to_He4_S32_removed", // 81,
"Ar36_to_p_Cl35_removed", // 82,
"He4_Ar36_to_p_K39_removed", // 83,
"Ca40_to_He4_Ar36_removed", // 84,
"Ca40_to_p_K39_removed", // 85,
"He4_Ca40_to_p_Sc43_removed", // 86,
"Ti44_to_He4_Ca40_removed", // 87,
"Ti44_to_p_Sc43_removed", // 88,
"Cr48_to_He4_Ti44_removed", // 89,
"Cr48_to_p_V47_removed", // 90,
"p_V47_to_He4_Ti44_removed", // 91,
"Fe52_to_He4_Cr48_removed", // 92,
"Fe52_to_p_Mn51_removed", // 93,
"p_Mn51_to_He4_Cr48_removed", // 94,
"Ni56_to_He4_Fe52_removed", // 95,
"Ni56_to_p_Co55_removed", // 96,
"p_Co55_to_He4_Fe52_removed" // 97,
};

}
Expand Down
76 changes: 38 additions & 38 deletions networks/he-burn/ase/actual_network_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
namespace NSE_INDEX
{
AMREX_GPU_MANAGED amrex::Array2D<std::int8_t, 1, Rates::NumRates, 1, 7, amrex::Order::C> rate_indices {
-1, 0, 2, -1, -1, 3, 57, // p_C12_to_N13
-1, 1, 2, -1, -1, 4, 58, // He4_C12_to_O16
-1, 1, 4, -1, -1, 5, 59, // He4_O16_to_Ne20
-1, 1, 5, -1, -1, 7, 61, // He4_Ne20_to_Mg24
-1, 0, 6, -1, -1, 7, 60, // p_Na23_to_Mg24
-1, 1, 7, -1, -1, 9, 63, // He4_Mg24_to_Si28
-1, 0, 8, -1, -1, 9, 62, // p_Al27_to_Si28
-1, 1, 9, -1, -1, 11, 65, // He4_Si28_to_S32
-1, 0, 10, -1, -1, 11, 64, // p_P31_to_S32
-1, 2, 2, -1, 0, 6, 70, // C12_C12_to_p_Na23
-1, 2, 2, -1, 1, 5, 69, // C12_C12_to_He4_Ne20
-1, 1, 3, -1, 0, 4, 67, // He4_N13_to_p_O16
-1, 2, 4, -1, 0, 8, 73, // C12_O16_to_p_Al27
-1, 2, 4, -1, 1, 7, 72, // C12_O16_to_He4_Mg24
-1, 4, 4, -1, 0, 10, 76, // O16_O16_to_p_P31
-1, 4, 4, -1, 1, 9, 75, // O16_O16_to_He4_Si28
-1, 0, 6, -1, 1, 5, 68, // p_Na23_to_He4_Ne20
-1, 0, 8, -1, 1, 7, 71, // p_Al27_to_He4_Mg24
-1, 0, 10, -1, 1, 9, 74, // p_P31_to_He4_Si28
1, 1, 1, -1, -1, 2, 66, // He4_He4_He4_to_C12
-1, 0, 2, -1, -1, 3, 57, // p_C12_to_N13_reaclib
-1, 1, 2, -1, -1, 4, 58, // He4_C12_to_O16_reaclib
-1, 1, 4, -1, -1, 5, 59, // He4_O16_to_Ne20_reaclib
-1, 1, 5, -1, -1, 7, 61, // He4_Ne20_to_Mg24_reaclib
-1, 0, 6, -1, -1, 7, 60, // p_Na23_to_Mg24_reaclib
-1, 1, 7, -1, -1, 9, 63, // He4_Mg24_to_Si28_reaclib
-1, 0, 8, -1, -1, 9, 62, // p_Al27_to_Si28_reaclib
-1, 1, 9, -1, -1, 11, 65, // He4_Si28_to_S32_reaclib
-1, 0, 10, -1, -1, 11, 64, // p_P31_to_S32_reaclib
-1, 2, 2, -1, 0, 6, 70, // C12_C12_to_p_Na23_reaclib
-1, 2, 2, -1, 1, 5, 69, // C12_C12_to_He4_Ne20_reaclib
-1, 1, 3, -1, 0, 4, 67, // He4_N13_to_p_O16_reaclib
-1, 2, 4, -1, 0, 8, 73, // C12_O16_to_p_Al27_reaclib
-1, 2, 4, -1, 1, 7, 72, // C12_O16_to_He4_Mg24_reaclib
-1, 4, 4, -1, 0, 10, 76, // O16_O16_to_p_P31_reaclib
-1, 4, 4, -1, 1, 9, 75, // O16_O16_to_He4_Si28_reaclib
-1, 0, 6, -1, 1, 5, 68, // p_Na23_to_He4_Ne20_reaclib
-1, 0, 8, -1, 1, 7, 71, // p_Al27_to_He4_Mg24_reaclib
-1, 0, 10, -1, 1, 9, 74, // p_P31_to_He4_Si28_reaclib
1, 1, 1, -1, -1, 2, 66, // He4_He4_He4_to_C12_reaclib
-1, -1, -1, -1, -1, -1, -1, // C12_C12_to_n_Mg23_removed
-1, -1, -1, -1, -1, -1, -1, // O16_O16_to_n_S31_removed
-1, -1, -1, -1, -1, -1, -1, // C12_O16_to_n_Si27_removed
Expand Down Expand Up @@ -84,24 +84,24 @@ namespace NSE_INDEX
-1, -1, 7, -1, 2, 2, -1, // Mg24_to_C12_C12_derived
-1, -1, 11, -1, 4, 4, -1, // S32_to_O16_O16_derived
-1, -1, 9, -1, 2, 4, -1, // Si28_to_C12_O16_derived
-1, -1, -1, -1, -1, -1, -1, // He4_S32_to_p_Cl35_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_He4_S32_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_p_Cl35_derived_removed
-1, -1, -1, -1, -1, -1, -1, // He4_Ar36_to_p_K39_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_He4_Ar36_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_p_K39_derived_removed
-1, -1, -1, -1, -1, -1, -1, // He4_Ca40_to_p_Sc43_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_He4_Ca40_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_p_Sc43_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_He4_Ti44_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_p_V47_derived_removed
-1, -1, -1, -1, -1, -1, -1, // p_V47_to_He4_Ti44_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_He4_Cr48_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_p_Mn51_derived_removed
-1, -1, -1, -1, -1, -1, -1, // p_Mn51_to_He4_Cr48_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_He4_Fe52_derived_removed
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_p_Co55_derived_removed
-1, -1, -1, -1, -1, -1, -1 // p_Co55_to_He4_Fe52_derived_removed
-1, -1, -1, -1, -1, -1, -1, // He4_S32_to_p_Cl35_removed
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_He4_S32_removed
-1, -1, -1, -1, -1, -1, -1, // Ar36_to_p_Cl35_removed
-1, -1, -1, -1, -1, -1, -1, // He4_Ar36_to_p_K39_removed
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_He4_Ar36_removed
-1, -1, -1, -1, -1, -1, -1, // Ca40_to_p_K39_removed
-1, -1, -1, -1, -1, -1, -1, // He4_Ca40_to_p_Sc43_removed
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_He4_Ca40_removed
-1, -1, -1, -1, -1, -1, -1, // Ti44_to_p_Sc43_removed
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_He4_Ti44_removed
-1, -1, -1, -1, -1, -1, -1, // Cr48_to_p_V47_removed
-1, -1, -1, -1, -1, -1, -1, // p_V47_to_He4_Ti44_removed
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_He4_Cr48_removed
-1, -1, -1, -1, -1, -1, -1, // Fe52_to_p_Mn51_removed
-1, -1, -1, -1, -1, -1, -1, // p_Mn51_to_He4_Cr48_removed
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_He4_Fe52_removed
-1, -1, -1, -1, -1, -1, -1, // Ni56_to_p_Co55_removed
-1, -1, -1, -1, -1, -1, -1 // p_Co55_to_He4_Fe52_removed
};
}
#endif
Expand Down
Loading
Loading