Merge branch 'development' into nse_check_update

Author: zhichen3

nse_solver/nse_compatibility/ci-benchmarks/nse_net_integration_unit_test.out

@@ -1,5 +1,5 @@
-Initializing AMReX (26.01-26-g667b7362c88c)...
-AMReX (26.01-26-g667b7362c88c) initialized
+Initializing AMReX (26.01-40-gbac24575699e)...
+AMReX (26.01-40-gbac24575699e) initialized
 starting the single zone burn...
 reading in network electron-capture / beta-decay tables...
 ------------------------------------
@@ -11,11 +11,11 @@ reading in network electron-capture / beta-decay tables...
 ------------------------------------
 Element       Burn Xs             NSE Xs              abs err             rel err
   H1    5.38909747e-02      5.38909747e-02      6.52256027e-16      1.21032516e-14
-  He4   5.17680679e-01      5.17680679e-01      3.01425551e-13      5.82261543e-13
+  He4   5.17680679e-01      5.17680679e-01      3.01314529e-13      5.82047082e-13
   C12   1.31566442e-05      1.31566442e-05      2.80655897e-17      2.13318756e-12
   N13   2.54374035e-09      2.54374035e-09      3.71734967e-21      1.46137151e-12
   O16   3.19225352e-05      3.19225352e-05      3.83333231e-17      1.20082327e-12
-  F17   1.49115081e-09      1.49115081e-09      5.86884645e-22      3.93578331e-13
+  F17   1.49115081e-09      1.49115081e-09      5.87298235e-22      3.93855694e-13
   Ne20  7.33589878e-07      7.33589878e-07      2.50912335e-18      3.42033529e-12
   Na23  3.67457204e-08      3.67457204e-08      1.62928111e-19      4.43393432e-12
   Mg24  1.00775502e-04      1.00775502e-04      7.83417385e-16      7.77388718e-12
@@ -30,4 +30,4 @@ Element       Burn Xs             NSE Xs              abs err             rel er
   Fe52  5.86021446e-02      5.86021446e-02      4.66057748e-13      7.95291283e-12
   Ni56  2.30043480e-01      2.30043480e-01      1.34600664e-12      5.85109667e-12
 ------------------------------------
-AMReX (26.01-26-g667b7362c88c) finalized
+AMReX (26.01-40-gbac24575699e) finalized

nse_solver/nse_eqns.H

@@ -4,6 +4,8 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Algorithm.H>
 #include <extern_parameters.H>
+#include <actual_network.H>
+#include <partition_functions.H>
 
 ///
 /// This file contains routines needed to solve:
@@ -35,12 +37,11 @@ T get_T_independent_nse_state(const T& state) {
     constexpr amrex::Real kBGK_2PiHbar2 = (C::k_B * 1.0e9_rt) / (2.0_rt * M_PI * C::hbar * C::hbar);
     const amrex::Real rho_inv = 1.0_rt / state.rho;
 
-    amrex::constexpr_for<0, NumSpec>([&] (auto n)
-    {
+    for (int n = 0; n < NumSpec; ++n) {
         // Absorb mion into kBGK_2PiHbar2 to prevent underflow at compile time.
-        nse_state.xn[n] = network::mion<n+1>() * get_spin_state<n+1>() *
-            gcem::sqrt(amrex::Math::powi<3>(network::mion<n+1>() * kBGK_2PiHbar2)) * rho_inv;
-    });
+        nse_state.xn[n] = network::mion(n+1) * get_spin_state(n+1) *
+            std::sqrt(amrex::Math::powi<3>(network::mion(n+1) * kBGK_2PiHbar2)) * rho_inv;
+    }
 
     return nse_state;
 }
@@ -74,18 +75,11 @@ void compute_coulomb_contribution(amrex::Array1D<amrex::Real, 1, NumSpec>& u_c,
         C::q_e * C::q_e * gcem::pow(4.0_rt * M_PI / 3.0_rt, 1.0_rt / 3.0_rt) / (C::k_B * 1.0e9_rt);
     const amrex::Real Gamma_e = gamma_e_constants * std::cbrt(n_e) * T9i;
 
-    // Precompute Z^{5/3}
-    amrex::Array1D<amrex::Real, 1, NumSpec> Z_53;
-    amrex::constexpr_for<1, NumSpec+1>([&] (auto n)
-    {
-        Z_53(n) = gcem::pow(NetworkProperties::zion(n), 5.0_rt / 3.0_rt);
-    });
-
     for (int n = 1; n <= NumSpec; ++n) {
 
         // term for calculating u_c
-
-        amrex::Real Gamma = Z_53(n) * Gamma_e;
+        amrex::Real Z_53 = amrex::Math::powi<5>(std::cbrt(NetworkProperties::zion(n)));
+        amrex::Real Gamma = Z_53 * Gamma_e;
 
         // chemical potential for coulomb correction
         // see appendix of Calder 2007, doi:10.1086/510709 for more detail

unit_test/nse_net_cell/ci-benchmarks/nse_net_unit_test.out

@@ -1,5 +1,5 @@
-Initializing AMReX (26.01-26-g667b7362c88c)...
-AMReX (26.01-26-g667b7362c88c) initialized
+Initializing AMReX (26.01-40-gbac24575699e)...
+AMReX (26.01-40-gbac24575699e) initialized
 starting the single zone burn...
 reading in network electron-capture / beta-decay tables...
 chemical potential of proton is -3
@@ -32,14 +32,14 @@ Using nse.solve_nse_e_mode == 1 :
 change in T: 6000000000 6069144727
 change in abar: 7.026880148 6.26238884
 recovered energy: 2.784234255e+18 2.784234255e+18
-Constraint Eqns using solved input are: 2.861599846e-14 1.221245327e-15 -1.998401444e-15 
+Constraint Eqns using solved input are: 6.175615574e-14 2.997602166e-15 1.33226763e-15 
 Constraint Jacobian using solved input are: 19.70206532 19.80498652 3.069602949 9.82702147 9.875043853 1.533907452 0.2616834419 0.2616834419 0.7450188201 
 -----------------------------------------------
 Using nse.solve_nse_e_mode == 2 :
 change in T: 6000000000 6069144727
 change in abar: 7.026880148 6.26238884
 recovered energy: 2.784234255e+18 2.784234255e+18
-Constraint Eqns using solved input are: -6.303013667e-13 -2.770006446e-14 -3.76254583e-13 
+Constraint Eqns using solved input are: -7.35966843e-13 -3.319566844e-14 -4.042322033e-13 
 Constraint Jacobian using solved input are: 19.70206532 19.80498652 3.069602949 9.82702147 9.875043853 1.533907452 0.2616834419 0.2616834419 0.7450188201 
 -----------------------------------------------
-AMReX (26.01-26-g667b7362c88c) finalized
+AMReX (26.01-40-gbac24575699e) finalized