update pynucastro networks to pynucastro 2.11

integration/nse_update_sdc.H

@@ -33,7 +33,7 @@ using namespace amrex::literals;
 /// on input, *_source are the reactive sources at time t0 and on output
 /// they are the sources at time t0+dt
 ///
-AMREX_GPU_HOST_DEVICE AMREX_INLINE
+AMREX_GPU_DEVICE AMREX_INLINE
 void nse_derivs(const amrex::Real rho0, const amrex::Real rhoe0, const amrex::Real *rhoaux0,
                 const amrex::Real dt, const amrex::Real *ydot_a,
                 amrex::Real& drhoedt, amrex::Real* drhoauxdt, const amrex::Real T_fixed) {
@@ -168,7 +168,7 @@ void nse_derivs(const amrex::Real rho0, const amrex::Real rhoe0, const amrex::Re
 /// this version works with the tabulated NSE and requires AUX_THERMO
 ///
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_INLINE
+AMREX_GPU_DEVICE AMREX_INLINE
 void sdc_nse_burn(BurnT& state, const amrex::Real dt) {
 
     using namespace AuxZero;
@@ -307,7 +307,7 @@ void sdc_nse_burn(BurnT& state, const amrex::Real dt) {
 ///
 /// This computes drhoedt and drhoyedt_weak for a given (rho, rho e, and rho Ye)
 ///
-AMREX_GPU_HOST_DEVICE AMREX_INLINE
+AMREX_GPU_DEVICE AMREX_INLINE
 void nse_derivs(const amrex::Real rho0, const amrex::Real rhoe0,
                 const amrex::Real rhoYe0, amrex::Real &T0,
                 amrex::Real &mu_p, amrex::Real &mu_n,
@@ -415,7 +415,7 @@ void nse_derivs(const amrex::Real rho0, const amrex::Real rhoe0,
 ///
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_INLINE
+AMREX_GPU_DEVICE AMREX_INLINE
 void sdc_nse_burn(BurnT& state, const amrex::Real dt) {
 
     state.success = true;

networks/CNO_extras/Make.package

@@ -2,13 +2,15 @@ PYNUCASTRO_NETWORK = TRUE
 CEXE_headers += network_properties.H
 
 ifeq ($(USE_REACT),TRUE)
-  CEXE_sources += actual_network_data.cpp
   CEXE_headers += actual_network.H
   CEXE_headers += tfactors.H
   CEXE_headers += interp_tools.H
   CEXE_headers += partition_functions.H
   CEXE_headers += actual_rhs.H
+  CEXE_headers += rate_type.H
   CEXE_headers += reaclib_rates.H
+  CEXE_headers += approximate_rates.H
+  CEXE_headers += modified_rates.H
   CEXE_headers += table_rates.H
   CEXE_headers += temperature_table_rates.H
   CEXE_headers += derived_rates.H

networks/CNO_extras/actual_network.H

@@ -1,18 +1,25 @@
 #ifndef actual_network_H
 #define actual_network_H
 
+#include <random>
 #include <string_view>
 
 #include <AMReX_REAL.H>
 #include <AMReX_Array.H>
 #include <AMReX_Loop.H>
 
+#include <extern_parameters.H>
 #include <fundamental_constants.H>
 #include <network_properties.H>
 
 using namespace amrex::literals;
 
-void actual_network_init();
+
+inline
+void actual_network_init() {
+
+
+}
 
 constexpr std::string_view network_name = "pynucastro-cxx";
 
@@ -289,6 +296,39 @@ namespace Rates
         NumRates = k_He4_Mg24_to_C12_O16_derived
     };
 
+    enum ScreenPairs :
+    std::uint8_t
+    {
+        k_He4_Ne18 = 1,
+        k_p_F18 = 2,
+        k_p_C12 = 3,
+        k_He4_O16 = 4,
+        k_He4_F17 = 5,
+        k_He4_N14 = 6,
+        k_p_F19 = 7,
+        k_p_C13 = 8,
+        k_He4_C12 = 9,
+        k_p_O17 = 10,
+        k_p_N15 = 11,
+        k_p_Ne20 = 12,
+        k_He4_Mg24 = 13,
+        k_C12_O16 = 14,
+        k_p_O18 = 15,
+        k_C12_C12 = 16,
+        k_He4_N15 = 17,
+        k_He4_Ne20 = 18,
+        k_p_N13 = 19,
+        k_He4_O14 = 20,
+        k_He4_He4 = 21,
+        k_He4_Be8 = 22,
+        k_p_O16 = 23,
+        k_p_N14 = 24,
+        k_p_F17 = 25,
+        k_He4_O15 = 26,
+        k_He4_N13 = 27,
+        NumScreenPairs = k_He4_N13
+    };
+
     // rate names -- note: the rates are 1-based, not zero-based, so we pad
     // this vector with rate_names[0] = "" so the indices line up with the
     // NetworkRates enum
@@ -368,6 +408,12 @@ namespace Rates
         "He4_Mg24_to_C12_O16_derived"  // 71,
     };
 
+    template<std::uint8_t rate>
+    AMREX_GPU_DEVICE AMREX_INLINE
+    constexpr amrex::Real get_p_random() {
+        return 0.0_rt;
+    }
+
 }
 
 #ifdef NSE_NET