Skip to content

Commit a3ee232

Browse files
zingalezingale
authored
scope some variables in VODE (#1907)
1 parent f2760cf commit a3ee232

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

‎integration/VODE/vode_dvjust.H‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void dvjust (int IORD, BurnT& state, DvodeT& vstate)
2424
const int NQM1 = vstate.NQ - 1;
2525
const int NQM2 = vstate.NQ - 2;
2626

27-
amrex::Real HSUM{}, XI{}, ALPH0{}, ALPH1{}, PROD{}, XIOLD{}, T1{};
27+
amrex::Real XI{};
2828

2929
// Check to see if the order is being increased or decreased.
3030

@@ -35,7 +35,7 @@ void dvjust (int IORD, BurnT& state, DvodeT& vstate)
3535
vstate.el(j) = 0.0_rt;
3636
}
3737
vstate.el(3) = 1.0_rt;
38-
HSUM = 0.0_rt;
38+
amrex::Real HSUM = 0.0_rt;
3939
for (int j = 1; j <= NQM2; ++j) {
4040
// Construct coefficients of x*x*(x+xi(1))*...*(x+xi(j)).
4141
HSUM += vstate.tau(j);
@@ -62,11 +62,11 @@ void dvjust (int IORD, BurnT& state, DvodeT& vstate)
6262
}
6363

6464
vstate.el(3) = 1.0_rt;
65-
ALPH0 = -1.0_rt;
66-
ALPH1 = 1.0_rt;
67-
PROD = 1.0_rt;
68-
XIOLD = 1.0_rt;
69-
HSUM = vstate.HSCAL;
65+
amrex::Real ALPH0 = -1.0_rt;
66+
amrex::Real ALPH1 = 1.0_rt;
67+
amrex::Real PROD = 1.0_rt;
68+
amrex::Real XIOLD = 1.0_rt;
69+
amrex::Real HSUM = vstate.HSCAL;
7070

7171
if (vstate.NQ != 1) {
7272
for (int j = 1; j <= NQM1; ++j) {
@@ -84,7 +84,7 @@ void dvjust (int IORD, BurnT& state, DvodeT& vstate)
8484
}
8585
}
8686

