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

SOLUTION_MASTER_SPECIES was not defined correctly.

Browse Source 
Fixed Null pointer. 
Abort if input_error in build_model.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7500 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2013-02-28 17:22:51 +00:00
parent a2a1aafe9d
commit ebe3cbf710
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
prep.cpp
View File

@ -1209,6 +1209,7 @@ build_model(void)
/*
* Write mass action equation for current model
*/
//if (write_mass_action_eqn_x(STOP) == ERROR) continue;
write_mass_action_eqn_x(STOP);
if (s[i]->type == SURF)
{
@ -1402,6 +1403,11 @@ build_model(void)
* Save model description
*/
save_model();
if (input_error > 0)
{
error_msg("Stopping due to input errors.", STOP);
}
return (OK);
}
/* ---------------------------------------------------------------------- */
@ -2857,12 +2863,19 @@ write_mass_action_eqn_x(int stop)
count++;
if (count > MAX_ADD_EQUATIONS)
{
std::string name;
name = "Unknown";
if (trxn.token[0].s != NULL)
{
name = trxn.token[0].s->name;
}
input_error++;
error_string = sformatf( "Could not reduce equation "
"to primary and secondary species that are "
"in the model\n\t Species: %s.", trxn.token[0].s->name);
"in the model. Species: %s.", name.c_str());
if (stop == STOP)
{
input_error++;
error_msg(error_string, CONTINUE);
}
else
@ -4953,7 +4966,7 @@ store_dn(int k, LDBLE * source, int row, LDBLE coef_in, LDBLE * gamma_source)
{
output_msg(sformatf( "\t\t%s\n", master_ptr->s->name));
}
if (master_ptr->unknown == NULL)
if (master_ptr == NULL ||master_ptr->unknown == NULL)
continue;
col = master_ptr->unknown->number;
coef = coef_in * rxn_ptr->coef;
@ -5291,9 +5304,15 @@ write_mb_eqn_x(void)
count++;
if (count > MAX_ADD_EQUATIONS)
{
std::string name;
name = "Unknown";
if (trxn.token[0].s != NULL)
{
name = trxn.token[0].s->name;
}
error_string = sformatf( "Could not reduce equation "
"to primary and secondary species that are "
"in the model, %s.", trxn.token[0].s->name);
"in the model. Species: %s.", name.c_str());
error_msg(error_string, CONTINUE);
return (ERROR);
}