max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3049467b561ef8176c81341b76b883b2179380f2'

Browse Source
This commit is contained in:
Scott R Charlton 2019-11-19 12:41:28 -07:00
commit 1ab3235e68
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phreeqcpp/cvode.cpp
View File

@ -3591,7 +3591,7 @@ CVsldet(CVodeMem cv_mem)
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 rd2a, rd2b, rd2c, rd3a, rd3b, cest1, corr1; //realtype rd2a, rd2b, rd2c, rd3a, rd3b, cest1, corr1;
realtype rd2a, rd2b, rd2c, rd3a, cest1, corr1; realtype rd2a, rd2b, rd3a, cest1, corr1;
realtype ratp, ratm, qfac1, qfac2, bb, rrb; realtype ratp, ratm, qfac1, qfac2, bb, rrb;
/* The following are cutoffs and tolerances used by this routine */ /* The following are cutoffs and tolerances used by this routine */
@ -3853,7 +3853,7 @@ CVsldet(CVodeMem cv_mem)
rd1d = rsd - rse; rd1d = rsd - rse;
rd2a = rd1a - rd1b; rd2a = rd1a - rd1b;
rd2b = rd1b - rd1c; rd2b = rd1b - rd1c;
rd2c = rd1c - rd1d; //rd2c = rd1c - rd1d;
rd3a = rd2a - rd2b; rd3a = rd2a - rd2b;
//rd3b = rd2b - rd2c; //rd3b = rd2b - rd2c;
/* rd3b = rd3b; */ /* rd3b = rd3b; */

4
phreeqcpp/model.cpp
View File

@ -3023,7 +3023,7 @@ ss_binary(cxxSS *ss_ptr)
{ {
LDBLE nb, nc, n_tot, xb, xc, dnb, dnc, l_a0, l_a1; LDBLE nb, nc, n_tot, xb, xc, dnb, dnc, l_a0, l_a1;
//LDBLE xb2, xb3, xb4, xc2, xc3; //LDBLE xb2, xb3, xb4, xc2, xc3;
LDBLE xb2, xb3, xc2; LDBLE xb2, xc2;
LDBLE xb1, xc1; LDBLE xb1, xc1;
/* /*
* component 0 is major component * component 0 is major component
@ -3112,7 +3112,7 @@ ss_binary(cxxSS *ss_ptr)
xc2 = xc * xc; xc2 = xc * xc;
//xc3 = xc2 * xc; //xc3 = xc2 * xc;
xb2 = xb * xb; xb2 = xb * xb;
xb3 = xb2 * xb; //xb3 = xb2 * xb;
//xb4 = xb3 * xb; //xb4 = xb3 * xb;
/* xb4 = xb4; */ /* xb4 = xb4; */
/* xc3 = xc3; */ /* xc3 = xc3; */

5
phreeqcpp/transport.cpp
View File

@ -2190,11 +2190,12 @@ diffuse_implicit(LDBLE DDt, int stagnant)
// ifirst = (bcon_first == 2 ? 1 : 0); ilast = (bcon_last == 2 ? count_cells - 1 : count_cells); // ifirst = (bcon_first == 2 ? 1 : 0); ilast = (bcon_last == 2 ? count_cells - 1 : count_cells);
int ifirst, ilast; int ifirst, ilast;
int i_1, i0, i1, i2 = 0; int i_1, i0, i1, i2 = 0;
double mfr, mfr1, max_b = 0, b, grad, dVc, j_0e, min_dif_M = pow(10, min_dif_LM); //double mfr, mfr1, max_b = 0, b, grad, dVc, j_0e, min_dif_M = pow(10, min_dif_LM);
double mfr, mfr1, b, grad, dVc, j_0e, min_dif_M = pow(10, min_dif_LM);
LDBLE dum1, dum2, dum_stag = 0.0, min_mol; LDBLE dum1, dum2, dum_stag = 0.0, min_mol;
LDBLE dum = 0; LDBLE dum = 0;
cxxSurfaceCharge * charge_ptr = NULL; //cxxSurfaceCharge * charge_ptr = NULL;
if (stagnant > 1) if (stagnant > 1)
stagnant = 0; stagnant = 0;
cxxSolution *sptr1, *sptr2, *sptr_stag; cxxSolution *sptr1, *sptr2, *sptr_stag;