87-
T1 = (-ALPH0 - ALPH1) / PROD;
87+
amrex::Real T1 = (-ALPH0 - ALPH1) / PROD;
8888
// Load column L + 1 in YH array.
8989
for (int i = 1; i <= int_neqs; ++i) {
9090
vstate.yh(i,vstate.L+1) = T1 * vstate.yh(i,VODE_LMAX);

‎integration/VODE/vode_dvstep.H‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@ int dvstep (BurnT& state, DvodeT& vstate)
8282
constexpr amrex::Real ONEPSM = 1.00001e0_rt;
8383
constexpr amrex::Real THRESH = 1.5e0_rt;
8484

85-
amrex::Real CNQUOT{}, DDN{}, DSM{}, DUP{}, TOLD{};
86-
amrex::Real FLOTL{}, R{};
85+
amrex::Real DSM{};
8786
int NCF{}, NFLAG{};
8887

8988
constexpr int int_neqs = integrator_neqs<BurnT>();
9089

9190
int kflag = 0;
92-
TOLD = vstate.tn;
91+
amrex::Real TOLD = vstate.tn;
9392
NCF = 0;
9493
vstate.JCUR = 0;
9594
NFLAG = 0;
@@ -117,7 +116,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
117116

118117
// Rescale the history array for a change in H by a factor of ETA.
119118

120-
R = 1.0_rt;
119+
amrex::Real R = 1.0_rt;
121120

122121
for (int j = 2; j <= vstate.L; ++j) {
123122
R *= vstate.ETA;
@@ -201,7 +200,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
201200
vstate.ETA = amrex::max(vstate.ETA, HMIN / std::abs(vstate.H));
202201

203202
// Rescale the history array for a change in H by a factor of ETA.
204-
R = 1.0_rt;
203+
amrex::Real R = 1.0_rt;
205204

206205
for (int j = 2; j <= vstate.L; ++j) {
207206
R *= vstate.ETA;
@@ -357,7 +356,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
357356
vstate.ETAMAX = ETAMX2;
358357
}
359358

360-
R = 1.0_rt / vstate.tq(2);
359+
amrex::Real R = 1.0_rt / vstate.tq(2);
361360
for (int i = 1; i <= int_neqs; ++i) {
362361
vstate.acor(i) *= R;
363362
}
@@ -389,15 +388,15 @@ int dvstep (BurnT& state, DvodeT& vstate)
389388
if (kflag > KFC) {
390389

391390
// Compute ratio of new H to current H at the current order.
392-
FLOTL = vstate.L;
391+
amrex::Real FLOTL = vstate.L;
393392
vstate.ETA = 1.0_rt / (std::pow(BIAS2 * DSM, 1.0_rt / FLOTL) + ADDON);
394393
vstate.ETA = amrex::max(vstate.ETA, HMIN / std::abs(vstate.H), ETAMIN);
395394
if ((kflag <= -2) && (vstate.ETA > ETAMXF)) {
396395
vstate.ETA = ETAMXF;
397396
}
398397

399398
// Rescale the history array for a change in H by a factor of ETA.
400-
R = 1.0_rt;
399+
amrex::Real R = 1.0_rt;
401400

402401
for (int j = 2; j <= vstate.L; ++j) {
403402
R *= vstate.ETA;
@@ -434,7 +433,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
434433
vstate.NQWAIT = vstate.L;
435434

436435
// Rescale the history array for a change in H by a factor of ETA.
437-
R = 1.0_rt;
436+
amrex::Real R = 1.0_rt;
438437

439438
for (int j = 2; j <= vstate.L; ++j) {
440439
R *= vstate.ETA;
@@ -477,7 +476,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
477476
bool already_set_eta = false;
478477

479478
// Compute ratio of new H to current H at the current order.
480-
FLOTL = vstate.L;
479+
amrex::Real FLOTL = vstate.L;
481480
const amrex::Real ETAQ = 1.0_rt / (std::pow(BIAS2 * DSM, 1.0_rt / FLOTL) + ADDON);
482481
if (vstate.NQWAIT == 0) {
483482
vstate.NQWAIT = 2;
@@ -486,7 +485,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
486485

487486
if (vstate.NQ != 1) {
488487
// Compute ratio of new H to current H at the current order less one.
489-
DDN = 0.0_rt;
488+
amrex::Real DDN = 0.0_rt;
490489
for (int i = 1; i <= int_neqs; ++i) {
491490
DDN += (vstate.yh(i,vstate.L) * vstate.ewt(i)) * (vstate.yh(i,vstate.L) * vstate.ewt(i));
492491
}
@@ -498,11 +497,11 @@ int dvstep (BurnT& state, DvodeT& vstate)
498497

499498
if (vstate.L != VODE_LMAX) {
500499
// Compute ratio of new H to current H at current order plus one.
501-
CNQUOT = (vstate.tq(5) / vstate.CONP) * std::pow(vstate.H / vstate.tau(2), vstate.L);
500+
amrex::Real CNQUOT = (vstate.tq(5) / vstate.CONP) * std::pow(vstate.H / vstate.tau(2), vstate.L);
502501
for (int i = 1; i <= int_neqs; ++i) {
503502
vstate.savf(i) = vstate.acor(i) - CNQUOT * vstate.yh(i,VODE_LMAX);
504503
}
505-
DUP = 0.0_rt;
504+
amrex::Real DUP = 0.0_rt;
506505
for (int i = 1; i <= int_neqs; ++i) {
507506
DUP += (vstate.savf(i) * vstate.ewt(i)) * (vstate.savf(i) * vstate.ewt(i));
508507
}
@@ -547,7 +546,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
547546
if (vstate.n_step <= 10) {
548547
vstate.ETAMAX = ETAMX2;
549548
}
550-
R = 1.0_rt / vstate.tq(2);
549+
amrex::Real R = 1.0_rt / vstate.tq(2);
551550
for (int i = 1; i <= int_neqs; ++i) {
552551
vstate.acor(i) *= R;
553552
}
@@ -561,7 +560,7 @@ int dvstep (BurnT& state, DvodeT& vstate)
561560
if (vstate.n_step <= 10) {
562561
vstate.ETAMAX = ETAMX2;
563562
}
564-
R = 1.0_rt / vstate.tq(2);
563+
amrex::Real R = 1.0_rt / vstate.tq(2);
565564
for (int i = 1; i <= int_neqs; ++i) {
566565
vstate.acor(i) *= R;
567566
}

0 commit comments

Comments
 (0)