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

updated reading for istream cookies removed PFN_READ_CALLBACK

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5808 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2011-11-23 00:18:43 +00:00
parent 14ef22ef15
commit c552aab892
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Phreeqc.cpp
View File

@ -832,6 +832,9 @@ void Phreeqc::init(void)
B1TT = 0;
B2TT = 0;
/* input.c */
reading_db = FALSE;
/* integrate.c */
z = 0;
xd = 0;
@ -968,7 +971,7 @@ void Phreeqc::init(void)
#endif
run_info.Set_io(phrq_io);
this->clear_cookie();
this->clear_istream();
return;
}

31
Phreeqc.h
View File

@ -177,8 +177,8 @@ public:
int close_input_files(void);
int close_output_files(void);
static int istream_getc(void *cookie);
int process_file_names(int argc, char *argv[], void **db_cookie,
void **input_cookie, int log);
int process_file_names(int argc, char *argv[], std::istream **db_cookie,
std::istream **input_cookie, int log);
/* PHRQ_io_output.cpp */
void screen_msg(const char *err_str);
@ -245,7 +245,7 @@ public:
// input.cpp -------------------------------
int reading_database(void);
struct read_callback s_read_callback;
void set_reading_database(int reading_database);
int check_line(const char *string, int allow_empty, int allow_eof,
int allow_keyword, int print);
@ -1315,10 +1315,10 @@ public:
int main_method(int argc, char *argv[]);
void set_phast(int);
size_t list_components(std::list<std::string> &list_c);
void *get_cookie();
void pop_cookie();
void set_cookie(std::istream * cookie);
void clear_cookie(void);
std::istream *get_istream();
void pop_istream();
void push_istream(std::istream * cookie);
void clear_istream(void);
protected:
void init(void);
@ -1326,7 +1326,7 @@ protected:
//Data members
//
protected:
std::list <std::istream *> cookie_list;
std::list <std::istream *> istream_list;
std::ifstream * in_stream;
std::ifstream * db_stream;
@ -1880,15 +1880,14 @@ protected:
/* input.cpp ------------------------------- */
int add_char_to_line(int *i, char c);
int check_line_impl(PFN_READ_CALLBACK pfn, void *cookie, const char *string,
int allow_empty, int allow_eof, int allow_keyword,
int print);
int get_line(PFN_READ_CALLBACK pfn, void *cookie);
int get_logical_line(PFN_READ_CALLBACK pfn, void *cookie, int *l);
int read_database(PFN_READ_CALLBACK pfn, void *cookie);
int run_simulations(PFN_READ_CALLBACK pfn, void *cookie);
int set_read_callback(PFN_READ_CALLBACK pfn, void *cookie, int database);
int check_line_impl(const char *string, int allow_empty,
int allow_eof, int allow_keyword, int print);
int get_line(void);
int get_logical_line(void *cookie, int *l);
int read_database(void);
int run_simulations(void);
int check_line_return;
int reading_db;
/* integrate.cpp ------------------------------- */
LDBLE midpoint_sv;

16
class_main.cpp
View File

@ -51,8 +51,8 @@ main_method(int argc, char *argv[])
{
int errors;
void *db_cookie = NULL;
void *input_cookie = NULL;
std::istream *db_cookie = NULL;
std::istream *input_cookie = NULL;
#if defined(WIN32_MEMORY_DEBUG)
int tmpDbgFlag;
@ -95,9 +95,9 @@ main_method(int argc, char *argv[])
/*
* Load database into memory
*/
this->set_cookie((std::ifstream *) db_cookie);
errors = read_database(PHRQ_io::istream_getc, db_cookie);
this->clear_cookie();
this->push_istream(db_cookie);
errors = read_database();
this->clear_istream();
if (errors != 0)
{
@ -109,9 +109,9 @@ main_method(int argc, char *argv[])
* Read input data for simulation
*/
this->set_cookie((std::ifstream *)input_cookie);
errors = run_simulations(PHRQ_io::istream_getc, input_cookie);
this->clear_cookie();
this->push_istream(input_cookie);
errors = run_simulations();
this->clear_istream();
if (errors != 0)
{