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

fix: variable names in transport.cpp

Browse Source
This commit is contained in:
Max Lübke 2024-12-04 08:09:52 +00:00
parent 52f61f6db0
commit 163bb5ef7b
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phreeqcpp/basicsubs.cpp
View File

@ -382,7 +382,7 @@ LDBLE Phreeqc::calc_SC(void)
// B1 = relaxation, B2 = electrophoresis in ll = (ll0 - B2 * sqrt(mu) / f2(1
// + ka)) * (1 - B1 * sqrt(mu) / f1(1 + ka))
a = 1.60218e-19 * 1.60218e-19 / (6 * pi);
a = 1.60218e-19 * 1.60218e-19 / (6 * piConstant);
B1 = a / (2 * 8.8542e-12 * eps_r * 1.38066e-23 * tk_x) * q / (1 + sqrt_q) *
DH_B * 1e10 * z_plus * z_min; // DH_B is per Angstrom (*1e10)
B2 = a * AVOGADRO / viscos_0 * DH_B *

24
src/phreeqcpp/transport.cpp
View File

@ -2041,8 +2041,9 @@ int Phreeqc::fill_spec(int l_cell_no, int ref_cell)
//{
// error_string = sformatf(
// "Species in implicit diffusion in cell %d are %; different from
//previous cells with %d species.", l_cell_no, loc_spec_names.size(),
//dif_spec_names.size()); error_msg(error_string, CONTINUE);
// previous cells with %d species.", l_cell_no,
// loc_spec_names.size(), dif_spec_names.size()); error_msg(error_string,
// CONTINUE);
// }
}
if (implicit && l_cell_no /* && l_cell_no < count_cells + 2 */) {
@ -3498,17 +3499,18 @@ void Phreeqc::calc_b_ij(int icell, int jcell, int k, LDBLE b_i, LDBLE b_j,
// // for boundary cells...
// if (stagnant > 1)
// { /* for a diffusion experiment with well-mixed reservoir in cell 3 and
//the last stagnant cell, and with the mixf * 2 for the boundary cells in the
//input... */ if (icell == 3 && !g_i && g_j) ct[icell].v_m[k].b_ij = b_j *
//(free_j + g_j) / 2; else if (jcell == all_cells - 1 && !g_j && g_i)
// ct[icell].v_m[k].b_ij = b_i * (free_i + g_i) / 2;
// the last stagnant cell, and with the mixf * 2 for the
// boundary cells in the input... */ if (icell == 3 && !g_i && g_j)
// ct[icell].v_m[k].b_ij = b_j * (free_j + g_j) / 2; else if (jcell
//== all_cells - 1 && !g_j && g_i) ct[icell].v_m[k].b_ij = b_i * (free_i + g_i)
/// 2;
// }
// else
// {
// if (icell == 0 || (icell == count_cells + 1 && jcell ==
//count_cells + count_cells + 1)) ct[icell].v_m[k].b_ij = b_j * (free_j + g_j);
// else if (icell == count_cells && jcell == count_cells + 1)
// ct[icell].v_m[k].b_ij = b_i * (free_i + g_i);
// count_cells + count_cells + 1)) ct[icell].v_m[k].b_ij =
// b_j * (free_j + g_j); else if (icell == count_cells && jcell == count_cells +
//1) ct[icell].v_m[k].b_ij = b_i * (free_i + g_i);
// }
// if (ct[icell].v_m[k].z)
// ct[icell].Dz2c += ct[icell].v_m[k].b_ij * ct[icell].v_m[k].zc *
@ -4072,7 +4074,7 @@ LDBLE Phreeqc::find_J(int icell, int jcell, LDBLE mixf, LDBLE DDt, int stagnant)
b_j *= sol_D[icell].spec[i].Dw * dum2;
}
if (sol_D[icell].spec[i].dw_a_v_dif)
b_j *= pow(sol_D[jcell].viscos_f / sol_D[icell].viscos_f,
b_j *= pow(sol_D[jcell].viscos_0 / sol_D[icell].viscos_0,
sol_D[icell].spec[i].dw_a_v_dif);
calc_b_ij(icell, jcell, k, b_i, b_j, g_i, g_j, f_free_i, f_free_j,
stagnant);
@ -4181,7 +4183,7 @@ LDBLE Phreeqc::find_J(int icell, int jcell, LDBLE mixf, LDBLE DDt, int stagnant)
b_i *= sol_D[jcell].spec[j].Dw * dum2;
}
if (sol_D[icell].spec[i].dw_a_v_dif)
b_i *= pow(sol_D[icell].viscos_f / sol_D[jcell].viscos_f,
b_i *= pow(sol_D[icell].viscos_0 / sol_D[jcell].viscos_0,
sol_D[icell].spec[i].dw_a_v_dif);
calc_b_ij(icell, jcell, k, b_i, b_j, g_i, g_j, f_free_i, f_free_j,