Merge commit '97b9c5848ee2b8ae6413ffa09e0b79be7d739ef8'

This commit is contained in:
Scott R Charlton 2019-11-19 14:19:21 -07:00
commit fd242bd33f

View File

@ -3589,7 +3589,8 @@ CVsldet(CVodeMem cv_mem)
realtype rr, rrcut, vrrtol, vrrt2, sqtol, rrtol; realtype rr, rrcut, vrrtol, vrrt2, sqtol, rrtol;
realtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr; realtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr;
realtype /*small_cvode,*/ tem, sqmax, saqk, qp, s, sqmaxk, saqj, sqmin; realtype /*small_cvode,*/ tem, sqmax, saqk, qp, s, sqmaxk, saqj, sqmin;
realtype rsa, rsb, rsc, rsd, rse, rd1a, rd1b, rd1c, rd1d; //realtype rsa, rsb, rsc, rsd, rse, rd1a, rd1b, rd1c, rd1d;
realtype rsa, rsb, rsc, rsd, rse, rd1a, rd1b, rd1c;
//realtype rd2a, rd2b, rd2c, rd3a, rd3b, cest1, corr1; //realtype rd2a, rd2b, rd2c, rd3a, rd3b, cest1, corr1;
realtype rd2a, rd2b, rd3a, cest1, corr1; realtype rd2a, rd2b, rd3a, cest1, corr1;
realtype ratp, ratm, qfac1, qfac2, bb, rrb; realtype ratp, ratm, qfac1, qfac2, bb, rrb;
@ -3850,7 +3851,7 @@ CVsldet(CVodeMem cv_mem)
rd1a = rsa - rsb; rd1a = rsa - rsb;
rd1b = rsb - rsc; rd1b = rsb - rsc;
rd1c = rsc - rsd; rd1c = rsc - rsd;
rd1d = rsd - rse; //rd1d = rsd - rse;
rd2a = rd1a - rd1b; rd2a = rd1a - rd1b;
rd2b = rd1b - rd1c; rd2b = rd1b - rd1c;
//rd2c = rd1c - rd1d; //rd2c = rd1c - rd1d;