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

Squashed 'src/' changes from e8c03d16..478318af

Browse Source 
478318af Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8'
f100f492 Squashed 'phreeqcpp/' changes from 89d028d..0243c90

git-subtree-dir: src
git-subtree-split: 478318affeece3b1026a8c6a9d44264d61766bfa
This commit is contained in:
Darth Vader 2024-04-18 21:18:01 +00:00
parent 1d8783186c
commit 799a4e7ee4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phreeqcpp/integrate.cpp
View File

@ -1115,7 +1115,7 @@ calc_psi_avg(cxxSurfaceCharge *charge_ptr, LDBLE surf_chrg_eq, LDBLE nDbl, LDBLE
{ {
if (!surf_ptr->Donnan_factors.empty()) if (!surf_ptr->Donnan_factors.empty())
{ {
std::copy(std::begin(surf_ptr->Donnan_factors), std::end(surf_ptr->Donnan_factors), cgc); std::copy(surf_ptr->Donnan_factors.begin(), surf_ptr->Donnan_factors.end(), cgc);
z1 = cgc[0]; z1 = cgc[0];
z2 = cgc[1]; z2 = cgc[1];
z_1 = cgc[2]; z_1 = cgc[2];

12
phreeqcpp/transport.cpp
View File

@ -6089,8 +6089,8 @@ viscosity(cxxSurface *surf_ptr)
s_charge_p = surf_ptr->Get_surface_charges()[i1]; s_charge_p = surf_ptr->Get_surface_charges()[i1];
l_water = s_charge_p.Get_mass_water(); l_water = s_charge_p.Get_mass_water();
z_g_map.insert(s_charge_p.Get_z_gMCD_map().begin(), s_charge_p.Get_z_gMCD_map().end()); z_g_map.insert(s_charge_p.Get_z_gMCD_map().begin(), s_charge_p.Get_z_gMCD_map().end());
for (auto& x : z_g_map) for (std::map<double, double>::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x)
x.second *= ratio_surf_aq; x->second *= ratio_surf_aq;
} }
else else
{ {
@ -6099,11 +6099,11 @@ viscosity(cxxSurface *surf_ptr)
for (i = 1; i < i1_last - 1; i++) for (i = 1; i < i1_last - 1; i++)
{ {
s_charge_p = surf_ptr->Get_surface_charges()[i]; s_charge_p = surf_ptr->Get_surface_charges()[i];
for (auto& x : z_g_map) for (std::map<double, double>::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x)
x.second += s_charge_p.Get_z_gMCD_map()[x.first]; x->second += s_charge_p.Get_z_gMCD_map()[x->first];
} }
for (auto& x : z_g_map) for (std::map<double, double>::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x)
x.second *= ratio_surf_aq; x->second *= ratio_surf_aq;
l_water = mass_water_surfaces_x; l_water = mass_water_surfaces_x;
} }
l_mu_x = eq_plus = eq_min = 0; l_mu_x = eq_plus = eq_min = 0;