All IPhreeqc checks passing on windows

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8564 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-03-17 22:34:03 +00:00
parent c843de8fb0
commit 78a273ebe2

View File

@ -300,24 +300,28 @@ tidy_model(void)
/*
* make sure essential species are defined
*/
if (new_model)
//if (new_model)
{
if (s_h2o == NULL)
{
input_error++;
error_msg("H2O not defined.", STOP);
//error_msg("H2O not defined.", STOP);
error_msg("H2O not defined.", CONTINUE);
}
if (s_h2o->primary == NULL)
else
{
input_error++;
error_msg("H2O, primary master species for O, not defined.",
CONTINUE);
}
if (s_h2o->secondary == NULL)
{
input_error++;
error_msg("H2O, secondary master species for O(-2), not defined.",
CONTINUE);
if (s_h2o->primary == NULL)
{
input_error++;
error_msg("H2O, primary master species for O, not defined.",
CONTINUE);
}
if (s_h2o->secondary == NULL)
{
input_error++;
error_msg("H2O, secondary master species for O(-2), not defined.",
CONTINUE);
}
}
if (s_hplus == NULL && s_h3oplus == NULL)
{