diff --git a/neutrinos/sneut5.H b/neutrinos/sneut5.H index 4b26c89469..9770050deb 100644 --- a/neutrinos/sneut5.H +++ b/neutrinos/sneut5.H @@ -3,6 +3,7 @@ #include #include +#include using namespace amrex; @@ -824,21 +825,28 @@ void nu_photo(const sneutf_t& sf, Real taudt = nu_constants::iln10 * sf.tempi; - // equation 3.7, compute the expensive trig functions only one time + // equation 3.7 - Real cos1 = std::cos(nu_constants::fac1 * tau); - Real cos2 = std::cos(nu_constants::fac1 * 2.0e0_rt * tau); - Real cos3 = std::cos(nu_constants::fac1 * 3.0e0_rt * tau); - Real cos4 = std::cos(nu_constants::fac1 * 4.0e0_rt * tau); - Real cos5 = std::cos(nu_constants::fac1 * 5.0e0_rt * tau); - Real last = std::cos(nu_constants::fac2 * tau); + const auto [cos1, sin1] = amrex::Math::sincos(nu_constants::fac1 * tau); - Real sin1 = std::sin(nu_constants::fac1*tau); - Real sin2 = std::sin(nu_constants::fac1*2.0e0_rt*tau); - Real sin3 = std::sin(nu_constants::fac1*3.0e0_rt*tau); - Real sin4 = std::sin(nu_constants::fac1*4.0e0_rt*tau); - Real sin5 = std::sin(nu_constants::fac1*5.0e0_rt*tau); - Real xast = std::sin(nu_constants::fac2*tau); + // double, triple, etc. angle formulas + // sin/cos (2 fac1 tau) + const Real sin2 = 2.0_rt * sin1 * cos1; + const Real cos2 = 2.0_rt * cos1 * cos1 - 1.0_rt; + + // sin/cos (3 fac1 tau) + const Real sin3 = sin1 * (3.0_rt - 4.0_rt * sin1 * sin1); + const Real cos3 = cos1 * (4.0_rt * cos1 * cos1 - 3.0_rt); + + // sin/cos (4 fac1 tau) -- use double angle on sin2/cos2 + const Real sin4 = 2.0_rt * sin2 * cos2; + const Real cos4 = 2.0_rt * cos2 * cos2 - 1.0_rt; + + // sin/cos (5 fac1 tau) + const Real sin5 = sin1 * (5.0_rt - sin1 * sin1 * (20.0_rt - 16.0_rt * sin1 * sin1)); + const Real cos5 = cos1 * (cos1 * cos1 * (16.0_rt * cos1 * cos1 - 20.0_rt) + 5.0_rt); + + const auto [xast, last] = amrex::Math::sincos(nu_constants::fac2 * tau); Real a0 = 0.5e0_rt * c00 + c01 * cos1 + dd01 * sin1 + c02 * cos2 + dd02 * sin2 @@ -1166,17 +1174,25 @@ void nu_brem(const sneutf_t& sf, //a0 = iln10*fac3*sf.deni; // compute the expensive trig functions of equation 5.21 only once - Real cos1 = std::cos(u); - Real cos2 = std::cos(2.0e0_rt*u); - Real cos3 = std::cos(3.0e0_rt*u); - Real cos4 = std::cos(4.0e0_rt*u); - Real cos5 = std::cos(5.0e0_rt*u); - - Real sin1 = std::sin(u); - Real sin2 = std::sin(2.0e0_rt*u); - Real sin3 = std::sin(3.0e0_rt*u); - Real sin4 = std::sin(4.0e0_rt*u); - //sin5 = std::sin(5.0e0_rt*u); + + const auto [cos1, sin1] = amrex::Math::sincos(u); + + // double, triple, etc. angle formulas + // sin/cos (2 fac1 tau) + const Real sin2 = 2.0_rt * sin1 * cos1; + const Real cos2 = 2.0_rt * cos1 * cos1 - 1.0_rt; + + // sin/cos (3 fac1 tau) + const Real sin3 = sin1 * (3.0_rt - 4.0_rt * sin1 * sin1); + const Real cos3 = cos1 * (4.0_rt * cos1 * cos1 - 3.0_rt); + + // sin/cos (4 fac1 tau) -- use double angle on sin2/cos2 + const Real sin4 = 2.0_rt * sin2 * cos2; + const Real cos4 = 2.0_rt * cos2 * cos2 - 1.0_rt; + + // sin/cos (5 fac1 tau) + //const Real sin5 = sin1 * (5.0_rt - sin1 * sin1 * (20.0_rt - 16.0_rt * sin1 * sin1)); + const Real cos5 = cos1 * (cos1 * cos1 * (16.0_rt * cos1 * cos1 - 20.0_rt) + 5.0_rt); // equation 5.21 Real fb = 0.5e0_rt * 0.17946e0_rt + 0.00945e0_rt * u + 0.34529e0_rt diff --git a/unit_test/burn_cell/ci-benchmarks/aprox13_QSS_unit_test.out b/unit_test/burn_cell/ci-benchmarks/aprox13_QSS_unit_test.out index ac6df607e6..955440d3aa 100644 --- a/unit_test/burn_cell/ci-benchmarks/aprox13_QSS_unit_test.out +++ b/unit_test/burn_cell/ci-benchmarks/aprox13_QSS_unit_test.out @@ -1,4 +1,4 @@ -AMReX (22.11-1-gc4a4811c373d) initialized +AMReX (23.10-13-gecaa14456e3f) initialized starting the single zone burn... Maximum Time (s): 0.01 State Density (g/cm^3): 1000000 @@ -32,41 +32,41 @@ RHS at t = 0 Ni56 4.07828597e-29 ------------------------------------ successful? 1 - - Hnuc = 3.448624864e+19 - - added e = 3.448624864e+17 - - final T = 3173085674 + - Hnuc = 3.448624858e+19 + - added e = 3.448624858e+17 + - final T = 3173085673 ------------------------------------ e initial = 1.389440599e+18 -e final = 1.734303086e+18 +e final = 1.734303085e+18 ------------------------------------ new mass fractions: -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 +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 Ni56 0.2236098678 ------------------------------------ species creation rates: -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(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(Ni56): 22.36098678 number of steps taken: 3695 -AMReX (22.11-1-gc4a4811c373d) finalized +AMReX (23.10-13-gecaa14456e3f) finalized diff --git a/unit_test/burn_cell/ci-benchmarks/aprox13_RKC_unit_test.out b/unit_test/burn_cell/ci-benchmarks/aprox13_RKC_unit_test.out index 3d539cc6e8..4a26dea63c 100644 --- a/unit_test/burn_cell/ci-benchmarks/aprox13_RKC_unit_test.out +++ b/unit_test/burn_cell/ci-benchmarks/aprox13_RKC_unit_test.out @@ -1,4 +1,4 @@ -AMReX (23.06-6-g1e1c433b401c) initialized +AMReX (23.10-13-gecaa14456e3f) initialized starting the single zone burn... Maximum Time (s): 0.01 State Density (g/cm^3): 1000000 @@ -32,8 +32,8 @@ RHS at t = 0 Ni56 3.938787868e-40 ------------------------------------ successful? 1 - - Hnuc = 8.558390239e+18 - - added e = 8.558390239e+16 + - Hnuc = 8.558390237e+18 + - added e = 8.558390237e+16 - final T = 1516425860 ------------------------------------ e initial = 1.284393683e+17 @@ -42,31 +42,31 @@ e final = 2.140232707e+17 new mass fractions: He4 0.8760723967 C12 0.1064099566 -O16 0.0001403204362 +O16 0.0001403204361 Ne20 8.129701233e-05 Mg24 0.0002972369574 Si28 0.01113151728 -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 +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 ------------------------------------ species creation rates: omegadot(He4): -12.39276033 omegadot(C12): 10.64099566 -omegadot(O16): 0.01403204362 +omegadot(O16): 0.01403204361 omegadot(Ne20): 0.008129701233 omegadot(Mg24): 0.02972369574 omegadot(Si28): 1.113151728 -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 +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 number of steps taken: 255 -AMReX (23.06-6-g1e1c433b401c) finalized +AMReX (23.10-13-gecaa14456e3f) finalized diff --git a/unit_test/burn_cell/ci-benchmarks/aprox19_nse_unit_test.out b/unit_test/burn_cell/ci-benchmarks/aprox19_nse_unit_test.out index f945932970..44a86cb701 100644 --- a/unit_test/burn_cell/ci-benchmarks/aprox19_nse_unit_test.out +++ b/unit_test/burn_cell/ci-benchmarks/aprox19_nse_unit_test.out @@ -1,4 +1,4 @@ -AMReX (23.01-12-ga05384c0b7c4) initialized +AMReX (23.10-13-gecaa14456e3f) initialized starting the single zone burn... reading the NSE table (C++) ... Maximum Time (s): 0.01 @@ -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 280 steps), zone = (0, 0, 0) +burn entered NSE during integration (after 407 steps), zone = (0, 0, 0) recovering burn failure in NSE, zone = (0, 0, 0) ------------------------------------ successful? 1 - - Hnuc = 2.552804555e+21 - - added e = 2.552804555e+19 - - final T = 1.060964458e+10 + - Hnuc = 2.577064219e+21 + - added e = 2.577064219e+19 + - final T = 1.063350508e+10 ------------------------------------ e initial = 1.516256085e+18 -e final = 2.704430164e+19 +e final = 2.728689827e+19 ------------------------------------ new mass fractions: -H1 0.0001057720428 -He3 1.320599831e-10 -He4 0.06412077048 -C12 1.016297715e-11 -N14 9.999991592e-31 -O16 9.999991592e-31 -Ne20 3.890552725e-17 -Mg24 9.999991592e-31 -Si28 1.194568144e-21 -S32 1.956720348e-25 -Ar36 4.189728368e-29 -Ca40 9.999991592e-31 -Ti44 3.531480561e-30 -Cr48 9.999991592e-31 -Fe52 9.999991592e-31 -Fe54 9.999991592e-31 -Ni56 9.999991592e-31 -n 0.4665061227 -p 0.4692673346 +H1 6.505608868e-05 +He3 1.038927825e-10 +He4 0.06022070651 +C12 9.99999158e-31 +N14 1.731352613e-13 +O16 2.450459695e-15 +Ne20 9.99999158e-31 +Mg24 6.790701604e-20 +Si28 3.428830286e-22 +S32 9.99999158e-31 +Ar36 9.99999158e-31 +Ca40 2.030520937e-29 +Ti44 9.99999158e-31 +Cr48 5.120465763e-30 +Fe52 9.99999158e-31 +Fe54 3.385938672e-28 +Ni56 9.99999158e-31 +n 0.4684052388 +p 0.4713089985 ------------------------------------ species creation rates: -omegadot(H1): -9.989422796 -omegadot(He3): -2.499999987 -omegadot(He4): -73.58792295 -omegadot(C12): -2.499999999 +omegadot(H1): -9.993494391 +omegadot(He3): -2.49999999 +omegadot(He4): -73.97792935 +omegadot(C12): -2.5 omegadot(N14): -2.5 omegadot(O16): -2.5 -omegadot(Ne20): 3.890552725e-15 -omegadot(Mg24): -8.408373504e-35 -omegadot(Si28): 1.194568143e-19 -omegadot(S32): 1.956710348e-23 -omegadot(Ar36): 4.089728368e-27 -omegadot(Ca40): -8.408373504e-35 -omegadot(Ti44): 2.531480561e-28 -omegadot(Cr48): -8.408373504e-35 -omegadot(Fe52): -8.408373504e-35 -omegadot(Fe54): -8.408373504e-35 -omegadot(Ni56): -8.408373504e-35 -omegadot(n): 46.65061227 -omegadot(p): 46.92673346 -number of steps taken: 27384 -AMReX (23.01-12-ga05384c0b7c4) finalized +omegadot(Ne20): -8.420134623e-35 +omegadot(Mg24): 6.790701604e-18 +omegadot(Si28): 3.428830276e-20 +omegadot(S32): -8.420134623e-35 +omegadot(Ar36): -8.420134623e-35 +omegadot(Ca40): 1.930520937e-27 +omegadot(Ti44): -8.420134623e-35 +omegadot(Cr48): 4.120465763e-28 +omegadot(Fe52): -8.420134623e-35 +omegadot(Fe54): 3.375938672e-26 +omegadot(Ni56): -8.420134623e-35 +omegadot(n): 46.84052388 +omegadot(p): 47.13089985 +number of steps taken: 22341 +AMReX (23.10-13-gecaa14456e3f) finalized diff --git a/unit_test/burn_cell/ci-benchmarks/ecsn_unit_test.out b/unit_test/burn_cell/ci-benchmarks/ecsn_unit_test.out index b50ff63d29..ea545c1a30 100644 --- a/unit_test/burn_cell/ci-benchmarks/ecsn_unit_test.out +++ b/unit_test/burn_cell/ci-benchmarks/ecsn_unit_test.out @@ -1,4 +1,4 @@ -AMReX (23.05-4-ga393d7ff7e32) initialized +AMReX (23.10-13-gecaa14456e3f) initialized starting the single zone burn... reading in network electron-capture / beta-decay tables... Maximum Time (s): 0.01 @@ -29,37 +29,37 @@ RHS at t = 0 S32 1323519.174 ------------------------------------ successful? 1 - - Hnuc = 4.4691188e+19 - - added e = 4.4691188e+17 - - final T = 6711517341 + - Hnuc = 4.555404693e+19 + - added e = 4.555404693e+17 + - final T = 6735967493 ------------------------------------ e initial = 5.995956082e+17 -e final = 1.046507488e+18 +e final = 1.055136077e+18 ------------------------------------ new mass fractions: -H1 0.007036728874 -He4 4.569221711e-13 -O16 6.11671909e-07 -O20 0.009363850335 -F20 0.009362566168 -Ne20 8.595667728e-14 -Mg24 8.576669062e-06 -Al27 9.999999996e-31 -Si28 0.2286832772 -P31 9.999999996e-31 -S32 0.745544389 +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 ------------------------------------ species creation rates: -omegadot(H1): -0.2963271126 +omegadot(H1): -0.1404184451 omegadot(He4): -3 -omegadot(O16): -49.99993883 -omegadot(O20): -0.0636149665 -omegadot(F20): -0.06374338321 +omegadot(O16): -49.9999379 +omegadot(O20): -0.02582233936 +omegadot(F20): -0.02595611491 omegadot(Ne20): -30 -omegadot(Mg24): -9.999142333 +omegadot(Mg24): -9.999999551 omegadot(Al27): -1 -omegadot(Si28): 21.86832772 +omegadot(Si28): 26.08503134 omegadot(P31): -1 -omegadot(S32): 73.5544389 -number of steps taken: 14714 -AMReX (23.05-4-ga393d7ff7e32) finalized +omegadot(S32): 69.10710301 +number of steps taken: 22812 +AMReX (23.10-13-gecaa14456e3f) finalized diff --git a/unit_test/burn_cell/ci-benchmarks/subch_approx_BE_unit_test.out b/unit_test/burn_cell/ci-benchmarks/subch_approx_BE_unit_test.out index df93b6b562..e26539ee56 100644 --- a/unit_test/burn_cell/ci-benchmarks/subch_approx_BE_unit_test.out +++ b/unit_test/burn_cell/ci-benchmarks/subch_approx_BE_unit_test.out @@ -1,4 +1,4 @@ -AMReX (23.05-4-ga393d7ff7e32) initialized +AMReX (23.10-13-gecaa14456e3f) initialized starting the single zone burn... reading in network electron-capture / beta-decay tables... Maximum Time (s): 1e-05 @@ -51,59 +51,59 @@ RHS at t = 0 Ni56 2.574225196e-29 ------------------------------------ successful? 1 - - Hnuc = 7.242769111e+22 - - added e = 7.242769111e+17 - - final T = 3332749634 + - Hnuc = 7.242779628e+22 + - added e = 7.242779628e+17 + - final T = 3332750042 ------------------------------------ e initial = 1.396711859e+18 -e final = 2.12098877e+18 +e final = 2.120989822e+18 ------------------------------------ new mass fractions: H1 0.1076931361 -He4 0.08267201555 -C12 1.78524719e-05 -N13 3.393590165e-08 -N14 3.304045126e-07 -O16 0.1086086904 -F18 1.418025583e-07 -Ne20 0.007001757674 -Ne21 5.733676716e-06 +He4 0.08267143674 +C12 1.78525873e-05 +N13 3.39360867e-08 +N14 3.30410921e-07 +O16 0.1086082971 +F18 1.418040871e-07 +Ne20 0.007001727083 +Ne21 5.733694226e-06 Na22 0.1571361579 -Na23 4.819437609e-07 -Mg24 0.004453897399 -Al27 6.192300093e-06 -Si28 0.0614675563 -P31 9.538998065e-06 -S32 0.1152074078 -Ar36 0.09902731773 -Ca40 0.2507582723 -Ti44 0.005256238334 -Cr48 0.0006643598898 -Fe52 1.284019674e-05 -Ni56 4.684206046e-08 +Na23 4.819387697e-07 +Mg24 0.004453876825 +Al27 6.192232453e-06 +Si28 0.06146737281 +P31 9.538910626e-06 +S32 0.1152076517 +Ar36 0.09902790304 +Ca40 0.2507587192 +Ti44 0.005256188598 +Cr48 0.0006643410328 +Fe52 1.283949753e-05 +Ni56 4.683798207e-08 ------------------------------------ species creation rates: -omegadot(H1): 769.3136122 -omegadot(He4): -41732.79844 -omegadot(C12): -9998.214753 +omegadot(H1): 769.3136117 +omegadot(He4): -41732.85633 +omegadot(C12): -9998.214741 omegadot(N13): -9999.996606 -omegadot(N14): -9999.96696 -omegadot(O16): 860.8690421 -omegadot(F18): 0.01418025583 -omegadot(Ne20): 700.1757674 -omegadot(Ne21): 0.5733676716 +omegadot(N14): -9999.966959 +omegadot(O16): 860.8297149 +omegadot(F18): 0.01418040871 +omegadot(Ne20): 700.1727083 +omegadot(Ne21): 0.5733694226 omegadot(Na22): 15713.61579 -omegadot(Na23): 0.04819437609 -omegadot(Mg24): 445.3897399 -omegadot(Al27): 0.6192300093 -omegadot(Si28): 6146.75563 -omegadot(P31): 0.9538998065 -omegadot(S32): 11520.74078 -omegadot(Ar36): 9902.731773 -omegadot(Ca40): 25075.82723 -omegadot(Ti44): 525.6238334 -omegadot(Cr48): 66.43598898 -omegadot(Fe52): 1.284019674 -omegadot(Ni56): 0.004684206046 -number of steps taken: 9600 -AMReX (23.05-4-ga393d7ff7e32) finalized +omegadot(Na23): 0.04819387697 +omegadot(Mg24): 445.3876825 +omegadot(Al27): 0.6192232453 +omegadot(Si28): 6146.737281 +omegadot(P31): 0.9538910626 +omegadot(S32): 11520.76517 +omegadot(Ar36): 9902.790304 +omegadot(Ca40): 25075.87192 +omegadot(Ti44): 525.6188598 +omegadot(Cr48): 66.43410328 +omegadot(Fe52): 1.283949753 +omegadot(Ni56): 0.004683798207 +number of steps taken: 9526 +AMReX (23.10-13-gecaa14456e3f) finalized diff --git a/unit_test/burn_cell/ci-benchmarks/subch_approx_unit_test.out b/unit_test/burn_cell/ci-benchmarks/subch_approx_unit_test.out index ed779a64dc..252b1ebd4c 100644 --- a/unit_test/burn_cell/ci-benchmarks/subch_approx_unit_test.out +++ b/unit_test/burn_cell/ci-benchmarks/subch_approx_unit_test.out @@ -1,4 +1,4 @@ -AMReX (23.05-4-ga393d7ff7e32) initialized +AMReX (23.10-13-gecaa14456e3f) initialized starting the single zone burn... reading in network electron-capture / beta-decay tables... Maximum Time (s): 1e-05 @@ -51,59 +51,59 @@ RHS at t = 0 Ni56 2.574225196e-29 ------------------------------------ successful? 1 - - Hnuc = 7.242504668e+22 - - added e = 7.242504668e+17 - - final T = 3332738253 + - Hnuc = 7.242795607e+22 + - added e = 7.242795607e+17 + - final T = 3332749137 ------------------------------------ e initial = 1.396711859e+18 -e final = 2.120962326e+18 +e final = 2.12099142e+18 ------------------------------------ new mass fractions: -H1 0.1076931392 -He4 0.08271604755 -C12 1.784659301e-05 -N13 3.392571632e-08 -N14 3.299221207e-07 -O16 0.108645045 -F18 1.417109763e-07 -Ne20 0.007004350626 -Ne21 5.73319595e-06 -Na22 0.1571361633 -Na23 4.823680511e-07 -Mg24 0.004455549374 -Al27 6.197826902e-06 -Si28 0.06147651501 -P31 9.545310692e-06 -S32 0.1151668114 -Ar36 0.09896332458 -Ca40 0.2507603092 -Ti44 0.005262916908 -Cr48 0.0006665524196 -Fe52 1.291730016e-05 -Ni56 4.728298219e-08 +H1 0.1076931417 +He4 0.08271029045 +C12 1.784869828e-05 +N13 3.39288153e-08 +N14 3.299674554e-07 +O16 0.1086428974 +F18 1.41735561e-07 +Ne20 0.007004116589 +Ne21 5.733659437e-06 +Na22 0.1571361627 +Na23 4.823302158e-07 +Mg24 0.00445536025 +Al27 6.197224432e-06 +Si28 0.06147398898 +P31 9.544436584e-06 +S32 0.1151631603 +Ar36 0.0989622079 +Ca40 0.2507752683 +Ti44 0.005263479859 +Cr48 0.0006666468945 +Fe52 1.291933247e-05 +Ni56 4.7290363e-08 ------------------------------------ species creation rates: -omegadot(H1): 769.3139202 -omegadot(He4): -41728.39524 -omegadot(C12): -9998.215341 +omegadot(H1): 769.3141707 +omegadot(He4): -41728.97096 +omegadot(C12): -9998.21513 omegadot(N13): -9999.996607 -omegadot(N14): -9999.967008 -omegadot(O16): 864.5045001 -omegadot(F18): 0.01417109763 -omegadot(Ne20): 700.4350626 -omegadot(Ne21): 0.573319595 -omegadot(Na22): 15713.61633 -omegadot(Na23): 0.04823680511 -omegadot(Mg24): 445.5549374 -omegadot(Al27): 0.6197826902 -omegadot(Si28): 6147.651501 -omegadot(P31): 0.9545310692 -omegadot(S32): 11516.68114 -omegadot(Ar36): 9896.332458 -omegadot(Ca40): 25076.03092 -omegadot(Ti44): 526.2916908 -omegadot(Cr48): 66.65524196 -omegadot(Fe52): 1.291730016 -omegadot(Ni56): 0.004728298219 -number of steps taken: 594 -AMReX (23.05-4-ga393d7ff7e32) finalized +omegadot(N14): -9999.967003 +omegadot(O16): 864.289744 +omegadot(F18): 0.0141735561 +omegadot(Ne20): 700.4116589 +omegadot(Ne21): 0.5733659437 +omegadot(Na22): 15713.61627 +omegadot(Na23): 0.04823302158 +omegadot(Mg24): 445.536025 +omegadot(Al27): 0.6197224432 +omegadot(Si28): 6147.398898 +omegadot(P31): 0.9544436584 +omegadot(S32): 11516.31603 +omegadot(Ar36): 9896.22079 +omegadot(Ca40): 25077.52683 +omegadot(Ti44): 526.3479859 +omegadot(Cr48): 66.66468945 +omegadot(Fe52): 1.291933247 +omegadot(Ni56): 0.0047290363 +number of steps taken: 544 +AMReX (23.10-13-gecaa14456e3f) finalized diff --git a/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_BE_state_over_time.txt b/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_BE_state_over_time.txt index 69d51e0bea..c3efe2b44e 100644 --- a/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_BE_state_over_time.txt +++ b/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_BE_state_over_time.txt @@ -1,13 +1,13 @@ # Time Density Temperature H1 He3 He4 C12 N14 O16 Ne20 Mg24 Si28 S32 Ar36 Ca40 Ti44 Cr48 Fe52 Fe54 Ni56 n p 0 1e+06 3e+09 0.7 0.025 0.2 0.025 0.025 0.025 0 0 0 0 0 0 0 0 0 0 0 0 0 - 1e-10 1e+06 3.02856e+09 0.706582 0.00189497 0.215397 0.0182827 0.0328219 0.0249997 2.17185e-05 4.00707e-09 1.44235e-11 1.21931e-15 1.85797e-20 1.27593e-25 1.03595e-30 1e-30 1e-30 1e-30 1e-30 2.32624e-30 2.32624e-30 -3.16228e-10 1e+06 3.03476e+09 0.705509 0.000628581 0.216222 0.00931244 0.0432434 0.024999 8.512e-05 4.85269e-08 4.61301e-11 5.41599e-15 2.49264e-19 5.35054e-24 5.79192e-30 1e-30 1e-30 1e-30 1e-30 5.98461e-30 5.98461e-30 - 1e-09 1e+06 3.03969e+09 0.704286 0.000200506 0.21643 0.00111892 0.0526236 0.0249968 0.000342966 6.23243e-07 5.38214e-10 5.62735e-14 5.68043e-18 3.2007e-22 8.23321e-28 1.00066e-30 1e-30 4.24516e-28 1e-30 1.95328e-29 1.95328e-29 -3.16228e-09 1e+06 3.04074e+09 0.704146 6.42104e-05 0.216256 2.27397e-06 0.0533151 0.0249897 0.00121946 7.46561e-06 1.94541e-08 4.61129e-12 1.05971e-15 1.37192e-19 8.46684e-25 2.71189e-30 1.00001e-30 4.24516e-28 1e-30 6.51863e-29 6.51863e-29 - 1e-08 1e+06 3.04176e+09 0.70416 2.09463e-05 0.215457 2.67096e-11 0.0514278 0.0249673 0.00388704 7.92663e-05 6.95194e-07 5.53831e-10 4.29729e-13 1.88314e-16 3.94438e-21 2.71834e-26 1.10323e-30 4.24516e-28 1e-30 2.12447e-28 2.12447e-28 -3.16228e-08 1e+06 3.04471e+09 0.704165 6.50597e-06 0.212971 2.32879e-11 0.0459107 0.0248981 0.0112961 0.000733137 2.01775e-05 4.919e-08 1.14434e-10 1.47598e-13 8.93693e-18 1.75295e-22 1.86294e-27 4.24521e-28 1e-30 6.99839e-28 6.9984e-28 - 1e-07 1e+06 3.05275e+09 0.704166 2.0132e-06 0.206109 2.10593e-11 0.032257 0.0246919 0.0266086 0.00565053 0.000510727 3.96209e-06 2.88476e-08 1.15228e-10 2.13986e-14 1.28346e-18 4.13423e-23 7.01099e-28 1.05157e-30 2.45097e-27 2.46121e-27 -3.16228e-07 1e+06 3.07032e+09 0.704166 6.23619e-07 0.191035 1.67132e-11 0.0110708 0.024113 0.0345257 0.0260972 0.00875392 0.000232005 5.60651e-06 7.35601e-08 4.44762e-11 8.74683e-15 9.19961e-19 2.00534e-23 3.69734e-27 9.94337e-27 7.52646e-25 - 1e-06 1e+06 3.09565e+09 0.704167 1.92199e-07 0.169122 1.16179e-11 0.000490962 0.022467 0.00934994 0.0309577 0.0569389 0.00595735 0.000524875 2.45272e-05 5.14426e-08 3.52397e-11 1.27949e-14 9.58907e-19 1.73607e-22 4.89224e-26 3.55151e-20 -3.16228e-06 1e+06 3.11504e+09 0.704167 5.937e-08 0.150126 8.16958e-12 7.84999e-08 0.0180619 0.000893683 0.00277257 0.0734901 0.0352149 0.0128016 0.00245239 1.95824e-05 4.98184e-08 6.56227e-11 1.7601e-14 3.14095e-18 3.3984e-25 6.51888e-16 - 1e-05 1e+06 3.14013e+09 0.704167 1.8749e-08 0.120661 4.27519e-12 4.8354e-09 0.00988207 0.000461506 0.000861871 0.0268741 0.0368383 0.0508397 0.0478301 0.00156971 1.54457e-05 7.53675e-08 7.2984e-11 1.28002e-14 2.10934e-21 2.70311e-12 + 1e-10 1e+06 3.02856e+09 0.706582 0.00189497 0.215397 0.0182827 0.0328219 0.0249997 2.17185e-05 4.00707e-09 1.44235e-11 1.21931e-15 1.85797e-20 1.27593e-25 1.02919e-30 1.35535e-26 1.0011e-30 1e-30 1e-30 2.32624e-30 2.32624e-30 +3.16228e-10 1e+06 3.03476e+09 0.705509 0.000628581 0.216222 0.00931244 0.0432434 0.024999 8.512e-05 4.85269e-08 4.61301e-11 5.41599e-15 2.49264e-19 5.35054e-24 5.78516e-30 1.35535e-26 1.00859e-30 1e-30 1e-30 5.98461e-30 5.98461e-30 + 1e-09 1e+06 3.03969e+09 0.704286 0.000200506 0.21643 0.00111892 0.0526236 0.0249968 0.000342966 6.23243e-07 5.38214e-10 5.62735e-14 5.68043e-18 3.2007e-22 8.23314e-28 1.35535e-26 1.03309e-30 1e-30 1e-30 1.95328e-29 1.95328e-29 +3.16228e-09 1e+06 3.04074e+09 0.704146 6.42104e-05 0.216256 2.27397e-06 0.0533151 0.0249897 0.00121946 7.46561e-06 1.94541e-08 4.61129e-12 1.05971e-15 1.37192e-19 8.46684e-25 1.35551e-26 1.1116e-30 1e-30 1e-30 6.51863e-29 6.51863e-29 + 1e-08 1e+06 3.04176e+09 0.70416 2.09463e-05 0.215457 2.67096e-11 0.0514278 0.0249673 0.00388704 7.92663e-05 6.95194e-07 5.53831e-10 4.29729e-13 1.88314e-16 3.94438e-21 4.07356e-26 1.46363e-30 1.00001e-30 1e-30 2.12447e-28 2.12447e-28 +3.16228e-08 1e+06 3.04471e+09 0.704165 6.5068e-06 0.212971 2.32879e-11 0.0459108 0.0248981 0.011296 0.000733175 2.01812e-05 4.92086e-08 1.14507e-10 1.47741e-13 8.94913e-18 1.75628e-22 1.86847e-27 1.0042e-30 1e-30 6.99842e-28 6.99842e-28 + 1e-07 1e+06 3.05275e+09 0.704166 2.01328e-06 0.206109 2.10593e-11 0.0322571 0.0246919 0.0266085 0.00565055 0.000510734 3.96223e-06 2.88493e-08 1.15238e-10 2.14014e-14 1.28369e-18 4.13518e-23 2.77662e-28 1.05158e-30 2.45097e-27 2.46122e-27 +3.16228e-07 1e+06 3.07032e+09 0.704166 6.23626e-07 0.191035 1.67132e-11 0.0110708 0.024113 0.0345257 0.0260972 0.00875393 0.000232006 5.60654e-06 7.35607e-08 4.44768e-11 8.74697e-15 9.19981e-19 2.00535e-23 3.69744e-27 9.94337e-27 7.52667e-25 + 1e-06 1e+06 3.09565e+09 0.704167 1.92198e-07 0.169122 1.16179e-11 0.000490925 0.022467 0.00934976 0.0309578 0.0569392 0.00595731 0.00052486 2.45257e-05 5.14375e-08 3.52346e-11 1.27923e-14 9.58651e-19 1.73561e-22 4.89223e-26 3.55056e-20 +3.16228e-06 1e+06 3.11504e+09 0.704167 5.93699e-08 0.150126 8.16958e-12 7.84947e-08 0.0180619 0.000893682 0.00277256 0.0734901 0.035215 0.0128016 0.00245239 1.95822e-05 4.98179e-08 6.56216e-11 1.76006e-14 3.14089e-18 3.39838e-25 6.51874e-16 + 1e-05 1e+06 3.14013e+09 0.704167 1.8749e-08 0.120661 4.27519e-12 4.8354e-09 0.00988207 0.000461506 0.000861871 0.0268741 0.0368383 0.0508397 0.0478301 0.00156971 1.54457e-05 7.53674e-08 7.29839e-11 1.28002e-14 2.10934e-21 2.70311e-12 diff --git a/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_state_over_time.txt b/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_state_over_time.txt index d7c744215a..39d42da8cc 100644 --- a/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_state_over_time.txt +++ b/unit_test/burn_cell_sdc/ci-benchmarks/aprox19_state_over_time.txt @@ -4,10 +4,10 @@ 3.16228e-10 1e+06 3.03478e+09 0.705507 0.000621921 0.216227 0.0092854 0.043275 0.024999 8.50466e-05 4.81558e-08 4.59635e-11 5.40157e-15 2.46986e-19 5.24295e-24 5.63193e-30 1e-30 1e-30 1e-30 1e-30 5.98338e-30 5.98338e-30 1e-09 1e+06 3.03971e+09 0.704282 0.000198228 0.216432 0.00109041 0.0526569 0.0249968 0.000342898 6.19859e-07 5.31673e-10 5.54672e-14 5.58299e-18 3.12982e-22 7.99114e-28 1.00063e-30 1e-30 1e-30 1e-30 1.95324e-29 1.95324e-29 3.16228e-09 1e+06 3.04074e+09 0.704146 6.28602e-05 0.216257 1.73328e-06 0.0533156 0.0249897 0.00121971 7.35522e-06 1.86066e-08 4.22894e-12 9.22256e-16 1.12401e-19 6.48983e-25 2.22129e-30 1.00001e-30 1e-30 9.99999e-31 6.51843e-29 6.51843e-29 - 1e-08 1e+06 3.04176e+09 0.70416 2.04828e-05 0.215457 0 0.0514256 0.0249673 0.00389241 7.69853e-05 6.38368e-07 4.73546e-10 3.40222e-13 1.3847e-16 2.72235e-21 1.7909e-26 1.06638e-30 1.00001e-30 9.99996e-31 2.12345e-28 2.12345e-28 -3.16228e-08 1e+06 3.04471e+09 0.704164 6.34237e-06 0.212969 2.41781e-11 0.0459028 0.0248981 0.0113145 0.000725596 1.98421e-05 4.89394e-08 1.18275e-10 1.63701e-13 1.10302e-17 2.50276e-22 3.20374e-27 1.00897e-30 9.99991e-31 6.99475e-28 6.99475e-28 - 1e-07 1e+06 3.05276e+09 0.704166 1.97272e-06 0.206101 2.10567e-11 0.0322273 0.0246918 0.0266706 0.00563202 0.00050569 3.92045e-06 2.8844e-08 1.18231e-10 2.29592e-14 1.4715e-18 5.18729e-23 3.90644e-28 1.07265e-30 2.4494e-27 2.46383e-27 -3.16228e-07 1e+06 3.07034e+09 0.704166 6.16355e-07 0.191015 1.67081e-11 0.0110228 0.0241129 0.0345787 0.0261422 0.00872611 0.000229534 5.49795e-06 7.15038e-08 4.2921e-11 8.40418e-15 8.83784e-19 1.93663e-23 3.5714e-27 9.93669e-27 7.27207e-25 + 1e-08 1e+06 3.04176e+09 0.70416 2.04835e-05 0.215457 0 0.0514256 0.0249673 0.00389241 7.69853e-05 6.38372e-07 4.73546e-10 3.40208e-13 1.3845e-16 2.72143e-21 1.78973e-26 1.0663e-30 1.00001e-30 9.99996e-31 2.12345e-28 2.12345e-28 +3.16228e-08 1e+06 3.04471e+09 0.704164 6.34257e-06 0.212969 2.41718e-11 0.0459028 0.0248981 0.0113145 0.000725593 1.98427e-05 4.8946e-08 1.18312e-10 1.63798e-13 1.10409e-17 2.50638e-22 3.21027e-27 1.009e-30 9.99991e-31 6.99482e-28 6.99482e-28 + 1e-07 1e+06 3.05276e+09 0.704166 1.97274e-06 0.206101 2.10567e-11 0.0322273 0.0246918 0.0266706 0.00563202 0.000505691 3.92047e-06 2.88443e-08 1.18234e-10 2.29599e-14 1.47157e-18 5.18764e-23 3.90679e-28 1.07266e-30 2.4494e-27 2.46384e-27 +3.16228e-07 1e+06 3.07034e+09 0.704166 6.16357e-07 0.191015 1.67081e-11 0.0110228 0.0241129 0.0345787 0.0261422 0.00872611 0.000229534 5.49795e-06 7.15038e-08 4.2921e-11 8.4042e-15 8.83786e-19 1.93664e-23 3.57141e-27 9.93669e-27 7.2721e-25 1e-06 1e+06 3.09568e+09 0.704166 1.90977e-07 0.169097 1.16129e-11 0.000479845 0.0224668 0.00930122 0.0309807 0.0570159 0.00594684 0.000520989 2.41528e-05 5.01772e-08 3.40108e-11 1.22121e-14 9.05195e-19 1.63882e-22 4.89062e-26 3.35258e-20 -3.16228e-06 1e+06 3.11505e+09 0.704166 5.90985e-08 0.150118 8.16827e-12 5.39796e-08 0.0180596 0.000891114 0.00273936 0.0735111 0.0352666 0.0127917 0.00243636 1.92951e-05 4.85823e-08 6.32194e-11 1.6726e-14 2.98487e-18 3.33563e-25 6.19482e-16 - 1e-05 1e+06 3.14015e+09 0.704166 1.8682e-08 0.120635 4.27245e-12 4.83365e-09 0.00987352 0.000461095 0.00086113 0.0268146 0.036848 0.0509385 0.0478247 0.00156184 1.52568e-05 7.37586e-08 7.06632e-11 1.23934e-14 2.01895e-21 2.61715e-12 +3.16228e-06 1e+06 3.11505e+09 0.704166 5.90985e-08 0.150118 8.16827e-12 5.39787e-08 0.0180596 0.000891114 0.00273936 0.0735111 0.0352666 0.0127917 0.00243636 1.92951e-05 4.85823e-08 6.32193e-11 1.6726e-14 2.98487e-18 3.33563e-25 6.19482e-16 + 1e-05 1e+06 3.14015e+09 0.704166 1.8682e-08 0.120635 4.27245e-12 4.83365e-09 0.00987352 0.000461095 0.00086113 0.0268146 0.036848 0.0509385 0.0478247 0.00156184 1.52568e-05 7.37585e-08 7.06631e-11 1.23934e-14 2.01895e-21 2.61715e-12 diff --git a/unit_test/test_neutrino_cooling/ci-benchmarks/test_sneut5.out b/unit_test/test_neutrino_cooling/ci-benchmarks/test_sneut5.out index c314665d07..43e9d72478 100644 --- a/unit_test/test_neutrino_cooling/ci-benchmarks/test_sneut5.out +++ b/unit_test/test_neutrino_cooling/ci-benchmarks/test_sneut5.out @@ -26,6 +26,6 @@ X_proton 0 0.026315789474 sneut 0 3.3206297956e+23 dsneutdt 0 2.9114557633e+14 - dsneutda -2.0028760264e+16 1.6034657416e+20 - dsneutdz -1.832532276e+20 2.2890025857e+16 + dsneutda -1.9892659343e+16 1.6034657636e+20 + dsneutdz -1.8325323011e+20 2.2734481947e+16 diff --git a/unit_test/test_rhs/ci-benchmarks/aprox13.out b/unit_test/test_rhs/ci-benchmarks/aprox13.out index 2a3cb6c119..56c4ec226c 100644 --- a/unit_test/test_rhs/ci-benchmarks/aprox13.out +++ b/unit_test/test_rhs/ci-benchmarks/aprox13.out @@ -43,7 +43,7 @@ J_chromium-48_helium-4 6.8935846419e-69 5498823.3125 J_iron-52_helium-4 5.1159900994e-72 9496238.1457 J_nickel-56_helium-4 1.2369463711e-79 6465258.5107 - J_E_helium-4 -37.96418269 5.6963666435e+27 + J_E_helium-4 -37.961886363 5.6963666435e+27 J_helium-4_carbon-12 -549068.13437 16350655002 J_carbon-12_carbon-12 -32736863803 -4.3536076636e-25 J_oxygen-16_carbon-12 -215702563.02 53050483.792 @@ -57,7 +57,7 @@ J_chromium-48_carbon-12 0 0 J_iron-52_carbon-12 0 0 J_nickel-56_carbon-12 0 0 - J_E_carbon-12 -7.4476136442e+22 7.3277248697e+28 + J_E_carbon-12 -7.4476136443e+22 7.3277248697e+28 J_helium-4_oxygen-16 -196341285.62 116442916.35 J_carbon-12_oxygen-16 -295329776.6 144805.77929 J_oxygen-16_oxygen-16 -328244197.95 -5.8277893387e-34 @@ -71,7 +71,7 @@ J_chromium-48_oxygen-16 0 0 J_iron-52_oxygen-16 0 0 J_nickel-56_oxygen-16 0 0 - J_E_oxygen-16 -9.7641101938e+23 3.501361507e+27 + J_E_oxygen-16 -9.7641101939e+23 3.501361507e+27 J_helium-4_neon-20 -10923354794 114705723.28 J_carbon-12_neon-20 0 0 J_oxygen-16_neon-20 0 144408911.44 @@ -99,7 +99,7 @@ J_chromium-48_magnesium-24 0 0 J_iron-52_magnesium-24 0 0 J_nickel-56_magnesium-24 0 0 - J_E_magnesium-24 -65676.173201 1.652673424e+29 + J_E_magnesium-24 -65734.443865 1.652673424e+29 J_helium-4_silicon-28 -2556508974.5 20661.78792 J_carbon-12_silicon-28 0 0 J_oxygen-16_silicon-28 0 0 @@ -113,7 +113,7 @@ J_chromium-48_silicon-28 0 0 J_iron-52_silicon-28 0 0 J_nickel-56_silicon-28 0 0 - J_E_silicon-28 -2.904944194e+23 1.7139561264e+28 + J_E_silicon-28 -2.9049441941e+23 1.7139561264e+28 J_helium-4_sulfur-32 -4251265603.3 8881309.5672 J_carbon-12_sulfur-32 0 0 J_oxygen-16_sulfur-32 0 0 @@ -211,7 +211,7 @@ J_chromium-48_nickel-56 0 0 J_iron-52_nickel-56 0 381082.60535 J_nickel-56_nickel-56 -381082.60535 0 - J_E_nickel-56 -2.9411320544e+24 8.0628253938e+14 + J_E_nickel-56 -2.9411320544e+24 8.0550862785e+14 J_helium-4_E -1.375359511e-10 9.1794090251e-09 J_carbon-12_E -1.8412378137e-08 6.8308749195e-13 J_oxygen-16_E -4.9194133409e-11 4.971951643e-12 diff --git a/unit_test/test_rhs/ci-benchmarks/aprox19.out b/unit_test/test_rhs/ci-benchmarks/aprox19.out index 201258eb2d..91c2d9702a 100644 --- a/unit_test/test_rhs/ci-benchmarks/aprox19.out +++ b/unit_test/test_rhs/ci-benchmarks/aprox19.out @@ -201,7 +201,7 @@ J_nickel-56_magnesium-24 0 0 J_neutron_magnesium-24 0 0 J_proton_magnesium-24 0 0 - J_E_magnesium-24 -65836.025628 1.6435693578e+29 + J_E_magnesium-24 -65859.317238 1.6435693578e+29 J_hydrogen-1_silicon-28 0 0 J_helium-3_silicon-28 0 0 J_helium-4_silicon-28 -2539600300.1 20658.714693 @@ -221,7 +221,7 @@ J_nickel-56_silicon-28 0 0 J_neutron_silicon-28 0 0 J_proton_silicon-28 0 0 - J_E_silicon-28 -2.9044184049e+23 1.7026200525e+28 + J_E_silicon-28 -2.904418405e+23 1.7026200525e+28 J_hydrogen-1_sulfur-32 0 0 J_helium-3_sulfur-32 0 0 J_helium-4_sulfur-32 -4220786865.5 8879079.2827 @@ -341,7 +341,7 @@ J_nickel-56_iron-52 4.3001564738e-78 552709472.84 J_neutron_iron-52 -6.4991725027e+12 0 J_proton_iron-52 0 431335119.97 - J_E_iron-52 -2.3084042815e+11 7.5442123176e+31 + J_E_iron-52 -2.2996831358e+11 7.5442123176e+31 J_hydrogen-1_iron-54 0 0 J_helium-3_iron-54 0 0 J_helium-4_iron-54 0 14675163.343 @@ -361,7 +361,7 @@ J_nickel-56_iron-54 0 14319319597 J_neutron_iron-54 0 604.52588062 J_proton_iron-54 -28667989521 0 - J_E_iron-54 -6.4881996912e+21 1.6907715174e+29 + J_E_iron-54 -6.488199697e+21 1.6907715174e+29 J_hydrogen-1_nickel-56 0 0 J_helium-3_nickel-56 0 0 J_helium-4_nickel-56 0 334649.39629 @@ -381,7 +381,7 @@ J_nickel-56_nickel-56 -247479689.06 0 J_neutron_nickel-56 0 0 J_proton_nickel-56 0 494955656.77 - J_E_nickel-56 -2.9211034564e+27 1.0288702015e+17 + J_E_nickel-56 -2.9211034564e+27 1.0288701986e+17 J_hydrogen-1_neutron 0 0 J_helium-3_neutron 0 0 J_helium-4_neutron 0 1.5520970787e+11 @@ -421,7 +421,7 @@ J_nickel-56_proton 0 530345170.26 J_neutron_proton -3.1041941575e+11 0.01005978836 J_proton_proton -3.1047599221e+11 -2.3827182398e-87 - J_E_proton -7.593501065e+15 4.237794952e+30 + J_E_proton -7.593501066e+15 4.237794952e+30 J_hydrogen-1_E 2.0563926691e-19 5.7718078776e-06 J_helium-3_E -5.7716864292e-06 -2.0648367761e-19 J_helium-4_E 1.026556653e-19 2.885937043e-06 diff --git a/unit_test/test_rhs/ci-benchmarks/aprox21.out b/unit_test/test_rhs/ci-benchmarks/aprox21.out index bc513f9e62..b8c6ee7383 100644 --- a/unit_test/test_rhs/ci-benchmarks/aprox21.out +++ b/unit_test/test_rhs/ci-benchmarks/aprox21.out @@ -221,7 +221,7 @@ J_nickel-56_magnesium-24 0 0 J_neutron_magnesium-24 0 0 J_proton_magnesium-24 0 0 - J_E_magnesium-24 -71759.536816 1.6357279567e+29 + J_E_magnesium-24 -71764.239466 1.6357279567e+29 J_hydrogen-1_silicon-28 0 0 J_helium-3_silicon-28 0 0 J_helium-4_silicon-28 -2525055183.6 20658.704958 @@ -243,7 +243,7 @@ J_nickel-56_silicon-28 0 0 J_neutron_silicon-28 0 0 J_proton_silicon-28 0 0 - J_E_silicon-28 -2.9044167997e+23 1.6928685775e+28 + J_E_silicon-28 -2.9044167998e+23 1.6928685775e+28 J_hydrogen-1_sulfur-32 0 0 J_helium-3_sulfur-32 0 0 J_helium-4_sulfur-32 -4194578244.6 8879072.2185 @@ -375,7 +375,7 @@ J_nickel-56_chromium-56 0 0 J_neutron_chromium-56 0 0 J_proton_chromium-56 0 0 - J_E_chromium-56 -1.8093693678e+15 2.256453157e+17 + J_E_chromium-56 -1.8292382081e+15 2.2563985305e+17 J_hydrogen-1_iron-52 0 0 J_helium-3_iron-52 0 0 J_helium-4_iron-52 -743179296.84 493082.01674 @@ -397,7 +397,7 @@ J_nickel-56_iron-52 4.5459700269e-78 539742599.12 J_neutron_iron-52 -5.7770422246e+12 0 J_proton_iron-52 0 463978849.94 - J_E_iron-52 -2.4561809471e+11 6.7059665045e+31 + J_E_iron-52 -2.4468743487e+11 6.7059665045e+31 J_hydrogen-1_iron-54 0 0 J_helium-3_iron-54 0 0 J_helium-4_iron-54 -416714108.26 89938.022334 @@ -419,7 +419,7 @@ J_nickel-56_iron-54 0 12628008866 J_neutron_iron-54 -5.8420788754e+13 0 J_proton_iron-54 -25242800365 49264281.385 - J_E_iron-54 -2.5384087204e+11 5.7722247891e+32 + J_E_iron-54 -2.529102122e+11 5.7722247891e+32 J_hydrogen-1_iron-56 0 0 J_helium-3_iron-56 0 0 J_helium-4_iron-56 0 1.0853220404e+11 @@ -463,7 +463,7 @@ J_nickel-56_nickel-56 -247303719.77 0 J_neutron_nickel-56 0 0 J_proton_nickel-56 0 494604136 - J_E_nickel-56 -2.9190272674e+27 3.8630535107e+17 + J_E_nickel-56 -2.9190272674e+27 3.863053733e+17 J_hydrogen-1_neutron 0 0 J_helium-3_neutron 0 0 J_helium-4_neutron 0 1.3482425469e+11 @@ -507,7 +507,7 @@ J_nickel-56_proton 0 467704032.09 J_neutron_proton -2.6964850938e+11 0.034588911424 J_proton_proton -2.6983923086e+11 -2.7428164302e-87 - J_E_proton -2.6108991385e+16 3.6817330507e+30 + J_E_proton -2.6108991386e+16 3.6817330507e+30 J_hydrogen-1_E -1.0006504976e-07 4.2872891104e-06 J_helium-3_E -4.2866803458e-06 -7.5769167747e-20 J_helium-4_E 3.7850094111e-20 2.1441607162e-06 diff --git a/unit_test/test_rhs/ci-benchmarks/ecsn.out b/unit_test/test_rhs/ci-benchmarks/ecsn.out index 9489ba5c4d..29c2eedc18 100644 --- a/unit_test/test_rhs/ci-benchmarks/ecsn.out +++ b/unit_test/test_rhs/ci-benchmarks/ecsn.out @@ -37,7 +37,7 @@ J_silicon-28_hydrogen-1 1.9049142873e-28 1.4457599197e+16 J_phosphorus-31_hydrogen-1 -1.4363730396e+16 -2.3890907984e-32 J_sulfur-32_hydrogen-1 2.3875895211e-32 3.8373494834e+15 - J_E_hydrogen-1 7.2668109011e-07 5.3233598076e+34 + J_E_hydrogen-1 7.3588532259e-07 5.3233598076e+34 J_hydrogen-1_helium-4 6.3597516852e-96 2.3050360212e+15 J_helium-4_helium-4 -2.3251430676e+15 -8.7617347065e-57 J_oxygen-16_helium-4 -5.9750641231e+12 -8.7617347064e-57 @@ -61,7 +61,7 @@ J_silicon-28_oxygen-16 5.3544432665e-93 1.4407576856e+26 J_phosphorus-31_oxygen-16 5.3544432665e-93 1.4407576856e+26 J_sulfur-32_oxygen-16 0 0 - J_E_oxygen-16 -54524.316756 2.4009435853e+45 + J_E_oxygen-16 -54556.178444 2.4009435853e+45 J_hydrogen-1_oxygen-20 0 0 J_helium-4_oxygen-20 0 0 J_oxygen-16_oxygen-20 0 0 @@ -73,7 +73,7 @@ J_silicon-28_oxygen-20 0 0 J_phosphorus-31_oxygen-20 0 0 J_sulfur-32_oxygen-20 0 0 - J_E_oxygen-20 -4.2481653689e+13 1.7104309459e+17 + J_E_oxygen-20 -4.2470934331e+13 1.7103809712e+17 J_hydrogen-1_fluorine-20 0 0 J_helium-4_fluorine-20 0 0 J_oxygen-16_fluorine-20 0 0 @@ -85,7 +85,7 @@ J_silicon-28_fluorine-20 0 0 J_phosphorus-31_fluorine-20 0 0 J_sulfur-32_fluorine-20 0 0 - J_E_fluorine-20 -1.5940355629e+21 4.7992907772e+17 + J_E_fluorine-20 -1.5940355628e+21 4.7992345557e+17 J_hydrogen-1_neon-20 0 0 J_helium-4_neon-20 -3.9073008309e+13 87637435.641 J_oxygen-16_neon-20 3.8849945775e-100 88180925.52 @@ -121,7 +121,7 @@ J_silicon-28_aluminum-27 5.1432681704e-27 3.7588755703e+16 J_phosphorus-31_aluminum-27 6.4778539534e-78 6.4064066131e+13 J_sulfur-32_aluminum-27 0 0 - J_E_aluminum-27 -2.3076325355e-05 4.5339945455e+35 + J_E_aluminum-27 -2.3473767915e-05 4.5339945455e+35 J_hydrogen-1_silicon-28 1.3633533854e-95 4.2286361267e+15 J_helium-4_silicon-28 -4.2420142918e+15 -1.9556484036e-82 J_oxygen-16_silicon-28 0 0 @@ -145,7 +145,7 @@ J_silicon-28_phosphorus-31 4.6539596654e-34 4.4390283525e+17 J_phosphorus-31_phosphorus-31 -4.4527564228e+17 -7.406181475e-31 J_sulfur-32_phosphorus-31 7.4015275153e-31 1.1895783399e+17 - J_E_phosphorus-31 -0.00018025525389 1.1296769894e+36 + J_E_phosphorus-31 -0.00021865701493 1.1296769894e+36 J_hydrogen-1_sulfur-32 0 0 J_helium-4_sulfur-32 0 0 J_oxygen-16_sulfur-32 0 0 @@ -157,7 +157,7 @@ J_silicon-28_sulfur-32 0 0 J_phosphorus-31_sulfur-32 0 0 J_sulfur-32_sulfur-32 0 0 - J_E_sulfur-32 -1.2066886642e+15 7.8006383744e+14 + J_E_sulfur-32 -1.2200141114e+15 7.734440401e+14 J_hydrogen-1_E -0.12580793235 1.2089803642e+12 J_helium-4_E -0.0078065301852 1.4905283338e+12 J_oxygen-16_E -5.3990173959e+12 1.2739583515e-06 diff --git a/unit_test/test_rhs/ci-benchmarks/iso7.out b/unit_test/test_rhs/ci-benchmarks/iso7.out index f77f18f11e..86f9a2a563 100644 --- a/unit_test/test_rhs/ci-benchmarks/iso7.out +++ b/unit_test/test_rhs/ci-benchmarks/iso7.out @@ -25,7 +25,7 @@ J_magnesium-24_helium-4 -4.6598486093e-09 14984957882 J_silicon-28_helium-4 -1.0350391329e+35 7196378096.4 J_nickel-56_helium-4 0 1.0350391329e+35 - J_E_helium-4 -87.837947379 4.932675415e+54 + J_E_helium-4 -87.77240322 4.932675415e+54 J_helium-4_carbon-12 -46065373.422 1.8369106708e+13 J_carbon-12_carbon-12 -3.6773326651e+13 -7.0444246309e-43 J_oxygen-16_carbon-12 -7.4641202755e+11 25858392627 @@ -73,7 +73,7 @@ J_magnesium-24_nickel-56 0 0 J_silicon-28_nickel-56 0 10000000000 J_nickel-56_nickel-56 -10000000000 0 - J_E_nickel-56 -4.7656897776e+29 3.4603369325e+17 + J_E_nickel-56 -4.7656897776e+29 3.4732921378e+17 J_helium-4_E -5.2043289985e-09 1.0072596721e+20 J_carbon-12_E -8.1026490435e-07 6.1135331864e-10 J_oxygen-16_E -1.0316135993e-08 2.5415462665e-08