Skip to content

Commit

Permalink
Merge branch 'development' into pynucastro_nse_table
Browse files Browse the repository at this point in the history
  • Loading branch information
zingale committed Nov 7, 2023
2 parents 9c96ce1 + 39a0f40 commit aed0212
Show file tree
Hide file tree
Showing 15 changed files with 266 additions and 265 deletions.
4 changes: 2 additions & 2 deletions neutrinos/sneut5.H
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ void nu_photo(const sneutf_t& sf,

// equation 3.7

const auto [cos1, sin1] = amrex::Math::sincos(nu_constants::fac1 * tau);
const auto [sin1, cos1] = amrex::Math::sincos(nu_constants::fac1 * tau);

// double, triple, etc. angle formulas
// sin/cos (2 fac1 tau)
Expand Down Expand Up @@ -1175,7 +1175,7 @@ void nu_brem(const sneutf_t& sf,

// compute the expensive trig functions of equation 5.21 only once

const auto [cos1, sin1] = amrex::Math::sincos(u);
const auto [sin1, cos1] = amrex::Math::sincos(u);

// double, triple, etc. angle formulas
// sin/cos (2 fac1 tau)
Expand Down
60 changes: 30 additions & 30 deletions unit_test/burn_cell/ci-benchmarks/aprox13_QSS_unit_test.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AMReX (23.10-13-gecaa14456e3f) initialized
AMReX (22.11-1-gc4a4811c373d) initialized
starting the single zone burn...
Maximum Time (s): 0.01
State Density (g/cm^3): 1000000
Expand Down Expand Up @@ -32,41 +32,41 @@ RHS at t = 0
Ni56 4.07828597e-29
------------------------------------
successful? 1
- Hnuc = 3.448624858e+19
- added e = 3.448624858e+17
- final T = 3173085673
- Hnuc = 3.448624864e+19
- added e = 3.448624864e+17
- final T = 3173085674
------------------------------------
e initial = 1.389440599e+18
e final = 1.734303085e+18
e final = 1.734303086e+18
------------------------------------
new mass fractions:
He4 0.771833906
C12 0.0001227479967
O16 8.071653242e-06
Ne20 3.56042511e-07
Mg24 6.162605686e-07
Si28 5.774651999e-06
S32 5.291893291e-06
Ar36 8.531081479e-06
Ca40 0.000166818795
Ti44 0.0004124607795
Cr48 0.0007100753521
Fe52 0.003115481699
He4 0.7718339061
C12 0.0001227479966
O16 8.071653239e-06
Ne20 3.560425108e-07
Mg24 6.162605681e-07
Si28 5.774651995e-06
S32 5.291893286e-06
Ar36 8.531081471e-06
Ca40 0.0001668187948
Ti44 0.0004124607789
Cr48 0.000710075351
Fe52 0.003115481694
Ni56 0.2236098678
------------------------------------
species creation rates:
omegadot(He4): -22.8166094
omegadot(C12): 0.01227479967
omegadot(O16): 0.0008071653242
omegadot(Ne20): 3.56042511e-05
omegadot(Mg24): 6.162605686e-05
omegadot(Si28): 0.0005774651999
omegadot(S32): 0.0005291893291
omegadot(Ar36): 0.0008531081479
omegadot(Ca40): 0.0166818795
omegadot(Ti44): 0.04124607795
omegadot(Cr48): 0.07100753521
omegadot(Fe52): 0.3115481699
omegadot(He4): -22.81660939
omegadot(C12): 0.01227479966
omegadot(O16): 0.0008071653239
omegadot(Ne20): 3.560425108e-05
omegadot(Mg24): 6.162605681e-05
omegadot(Si28): 0.0005774651995
omegadot(S32): 0.0005291893286
omegadot(Ar36): 0.0008531081471
omegadot(Ca40): 0.01668187948
omegadot(Ti44): 0.04124607789
omegadot(Cr48): 0.0710075351
omegadot(Fe52): 0.3115481694
omegadot(Ni56): 22.36098678
number of steps taken: 3695
AMReX (23.10-13-gecaa14456e3f) finalized
AMReX (22.11-1-gc4a4811c373d) finalized
40 changes: 20 additions & 20 deletions unit_test/burn_cell/ci-benchmarks/aprox13_RKC_unit_test.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AMReX (23.10-13-gecaa14456e3f) initialized
AMReX (23.06-6-g1e1c433b401c) initialized
starting the single zone burn...
Maximum Time (s): 0.01
State Density (g/cm^3): 1000000
Expand Down Expand Up @@ -32,8 +32,8 @@ RHS at t = 0
Ni56 3.938787868e-40
------------------------------------
successful? 1
- Hnuc = 8.558390237e+18
- added e = 8.558390237e+16
- Hnuc = 8.558390239e+18
- added e = 8.558390239e+16
- final T = 1516425860
------------------------------------
e initial = 1.284393683e+17
Expand All @@ -42,31 +42,31 @@ e final = 2.140232707e+17
new mass fractions:
He4 0.8760723967
C12 0.1064099566
O16 0.0001403204361
O16 0.0001403204362
Ne20 8.129701233e-05
Mg24 0.0002972369574
Si28 0.01113151728
S32 0.005297014786
Ar36 0.0005641483117
Ca40 6.109846921e-06
Ti44 2.004306558e-09
Cr48 3.272104624e-14
Fe52 7.126141319e-20
Ni56 1.224819862e-26
S32 0.005297014797
Ar36 0.0005641483161
Ca40 6.109847027e-06
Ti44 2.004306621e-09
Cr48 3.272104798e-14
Fe52 7.12614193e-20
Ni56 1.224820021e-26
------------------------------------
species creation rates:
omegadot(He4): -12.39276033
omegadot(C12): 10.64099566
omegadot(O16): 0.01403204361
omegadot(O16): 0.01403204362
omegadot(Ne20): 0.008129701233
omegadot(Mg24): 0.02972369574
omegadot(Si28): 1.113151728
omegadot(S32): 0.5297014786
omegadot(Ar36): 0.05641483117
omegadot(Ca40): 0.0006109846921
omegadot(Ti44): 2.004306558e-07
omegadot(Cr48): 3.272104624e-12
omegadot(Fe52): 7.126141319e-18
omegadot(Ni56): 1.224719862e-24
omegadot(S32): 0.5297014797
omegadot(Ar36): 0.05641483161
omegadot(Ca40): 0.0006109847027
omegadot(Ti44): 2.004306621e-07
omegadot(Cr48): 3.272104798e-12
omegadot(Fe52): 7.12614193e-18
omegadot(Ni56): 1.224720021e-24
number of steps taken: 255
AMReX (23.10-13-gecaa14456e3f) finalized
AMReX (23.06-6-g1e1c433b401c) finalized
88 changes: 44 additions & 44 deletions unit_test/burn_cell/ci-benchmarks/aprox19_nse_unit_test.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AMReX (23.10-14-g7ee29121ed70) initialized
AMReX (23.08-120-g579df318ce0d) initialized
starting the single zone burn...
reading the NSE table (C++) ...
Maximum Time (s): 0.01
Expand Down Expand Up @@ -43,57 +43,57 @@ RHS at t = 0
Ni56 -4.649371884e-24
n 6.323463259e-06
p 6.323463259e-06
burn entered NSE during integration (after 407 steps), zone = (0, 0, 0)
burn entered NSE during integration (after 280 steps), zone = (0, 0, 0)
recovering burn failure in NSE, zone = (0, 0, 0)
------------------------------------
successful? 1
- Hnuc = 2.583392986e+21
- added e = 2.583392986e+19
- final T = 1.063970848e+10
- Hnuc = 2.581088322e+21
- added e = 2.581088322e+19
- final T = 1.063745014e+10
------------------------------------
e initial = 1.516256085e+18
e final = 2.735018595e+19
e final = 2.732713931e+19
------------------------------------
new mass fractions:
H1 7.15384569e-06
He3 3.447968059e-11
He4 0.05924974125
C12 9.999992607e-31
N14 1.824143847e-14
O16 2.162954629e-15
Ne20 1.161107028e-18
Mg24 2.762946123e-21
Si28 5.207391775e-23
S32 9.999992607e-31
Ar36 9.999992607e-31
Ca40 4.524157858e-29
Ti44 9.999992607e-31
Cr48 5.124583802e-30
Fe52 9.999992607e-31
Fe54 3.363621386e-28
Ni56 9.999992607e-31
n 0.4688484384
p 0.4718946665
H1 1.897142515e-05
He3 5.613251767e-11
He4 0.05960353782
C12 7.896470738e-12
N14 9.999994234e-31
O16 9.999994234e-31
Ne20 5.425909434e-18
Mg24 9.999994234e-31
Si28 9.999994234e-31
S32 2.647592719e-26
Ar36 2.993624787e-29
Ca40 9.999994234e-31
Ti44 3.580409054e-30
Cr48 7.457294422e-30
Fe52 9.999994234e-31
Fe54 3.547420184e-28
Ni56 9.999994234e-31
n 0.4687132147
p 0.471664276
------------------------------------
species creation rates:
omegadot(H1): -9.999284615
omegadot(He3): -2.499999997
omegadot(He4): -74.07502588
omegadot(C12): -2.5
omegadot(H1): -9.998102857
omegadot(He3): -2.499999994
omegadot(He4): -74.03964622
omegadot(C12): -2.499999999
omegadot(N14): -2.5
omegadot(O16): -2.5
omegadot(Ne20): 1.161107028e-16
omegadot(Mg24): 2.762946122e-19
omegadot(Si28): 5.207391675e-21
omegadot(S32): -7.392639602e-35
omegadot(Ar36): -7.392639602e-35
omegadot(Ca40): 4.424157858e-27
omegadot(Ti44): -7.392639602e-35
omegadot(Cr48): 4.124583802e-28
omegadot(Fe52): -7.392639602e-35
omegadot(Fe54): 3.353621386e-26
omegadot(Ni56): -7.392639602e-35
omegadot(n): 46.88484384
omegadot(p): 47.18946665
number of steps taken: 60360
AMReX (23.10-14-g7ee29121ed70) finalized
omegadot(Ne20): 5.425909434e-16
omegadot(Mg24): -5.765806524e-35
omegadot(Si28): -5.765806524e-35
omegadot(S32): 2.647492719e-24
omegadot(Ar36): 2.893624787e-27
omegadot(Ca40): -5.765806524e-35
omegadot(Ti44): 2.580409054e-28
omegadot(Cr48): 6.457294422e-28
omegadot(Fe52): -5.765806524e-35
omegadot(Fe54): 3.537420184e-26
omegadot(Ni56): -5.765806524e-35
omegadot(n): 46.87132147
omegadot(p): 47.1664276
number of steps taken: 26874
AMReX (23.08-120-g579df318ce0d) finalized
51 changes: 26 additions & 25 deletions unit_test/burn_cell/ci-benchmarks/ecsn_unit_test.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
AMReX (23.10-13-gecaa14456e3f) initialized
Initializing AMReX (23.11-4-ga7afcba3cffd)...
AMReX (23.11-4-ga7afcba3cffd) initialized
starting the single zone burn...
reading in network electron-capture / beta-decay tables...
Maximum Time (s): 0.01
Expand Down Expand Up @@ -29,37 +30,37 @@ RHS at t = 0
S32 1323519.174
------------------------------------
successful? 1
- Hnuc = 4.555404693e+19
- added e = 4.555404693e+17
- final T = 6735967493
- Hnuc = 4.111466233e+19
- added e = 4.111466233e+17
- final T = 6536235789
------------------------------------
e initial = 5.995956082e+17
e final = 1.055136077e+18
e final = 1.010742231e+18
------------------------------------
new mass fractions:
H1 0.008595815549
He4 4.152700815e-13
O16 6.210300397e-07
O20 0.009741776606
F20 0.009740438851
Ne20 9.999999868e-31
Mg24 4.491783724e-09
Al27 7.648139704e-21
Si28 0.2708503134
P31 8.806134354e-14
S32 0.7010710301
H1 0.007813581548
He4 9.986703417e-31
O16 7.812412175e-07
O20 0.009524501615
F20 0.00952319448
Ne20 9.986703417e-31
Mg24 8.489446236e-12
Al27 9.986703417e-31
Si28 0.2115906158
P31 9.986703417e-31
S32 0.7615473253
------------------------------------
species creation rates:
omegadot(H1): -0.1404184451
omegadot(H1): -0.2186418452
omegadot(He4): -3
omegadot(O16): -49.9999379
omegadot(O20): -0.02582233936
omegadot(F20): -0.02595611491
omegadot(O16): -49.99992188
omegadot(O20): -0.04754983851
omegadot(F20): -0.04768055199
omegadot(Ne20): -30
omegadot(Mg24): -9.999999551
omegadot(Mg24): -9.999999999
omegadot(Al27): -1
omegadot(Si28): 26.08503134
omegadot(Si28): 20.15906158
omegadot(P31): -1
omegadot(S32): 69.10710301
number of steps taken: 22812
AMReX (23.10-13-gecaa14456e3f) finalized
omegadot(S32): 75.15473253
number of steps taken: 9639
AMReX (23.11-4-ga7afcba3cffd) finalized
Loading

0 comments on commit aed0212

Please sign in to comment.