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

Compiles all configurations of phreeqcpp.vcproj

Browse Source 
Does not use callbacks.

Uses phrq_io instance of PHRQ_io.

I am sure it will not compile as plain phreeqc without modification.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5640 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-09-22 00:08:29 +00:00
parent 11da9fec8f
commit 50b369a294
9 changed files with 126 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ISolutionComp.h
View File

@ -6,6 +6,7 @@
#include <vector>
#include <set>
#include "Phreeqc_class.h"
#include "PHRQ_base.h"
// forward declarations
class cxxISolution; // reqd for read and dump_xml

14
PHRQ_base.cxx
View File

@ -1,6 +1,6 @@
#include "PHRQ_base.h"
#include <iostream>
#include "PHRQ_io.h"
PHRQ_base::
PHRQ_base(void)
{
@ -21,18 +21,23 @@ PHRQ_base::
}
void PHRQ_base::
error_msg(const std::string & stdstr)
error_msg(const std::string & stdstr, int stop)
{
this->error_count++;
if (this->io)
{
//this->io->phreeqc_handler(ACTION_OUTPUT, OUTPUT_ERROR, stdstr, stop, "", args);
this->io->output_string(PHRQ_io::OUTPUT_ERROR, stdstr);
}
else
{
std::cerr << stdstr << std::endl;
std::cout << stdstr << std::endl;
}
if (stop == 0)
{
throw "PHRQ_base error message";
}
}
void PHRQ_base::
@ -41,6 +46,7 @@ warning_msg(const std::string & stdstr)
if (this->io)
{
//this->io->phreeqc_handler(ACTION_OUTPUT, OUTPUT_WARNING, stdstr, stop, "", args);
this->io->output_string(PHRQ_io::OUTPUT_WARNING, stdstr);
}
else
{
@ -52,9 +58,11 @@ warning_msg(const std::string & stdstr)
void PHRQ_base::
output_msg(const std::string & stdstr)
{
bool stop = false;
if (this->io)
{
//this->io->phreeqc_handler(ACTION_OUTPUT, OUTPUT_MESSAGE, stdstr, stop, "", args);
//this->io->phreeqc_handler(PHRQ_io::ACTION_OUTPUT, PHRQ_io::OUTPUT_MESSAGE, stdstr, stop, "");
this->io->output_string(PHRQ_io::OUTPUT_MESSAGE, stdstr);
}
else
{

2
PHRQ_base.h
View File

@ -15,7 +15,7 @@ public:
// methods
void output_msg(const std::string &);
void error_msg(const std::string &);
void error_msg(const std::string &, int stop=0);
void warning_msg(const std::string &);
void Set_io(PHRQ_io * p_io)

5
PHRQ_io.cpp
View File

@ -346,10 +346,15 @@ output_string(const int type, std::string str)
{
case OUTPUT_ERROR:
this->error_count++;
if (error_file != NULL && error_file_on)
{
fprintf(error_file, "%s", str.c_str());
}
if (output_file != NULL && output_file_on)
{
fprintf(output_file, "%s", str.c_str());
}
fflush(error_file);
break;

10
Parser.cxx
View File

@ -17,6 +17,7 @@
#endif
#include "Parser.h"
#include "output.h"
#include "PHRQ_io.h"
//extern char *string_hsave(const char *str);
@ -140,7 +141,8 @@ CParser::LINE_TYPE CParser::check_line(const std::string & str,
{
std::ostringstream msg;
msg << "\t" << m_line_save << "\n";
PHREEQC_COOKIE output_msg(PHREEQC_NAME_SPACE OUTPUT_MESSAGE, "%s", msg.str().c_str());
//PHREEQC_COOKIE output_msg(PHREEQC_NAME_SPACE OUTPUT_MESSAGE, "%s", msg.str().c_str());
this->Get_io()->output_string(PHRQ_io::OUTPUT_MESSAGE, msg.str());
}
break;
case EO_KEYWORDS:
@ -148,7 +150,8 @@ CParser::LINE_TYPE CParser::check_line(const std::string & str,
{
std::ostringstream msg;
msg << "\t" << m_line_save << "\n";
PHREEQC_COOKIE output_msg(PHREEQC_NAME_SPACE OUTPUT_MESSAGE, "%s", msg.str().c_str());
//PHREEQC_COOKIE output_msg(PHREEQC_NAME_SPACE OUTPUT_MESSAGE, "%s", msg.str().c_str());
this->Get_io()->output_string(PHRQ_io::OUTPUT_MESSAGE, msg.str());
}
break;
@ -157,7 +160,8 @@ CParser::LINE_TYPE CParser::check_line(const std::string & str,
{
std::ostringstream msg;
msg << "\t" << m_line_save << "\n";
PHREEQC_COOKIE output_msg(PHREEQC_NAME_SPACE OUTPUT_MESSAGE, "%s", msg.str().c_str());
//PHREEQC_COOKIE output_msg(PHREEQC_NAME_SPACE OUTPUT_MESSAGE, "%s", msg.str().c_str());
this->Get_io()->output_string(PHRQ_io::OUTPUT_MESSAGE, msg.str());
}
break;
}

76
Phreeqc.cpp
View File

@ -455,7 +455,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
// solutions
for (i = 0; i < count_solution; i++)
{
cxxSolution entity(solution[i], &this->phrq_io);
cxxSolution entity(solution[i], &phrq_io);
accumulator.add_extensive(entity.get_totals(), 1.0);
}
@ -470,7 +470,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
// pure phases
for (i = 0; i < count_pp_assemblage; i++)
{
cxxPPassemblage entity(&pp_assemblage[i], &this->phrq_io);
cxxPPassemblage entity(&pp_assemblage[i], &phrq_io);
entity.totalize(this);
accumulator.add_extensive(entity.get_totals(), 1.0);
}
@ -478,7 +478,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
// exchangers
for (i = 0; i < count_exchange; i++)
{
cxxExchange entity(&exchange[i], &this->phrq_io);
cxxExchange entity(&exchange[i], &phrq_io);
entity.totalize();
accumulator.add_extensive(entity.get_totals(), 1.0);
}
@ -486,7 +486,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
// surfaces
for (i = 0; i < count_surface; i++)
{
cxxSurface entity(&surface[i], &this->phrq_io);
cxxSurface entity(&surface[i], &phrq_io);
entity.totalize();
accumulator.add_extensive(entity.get_totals(), 1.0);
}
@ -494,7 +494,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
// gas phases
for (i = 0; i < count_gas_phase; i++)
{
cxxGasPhase entity(&gas_phase[i], &this->phrq_io);
cxxGasPhase entity(&gas_phase[i], &phrq_io);
entity.totalize(this);
accumulator.add_extensive(entity.get_totals(), 1.0);
}
@ -511,7 +511,7 @@ size_t Phreeqc::list_components(std::list<std::string> &list_c)
for (i = 0; i < count_kinetics; i++)
{
calc_dummy_kinetic_reaction_tally(&kinetics[i]);
cxxKinetics entity(&kinetics[i], &this->phrq_io);
cxxKinetics entity(&kinetics[i], &phrq_io);
accumulator.add_extensive(entity.get_totals(), 1.0);
}
@ -1185,42 +1185,42 @@ void Phreeqc::init(void)
count_strings = 0;
#ifdef MULTICHART
chart_handler.Set_io(&this->phrq_io);
chart_handler.Set_io(&phrq_io);
#endif
run_info.Set_io(&this->phrq_io);
run_info.Set_io(&phrq_io);
this->clear_cookie();
return;
}
void * Phreeqc::get_cookie()
{
if (cookie_list.size() > 0)
{
return this->cookie_list.front();
}
else
{
return NULL;
}
}
void Phreeqc::set_cookie(std::istream * cookie)
{
this->cookie_list.push_front(cookie);
}
void Phreeqc::clear_cookie(void)
{
while (this->cookie_list.size() > 0)
{
this->pop_cookie();
}
}
void Phreeqc::pop_cookie()
{
if (cookie_list.size() > 0)
{
delete this->cookie_list.front();
this->cookie_list.pop_front();
}
}
//void * Phreeqc::get_cookie()
//{
// if (cookie_list.size() > 0)
// {
// return this->cookie_list.front();
// }
// else
// {
// return NULL;
// }
//}
//void Phreeqc::set_cookie(std::istream * cookie)
//{
// this->cookie_list.push_front(cookie);
//}
//void Phreeqc::clear_cookie(void)
//{
// while (this->cookie_list.size() > 0)
// {
// this->pop_cookie();
// }
//}
//void Phreeqc::pop_cookie()
//{
// if (cookie_list.size() > 0)
// {
// delete this->cookie_list.front();
// this->cookie_list.pop_front();
// }
//}

4
Phreeqc.h
View File

@ -253,7 +253,7 @@ int write_banner(void);
public:
int close_input_files(void);
int close_output_files(void);
CLASS_STATIC int getc_callback(void *cookie);
//CLASS_STATIC int getc_callback(void *cookie);
#if defined(MERGE_INCLUDE_FILES)
CLASS_STATIC int istream_getc(void *cookie);
#endif /* #if defined(MERGE_INCLUDE_FILES) */
@ -1404,7 +1404,7 @@ protected:
std::list <std::istream *> cookie_list;
std::ifstream * in_stream;
std::ifstream * db_stream;
PHRQ_io phrq_io;
};
#endif /* _INC_PHREEQC_H */

112
ReadClass.cxx
View File

@ -94,7 +94,7 @@ read_solution_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -110,7 +110,7 @@ read_solution_raw(void)
parser.get_option(vopts, next_char);
cxxSolution sol(&this->phrq_io);
cxxSolution sol(&phrq_io);
sol.read_raw(PHREEQC_THIS_COMMA parser);
struct solution *soln_ptr = sol.cxxSolution2solution(PHREEQC_THIS);
int n;
@ -187,7 +187,7 @@ read_exchange_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -202,7 +202,7 @@ read_exchange_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxExchange ex(&this->phrq_io);
cxxExchange ex(&phrq_io);
ex.read_raw(PHREEQC_THIS_COMMA parser);
struct exchange *exchange_ptr = ex.cxxExchange2exchange(PHREEQC_THIS);
int n;
@ -281,7 +281,7 @@ read_surface_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -296,7 +296,7 @@ read_surface_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxSurface ex(&this->phrq_io);
cxxSurface ex(&phrq_io);
ex.read_raw(PHREEQC_THIS_COMMA parser);
struct surface *surface_ptr = ex.cxxSurface2surface(PHREEQC_THIS);
int n;
@ -376,7 +376,7 @@ read_equilibrium_phases_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -391,7 +391,7 @@ read_equilibrium_phases_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxPPassemblage ex(&this->phrq_io);
cxxPPassemblage ex(&phrq_io);
ex.read_raw(PHREEQC_THIS_COMMA parser);
struct pp_assemblage *pp_assemblage_ptr = ex.cxxPPassemblage2pp_assemblage(PHREEQC_THIS);
int n;
@ -472,7 +472,7 @@ read_kinetics_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -487,7 +487,7 @@ read_kinetics_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxKinetics ex(&this->phrq_io);
cxxKinetics ex(&phrq_io);
ex.read_raw(PHREEQC_THIS_COMMA parser);
struct kinetics *kinetics_ptr = ex.cxxKinetics2kinetics(PHREEQC_THIS);
int n;
@ -567,7 +567,7 @@ read_solid_solutions_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -664,7 +664,7 @@ read_gas_phase_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -679,7 +679,7 @@ read_gas_phase_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxGasPhase ex(&this->phrq_io);
cxxGasPhase ex(&phrq_io);
ex.read_raw(PHREEQC_THIS_COMMA parser);
struct gas_phase *gas_phase_ptr = ex.cxxGasPhase2gas_phase(PHREEQC_THIS);
int n;
@ -758,7 +758,7 @@ read_reaction_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -853,7 +853,7 @@ read_mix_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
{
@ -868,7 +868,7 @@ read_mix_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxMix ex(&this->phrq_io);
cxxMix ex(&phrq_io);
ex.read_raw(parser);
struct mix *mix_ptr = ex.cxxMix2mix(PHREEQC_THIS);
int n;
@ -948,7 +948,7 @@ read_temperature_raw(void)
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
if (pr.echo_input == FALSE)
@ -964,7 +964,7 @@ read_temperature_raw(void)
std::istream::pos_type next_char;
parser.get_option(vopts, next_char);
cxxTemperature ex(&this->phrq_io);
cxxTemperature ex(&phrq_io);
ex.read_raw(parser);
struct temperature *temperature_ptr = ex.cxxTemperature2temperature(PHREEQC_THIS);
int n;
@ -1025,7 +1025,7 @@ read_dump(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1043,7 +1043,7 @@ read_dump(void)
parser.set_echo_file(CParser::EO_NOKEYWORDS);
}
dumper dmp(parser, &this->phrq_io);
dumper dmp(parser, &phrq_io);
dump_info = dmp;
@ -1077,7 +1077,7 @@ read_delete(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1095,7 +1095,7 @@ read_delete(void)
parser.set_echo_file(CParser::EO_NOKEYWORDS);
}
StorageBinList deleter(parser, &this->phrq_io);
StorageBinList deleter(parser, &phrq_io);
delete_info = deleter;
@ -1129,7 +1129,7 @@ read_run_cells(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1147,7 +1147,7 @@ read_run_cells(void)
parser.set_echo_file(CParser::EO_NOKEYWORDS);
}
runner r(parser, &this->phrq_io);
runner r(parser, &phrq_io);
run_info = r;
@ -1292,7 +1292,7 @@ read_solution_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1319,14 +1319,14 @@ read_solution_modify(void)
return (ERROR);
}
cxxSolution sol(solution[n], &this->phrq_io);
cxxSolution sol(solution[n], &phrq_io);
// Clear activities so we can know what was read
sol.clear_master_activity();
sol.read_raw(PHREEQC_THIS_COMMA parser, false);
cxxSolution orig(solution[n], &this->phrq_io );
cxxSolution orig(solution[n], &phrq_io );
sol.modify_activities(PHREEQC_THIS_COMMA orig);
@ -1390,7 +1390,7 @@ read_equilibrium_phases_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1417,7 +1417,7 @@ read_equilibrium_phases_modify(void)
}
// read entity
cxxPPassemblage entity(&(pp_assemblage[n]), &this->phrq_io);
cxxPPassemblage entity(&(pp_assemblage[n]), &phrq_io);
entity.read_raw(PHREEQC_THIS_COMMA parser, false);
// save entity
@ -1483,7 +1483,7 @@ read_exchange_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1510,7 +1510,7 @@ read_exchange_modify(void)
}
// read entity
cxxExchange entity(&(exchange[n]), &this->phrq_io);
cxxExchange entity(&(exchange[n]), &phrq_io);
entity.read_raw(PHREEQC_THIS_COMMA parser, false);
// save entity
@ -1591,7 +1591,7 @@ read_surface_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1618,7 +1618,7 @@ read_surface_modify(void)
}
// read entity
cxxSurface entity(&(surface[n]), &this->phrq_io);
cxxSurface entity(&(surface[n]), &phrq_io);
entity.read_raw(PHREEQC_THIS_COMMA parser, false);
// save entity
@ -1680,7 +1680,7 @@ read_solid_solutions_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1768,7 +1768,7 @@ read_gas_phase_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1795,7 +1795,7 @@ read_gas_phase_modify(void)
}
// read entity
cxxGasPhase entity(&(gas_phase[n]), &this->phrq_io);
cxxGasPhase entity(&(gas_phase[n]), &phrq_io);
entity.read_raw(PHREEQC_THIS_COMMA parser, false);
// save entity
struct gas_phase *entity_ptr = entity.cxxGasPhase2gas_phase(PHREEQC_THIS);
@ -1856,7 +1856,7 @@ read_kinetics_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out; // ??
std::ostringstream oss_err; // ??
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -1883,7 +1883,7 @@ read_kinetics_modify(void)
}
// read entity
cxxKinetics entity(&(kinetics[n]), &this->phrq_io);
cxxKinetics entity(&(kinetics[n]), &phrq_io);
entity.read_raw(PHREEQC_THIS_COMMA parser, false);
// save entity
@ -1944,7 +1944,7 @@ read_reaction_modify(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
assert(!reading_database());
//For testing, need to read line to get started
@ -2680,7 +2680,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_solution; i++)
{
cxxSolution cxxsoln(solution[i], &this->phrq_io);
cxxSolution cxxsoln(solution[i], &phrq_io);
cxxsoln.dump_raw(os,0);
}
}
@ -2691,7 +2691,7 @@ dump_ostream(std::ostream& os)
{
if (solution_bsearch(*it, &n, FALSE) != NULL)
{
cxxSolution cxxsoln(solution[n], &this->phrq_io);
cxxSolution cxxsoln(solution[n], &phrq_io);
cxxsoln.dump_raw(os,0);
}
}
@ -2705,7 +2705,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_pp_assemblage; i++)
{
cxxPPassemblage cxxentity(&pp_assemblage[i], &this->phrq_io);
cxxPPassemblage cxxentity(&pp_assemblage[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2717,7 +2717,7 @@ dump_ostream(std::ostream& os)
if (pp_assemblage_bsearch(*it, &n) != NULL)
{
cxxPPassemblage cxxentity(&pp_assemblage[n], &this->phrq_io);
cxxPPassemblage cxxentity(&pp_assemblage[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2731,7 +2731,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_exchange; i++)
{
cxxExchange cxxentity(&exchange[i], &this->phrq_io);
cxxExchange cxxentity(&exchange[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2743,7 +2743,7 @@ dump_ostream(std::ostream& os)
if (exchange_bsearch(*it, &n) != NULL)
{
cxxExchange cxxentity(&exchange[n], &this->phrq_io);
cxxExchange cxxentity(&exchange[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2757,7 +2757,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_surface; i++)
{
cxxSurface cxxentity(&surface[i], &this->phrq_io);
cxxSurface cxxentity(&surface[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2769,7 +2769,7 @@ dump_ostream(std::ostream& os)
if (surface_bsearch(*it, &n) != NULL)
{
cxxSurface cxxentity(&surface[n], &this->phrq_io);
cxxSurface cxxentity(&surface[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2809,7 +2809,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_gas_phase; i++)
{
cxxGasPhase cxxentity(&gas_phase[i], &this->phrq_io);
cxxGasPhase cxxentity(&gas_phase[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2821,7 +2821,7 @@ dump_ostream(std::ostream& os)
if (gas_phase_bsearch(*it, &n) != NULL)
{
cxxGasPhase cxxentity(&gas_phase[n], &this->phrq_io);
cxxGasPhase cxxentity(&gas_phase[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2835,7 +2835,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_kinetics; i++)
{
cxxKinetics cxxentity(&kinetics[i], &this->phrq_io);
cxxKinetics cxxentity(&kinetics[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2847,7 +2847,7 @@ dump_ostream(std::ostream& os)
if (kinetics_bsearch(*it, &n) != NULL)
{
cxxKinetics cxxentity(&kinetics[n], &this->phrq_io);
cxxKinetics cxxentity(&kinetics[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2861,7 +2861,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_mix; i++)
{
cxxMix cxxentity(&mix[i], &this->phrq_io);
cxxMix cxxentity(&mix[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2873,7 +2873,7 @@ dump_ostream(std::ostream& os)
if (mix_bsearch(*it, &n) != NULL)
{
cxxMix cxxentity(&mix[n], &this->phrq_io);
cxxMix cxxentity(&mix[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2913,7 +2913,7 @@ dump_ostream(std::ostream& os)
{
for (i = 0; i < count_temperature; i++)
{
cxxTemperature cxxentity(&temperature[i], &this->phrq_io);
cxxTemperature cxxentity(&temperature[i], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2925,7 +2925,7 @@ dump_ostream(std::ostream& os)
if (temperature_bsearch(*it, &n) != NULL)
{
cxxTemperature cxxentity(&temperature[n], &this->phrq_io);
cxxTemperature cxxentity(&temperature[n], &phrq_io);
cxxentity.dump_raw(os,0);
}
}
@ -2968,7 +2968,7 @@ read_user_graph_handler(void)
return_value = streamify_to_next_keyword(iss_in);
std::ostringstream oss_out;
std::ostringstream oss_err;
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &this->phrq_io);
CParser parser(PHREEQC_THIS_COMMA iss_in, oss_out, oss_err, &phrq_io);
//For testing, need to read line to get started
std::vector < std::string > vopts;

5
SSassemblageSS.cxx
View File

@ -101,7 +101,12 @@ cxxSSassemblageSS::cxxSSassemblageSS2s_s(PHREEQC_PTR_ARG_COMMA std::map < std::s
s_s_ptr[j].name = P_INSTANCE_POINTER string_hsave((*it).second.name.c_str());
if ((*it).second.name.size() <= 0)
{
#ifdef PHREEQC_CLASS
P_INSTANCE_POINTER error_msg("Name of a solid solution not defined in solid-solution assemblage. Error in _MODIFY definition?\n", STOP);
#else
::error_msg("Name of a solid solution not defined in solid-solution assemblage. Error in _MODIFY definition?\n", STOP);
#endif
}
assert((*it).second.name.size() > 0);
//s_s_ptr[j].total_moles = it->total_moles;