mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 16:44:49 +01:00
put back piece in molalities that was necessary after all
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7720 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
ba25fabd68
commit
96285f2250
22
model.cpp
22
model.cpp
@ -2290,18 +2290,18 @@ molalities(int allow_overflow)
|
||||
else
|
||||
{
|
||||
s_x[i]->moles = under(s_x[i]->lm) * mass_water_aq_x;
|
||||
//if (s_x[i]->moles / mass_water_aq_x > 100)
|
||||
//{
|
||||
// log_msg(sformatf( "Overflow: %s\t%e\t%e\t%d\n",
|
||||
// s_x[i]->name,
|
||||
// (double) (s_x[i]->moles / mass_water_aq_x),
|
||||
// (double) s_x[i]->lm, iterations));
|
||||
if (s_x[i]->moles / mass_water_aq_x > 100)
|
||||
{
|
||||
log_msg(sformatf( "Overflow: %s\t%e\t%e\t%d\n",
|
||||
s_x[i]->name,
|
||||
(double) (s_x[i]->moles / mass_water_aq_x),
|
||||
(double) s_x[i]->lm, iterations));
|
||||
|
||||
// if (iterations >= 0 && allow_overflow == FALSE)
|
||||
// {
|
||||
// return (ERROR);
|
||||
// }
|
||||
//}
|
||||
if (iterations >= 0 && allow_overflow == FALSE)
|
||||
{
|
||||
return (ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user