Merge branch 'development' into fix_integrator_rp

AMReX-Astro · Jul 21, 2024 · 937ae8d · 937ae8d
2 parents 09266d0 + 66beb70
commit 937ae8d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/integration/VODE/vode_dvhin.H b/integration/VODE/vode_dvhin.H
@@ -1,6 +1,8 @@
 #ifndef VODE_DVHIN_H
 #define VODE_DVHIN_H
 
+#include <AMReX_REAL.H>
+
 #ifdef STRANG
 #include <integrator_rhs_strang.H>
 #endif
@@ -23,7 +25,7 @@ void dvhin (BurnT& state, DvodeT& vstate, amrex::Real& H0, int& NITER, int& IER)
 
  constexpr int int_neqs = integrator_neqs<BurnT>();
 
- const amrex::Real PT1 = 0.1e0_rt;
+ constexpr amrex::Real PT1 = 0.1e0_rt;
 
  NITER = 0;
  const amrex::Real TDIST = std::abs(vstate.tout - vstate.t);

diff --git a/integration/VODE/vode_dvjac.H b/integration/VODE/vode_dvjac.H
@@ -116,7 +116,7 @@ void dvjac (int& IERPJ, BurnT& state, DvodeT& vstate)
  R0 = 1.0_rt;
  }
 
- const bool in_jacobian = true;
+ constexpr bool in_jacobian = true;
  for (int j = 1; j <= int_neqs; ++j) {
  const amrex::Real yj = vstate.y(j);
 

diff --git a/integration/VODE/vode_dvnlsd.H b/integration/VODE/vode_dvnlsd.H
@@ -20,11 +20,11 @@ amrex::Real dvnlsd (int& NFLAG, BurnT& state, DvodeT& vstate)
  // It then handles the corrector phase of this integration package.
 
  // Parameter declarations
- const amrex::Real CCMAX = 0.3e0_rt;
- const amrex::Real CRDOWN = 0.3e0_rt;
- const amrex::Real RDIV = 2.0e0_rt;
- const int MAXCOR = 3;
- const int MSBP = 20;
+ constexpr amrex::Real CCMAX = 0.3e0_rt;
+ constexpr amrex::Real CRDOWN = 0.3e0_rt;
+ constexpr amrex::Real RDIV = 2.0e0_rt;
+ constexpr int MAXCOR = 3;
+ constexpr int MSBP = 20;
 
  amrex::Real DEL{};
  int M{};

diff --git a/integration/VODE/vode_dvset.H b/integration/VODE/vode_dvset.H
@@ -20,7 +20,7 @@ void dvset (DvodeT& vstate)
  // H*xi(i) = t sub n - t sub (n-i)
  // = H + TAU(1) + TAU(2) + ... TAU(i-1).
 
- const amrex::Real CORTES = 0.1e0_rt;
+ constexpr amrex::Real CORTES = 0.1e0_rt;
 
  const amrex::Real FLOTL = vstate.L;
  const int NQM1 = vstate.NQ - 1;

diff --git a/integration/VODE/vode_dvstep.H b/integration/VODE/vode_dvstep.H
@@ -67,20 +67,20 @@ int dvstep (BurnT& state, DvodeT& vstate)
  // On a successful return, ETAMAX is reset and ACOR is scaled.
 
  // Parameter declarations
- const int KFC = -3;
- const int KFH = -7;
- const int MXNCF = 10;
- const amrex::Real ADDON = 1.0e-6_rt;
- const amrex::Real BIAS1 = 6.0e0_rt;
- const amrex::Real BIAS2 = 6.0e0_rt;
- const amrex::Real BIAS3 = 10.0e0_rt;
- const amrex::Real ETACF = 0.25e0_rt;
- const amrex::Real ETAMIN = 0.1e0_rt;
- const amrex::Real ETAMXF = 0.2e0_rt;
- const amrex::Real ETAMX2 = 10.0e0_rt;
- const amrex::Real ETAMX3 = 10.0e0_rt;
- const amrex::Real ONEPSM = 1.00001e0_rt;
- const amrex::Real THRESH = 1.5e0_rt;
+ constexpr int KFC = -3;
+ constexpr int KFH = -7;
+ constexpr int MXNCF = 10;
+ constexpr amrex::Real ADDON = 1.0e-6_rt;
+ constexpr amrex::Real BIAS1 = 6.0e0_rt;
+ constexpr amrex::Real BIAS2 = 6.0e0_rt;
+ constexpr amrex::Real BIAS3 = 10.0e0_rt;
+ constexpr amrex::Real ETACF = 0.25e0_rt;
+ constexpr amrex::Real ETAMIN = 0.1e0_rt;
+ constexpr amrex::Real ETAMXF = 0.2e0_rt;
+ constexpr amrex::Real ETAMX2 = 10.0e0_rt;
+ constexpr amrex::Real ETAMX3 = 10.0e0_rt;
+ constexpr amrex::Real ONEPSM = 1.00001e0_rt;
+ constexpr amrex::Real THRESH = 1.5e0_rt;
 
  amrex::Real CNQUOT{}, DDN{}, DSM{}, DUP{}, TOLD{};
  amrex::Real FLOTL{}, R{};