diff --git a/cvode.cpp b/cvode.cpp index 5214c750..b81ac8d0 100644 --- a/cvode.cpp +++ b/cvode.cpp @@ -406,8 +406,9 @@ static realtype CVYddNorm(CVodeMem cv_mem, realtype hg); static int CVStep(CVodeMem cv_mem); +#ifdef ORIGINAL_CVBDFStab static int CVsldet(CVodeMem cv_mem); - +#endif static void CVAdjustParams(CVodeMem cv_mem); static void CVAdjustOrder(CVodeMem cv_mem, int deltaq); static void CVAdjustAdams(CVodeMem cv_mem, int deltaq); @@ -3407,7 +3408,7 @@ CVHandleFailure(CVodeMem cv_mem, int kflag) size is reset accordingly. *****************************************************************/ -#ifdef ORIGINAL +#ifdef ORIGINAL_CVBDFStab void CVBDFStab(CVodeMem cv_mem) { @@ -3580,6 +3581,7 @@ CVBDFStab(CVodeMem cv_mem) ********************************************************************/ +#ifdef ORIGINAL_CVBDFStab static int CVsldet(CVodeMem cv_mem) { @@ -3590,7 +3592,7 @@ CVsldet(CVodeMem cv_mem) realtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr; 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; + realtype rsa, rsb, rsc, rsd, rd1a, rd1b, rd1c; //realtype rd2a, rd2b, rd2c, rd3a, rd3b, cest1, corr1; realtype rd2a, rd2b, rd3a, cest1, corr1; realtype ratp, ratm, qfac1, qfac2, bb, rrb; @@ -3847,7 +3849,7 @@ CVsldet(CVodeMem cv_mem) rsb = ssdat[2][k] * rr; rsc = ssdat[3][k] * rr * rr; rsd = ssdat[4][k] * rr * rr * rr; - rse = ssdat[5][k] * rr * rr * rr * rr; + //rse = ssdat[5][k] * rr * rr * rr * rr; rd1a = rsa - rsb; rd1b = rsb - rsc; rd1c = rsc - rsd; @@ -3918,7 +3920,7 @@ CVsldet(CVodeMem cv_mem) return (kflag); } - +#endif /*******************************************************************/ /********* END Private Helper Functions Implementation *************/ diff --git a/transport.cpp b/transport.cpp index c4a81114..c03380c7 100644 --- a/transport.cpp +++ b/transport.cpp @@ -2191,7 +2191,7 @@ diffuse_implicit(LDBLE DDt, int stagnant) int ifirst, ilast; 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, b, grad, dVc, j_0e, min_dif_M = pow(10, min_dif_LM); + double mfr, mfr1, grad, dVc, j_0e, min_dif_M = pow(10, min_dif_LM); LDBLE dum1, dum2, dum_stag = 0.0, min_mol; LDBLE dum = 0; @@ -2309,7 +2309,7 @@ diffuse_implicit(LDBLE DDt, int stagnant) if (i == 0 && (sptr1 = Utilities::Rxn_find(Rxn_solution_map, c2)) != NULL) { // the 1st boundary solution diffuses into 1st stagnant cell (=c2) by the ratio immobile_kgw in cell c2 / mobile_kgw in cell 1 - b = find_J(0, 1, 1, 1, 0); + find_J(0, 1, 1, 1, 0); ct[c2].kgw = sptr1->Get_mass_water(); for (cp = 0; cp < comp; cp++) { @@ -2323,7 +2323,7 @@ diffuse_implicit(LDBLE DDt, int stagnant) else if (i == c1 && (sptr1 = Utilities::Rxn_find(Rxn_solution_map, cc1)) != NULL) { // the end boundary solution diffuses into stagnant cell cc1 - b = find_J(c, c1, 1, 1, 0); + find_J(c, c1, 1, 1, 0); ct[cc1].kgw = sptr1->Get_mass_water(); for (cp = 0; cp < comp; cp++) { @@ -2336,7 +2336,7 @@ diffuse_implicit(LDBLE DDt, int stagnant) } if (i1) { - b = find_J(i, i1, 1, 1, 1); + find_J(i, i1, 1, 1, 1); } } else @@ -2347,7 +2347,7 @@ diffuse_implicit(LDBLE DDt, int stagnant) if (n_solution[i1] > count_cells && n_solution[i1] <= cc1) { mfr = fraction[i1] / nmix; - b = find_J(i, n_solution[i1], mfr, 1, 1); + find_J(i, n_solution[i1], mfr, 1, 1); mfr *= (2.0 / dummy); for (cp = 0; cp < comp; cp++) { @@ -2361,7 +2361,7 @@ diffuse_implicit(LDBLE DDt, int stagnant) } } if (i <= count_cells) - b = find_J(i, i + 1, 1, 1, 0); + find_J(i, i + 1, 1, 1, 0); } if (dV_dcell) find_current = 0;