Skip to content

Commit

Permalink
Updated to build in vs2005
Browse files Browse the repository at this point in the history
  • Loading branch information
scharlton2 committed Apr 18, 2024
1 parent d2cb6ab commit 12c7dae
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/integrate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ calc_psi_avg(cxxSurfaceCharge *charge_ptr, LDBLE surf_chrg_eq, LDBLE nDbl, LDBLE
{
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];
z2 = cgc[1];
z_1 = cgc[2];
Expand Down
12 changes: 6 additions & 6 deletions src/transport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6089,8 +6089,8 @@ viscosity(cxxSurface *surf_ptr)
s_charge_p = surf_ptr->Get_surface_charges()[i1];
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());
for (auto& x : z_g_map)
x.second *= ratio_surf_aq;
for (std::map<double, double>::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x)
x->second *= ratio_surf_aq;
}
else
{
Expand All @@ -6099,11 +6099,11 @@ viscosity(cxxSurface *surf_ptr)
for (i = 1; i < i1_last - 1; i++)
{
s_charge_p = surf_ptr->Get_surface_charges()[i];
for (auto& x : z_g_map)
x.second += s_charge_p.Get_z_gMCD_map()[x.first];
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];
}
for (auto& x : z_g_map)
x.second *= ratio_surf_aq;
for (std::map<double, double>::iterator x = z_g_map.begin(); x != z_g_map.end(); ++x)
x->second *= ratio_surf_aq;
l_water = mass_water_surfaces_x;
}
l_mu_x = eq_plus = eq_min = 0;
Expand Down

0 comments on commit 12c7dae

Please # to comment.