max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated for IPhreeqc to use PHREEQC_CPP and PHREEQC_CLASS. Currently doesn't include gmp. MemDebug project still needs work. Needs to be tested on linux.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4145 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-03-05 21:20:09 +00:00
parent 4ddc83581c
commit e245f8afa0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Phreeqc.cpp
View File

@ -8,6 +8,7 @@
Phreeqc::Phreeqc(void)
{
phast = FALSE;
s_pTail = NULL;
user_database = NULL;
output = NULL;
@ -15,6 +16,8 @@ Phreeqc::Phreeqc(void)
punch_file = NULL;
dump_file = NULL;
error_file = NULL;
database_file = NULL;
input_file = NULL;
rates = NULL;
tally_table = NULL;
spec = NULL;

11
Phreeqc.h
View File

@ -547,7 +547,7 @@ void *PHRQ_realloc(void *, size_t);
void PHRQ_free(void *ptr);
void PHRQ_free_all(void);
private:
protected:
// phreeqc_files.c -------------------------------
@ -1188,7 +1188,7 @@ int surface_delete(int n_user_old);
int surface_duplicate(int n_user_old, int n_user_new);
public:
int surface_free(struct surface *surface_ptr);
private:
protected:
int surface_init(struct surface *surface_ptr, int n_user, int n_user_end,
char *description);
int surface_ptr_to_user(struct surface *surface_ptr_old, int n_user_new);
@ -1362,7 +1362,7 @@ int backspace_screen(int spaces);
LDBLE calc_alk(struct reaction *rxn_ptr);
public:
int compute_gfw(const char *string, LDBLE * gfw);
private:
protected:
int copy_token(char *token_ptr, char **ptr, int *length);
int dup_print(const char *ptr, int emphasis);
int equal(LDBLE a, LDBLE b, LDBLE eps);
@ -1412,9 +1412,8 @@ Address Hash_multi(HashTable * Table, char *Key);
void ExpandTable_multi(HashTable * Table);
#if defined(SWIG_SHARED_OBJ)
int EndRow(void);
void AddSelectedOutput(const char *name, const char *format,
va_list argptr);
public:
virtual int EndRow(void);
#endif