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

Merge commit 'b138ed208df65cd4653ea7a2e07332a3d3e1c8b2'

Browse Source
This commit is contained in:
Darth Vader 2020-08-20 02:38:58 +00:00
commit 75f4ab0ba6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phreeqcpp/tidy.cpp
View File

@ -4414,7 +4414,7 @@ update_min_surface(void)
cxxSurfaceComp* surface_comp_ptr = &(surface_ptr->Get_surface_comps()[j]); cxxSurfaceComp* surface_comp_ptr = &(surface_ptr->Get_surface_comps()[j]);
if (surface_comp_ptr->Get_phase_name().size() == 0) continue; if (surface_comp_ptr->Get_phase_name().size() == 0) continue;
cxxSurfaceCharge* surface_charge_ptr = NULL; cxxSurfaceCharge* surface_charge_ptr = NULL;
if (surface_ptr->Get_type() != cxxSurface::SURFACE_TYPE::NO_EDL) if (surface_ptr->Get_type() != cxxSurface::NO_EDL)
{ {
surface_charge_ptr = surface_ptr->Find_charge(surface_comp_ptr->Get_charge_name()); surface_charge_ptr = surface_ptr->Find_charge(surface_comp_ptr->Get_charge_name());
if (surface_charge_ptr == NULL) if (surface_charge_ptr == NULL)
@ -4913,7 +4913,7 @@ update_kin_surface(void)
/* use database name for rate */ /* use database name for rate */
comp_ptr->Set_rate_name(kin_comp_ptr->Get_rate_name().c_str()); comp_ptr->Set_rate_name(kin_comp_ptr->Get_rate_name().c_str());
cxxSurfaceCharge* charge_ptr = surface_ptr->Find_charge(comp_ptr->Get_charge_name()); cxxSurfaceCharge* charge_ptr = surface_ptr->Find_charge(comp_ptr->Get_charge_name());
if (surface_ptr->Get_type() != cxxSurface::SURFACE_TYPE::NO_EDL) if (surface_ptr->Get_type() != cxxSurface::NO_EDL)
{ {
charge_ptr = surface_ptr->Find_charge(comp_ptr->Get_charge_name()); charge_ptr = surface_ptr->Find_charge(comp_ptr->Get_charge_name());
if (charge_ptr == NULL) if (charge_ptr == NULL)