Move pivot into the VODE state

Author: maximumcats

integration/VODE/vode_dvjac.H

@@ -12,9 +12,9 @@
 #include <integrator_rhs_simplified_sdc.H>
 #endif
 
-template <typename IArray1D, typename BurnT, typename DvodeT>
+template <typename BurnT, typename DvodeT>
 AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
-void dvjac (IArray1D& pivot, int& IERPJ, BurnT& state, DvodeT& vstate)
+void dvjac (int& IERPJ, BurnT& state, DvodeT& vstate)
 {
     // dvjac is called by dvnlsd to compute and process the matrix
     // P = I - h*rl1*J , where J is an approximation to the Jacobian
@@ -169,11 +169,10 @@ void dvjac (IArray1D& pivot, int& IERPJ, BurnT& state, DvodeT& vstate)
     int IER;
 
 #ifdef NEW_NETWORK_IMPLEMENTATION
-    amrex::ignore_unused(pivot);
     RHS::dgefa(vstate.jac);
     IER = 0;
 #else
-    dgefa<int_neqs>(vstate.jac, pivot, IER);
+    dgefa<int_neqs>(vstate.jac, vstate.pivot, IER);
 #endif
 
     if (IER != 0) {

integration/VODE/vode_dvnlsd.H

@@ -7,9 +7,9 @@
 #endif
 #include <vode_dvjac.H>
 
-template <typename IArray1D, typename BurnT, typename DvodeT>
+template <typename BurnT, typename DvodeT>
 AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
-Real dvnlsd (IArray1D& pivot, int& NFLAG, BurnT& state, DvodeT& vstate)
+Real dvnlsd (int& NFLAG, BurnT& state, DvodeT& vstate)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();
 
@@ -76,7 +76,7 @@ Real dvnlsd (IArray1D& pivot, int& NFLAG, BurnT& state, DvodeT& vstate)
             // to 0 as an indicator that this has been done.
 
             int IERPJ;
-            dvjac(pivot, IERPJ, state, vstate);
+            dvjac(IERPJ, state, vstate);
             vstate.IPUP = 0;
             vstate.RC = 1.0_rt;
             vstate.DRC = 0.0_rt;
@@ -114,7 +114,7 @@ Real dvnlsd (IArray1D& pivot, int& NFLAG, BurnT& state, DvodeT& vstate)
 #ifdef NEW_NETWORK_IMPLEMENTATION
             RHS::dgesl(vstate.jac, vstate.y);
 #else
-            dgesl<int_neqs>(vstate.jac, pivot, vstate.y);
+            dgesl<int_neqs>(vstate.jac, vstate.pivot, vstate.y);
 #endif
 
             if (vstate.RC != 1.0_rt) {

integration/VODE/vode_dvstep.H

@@ -132,8 +132,6 @@ int dvstep (BurnT& state, DvodeT& vstate)
 
     }
 
-    Array1D<short, 1, int_neqs> pivot;
-
     // Compute the predicted values by effectively
     // multiplying the yh array by the Pascal triangle matrix.
     // dvset is called to calculate all integration coefficients.
@@ -174,7 +172,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
 
         // Call the nonlinear system solver.
 
-        Real ACNRM = dvnlsd(pivot, NFLAG, state, vstate);
+        Real ACNRM = dvnlsd(NFLAG, state, vstate);
 
         if (NFLAG != 0) {
 

integration/VODE/vode_type.H

@@ -159,6 +159,8 @@ struct dvode_t
 
     Array1D<Real, 1, int_neqs> ewt, savf;
 
+    Array1D<short, 1, int_neqs> pivot;
+
     // Array of size NEQ used for the accumulated corrections on each
     // step, scaled in the output to represent the estimated local
     // error in Y on the last step.  This is the vector e in the