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

CCM only for NO_DL (not donnan or diffuse_layer).

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9338 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-03-09 19:00:17 +00:00
parent 6309425ae9
commit eafa16d0f1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tidy.cpp
View File

@ -3048,6 +3048,17 @@ tidy_surface(void)
}
//if (!kit->second.Get_new_def()) continue;
surface_ptr = &(kit->second);
// ccm incompatible with Donnan or diffuse_layer
if (surface_ptr->Get_type() == cxxSurface::CCM)
{
if (surface_ptr->Get_dl_type() == cxxSurface::BORKOVEK_DL || surface_ptr->Get_dl_type() == cxxSurface::DONNAN_DL)
{
input_error++;
error_string = "Cannot use -diffuse_layer or -donnan calculation with Constant Capacity Model.";
error_msg(error_string, CONTINUE);
continue;
}
}
for (size_t i = 0; i < surface_ptr->Get_surface_comps().size(); i++)
{
cxxSurfaceComp *comp_ptr = &(surface_ptr->Get_surface_comps()[i]);