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

created IPHREEQC_ENABLE_MODULE option

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9638 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-05-12 04:48:46 +00:00
parent ef8611e0ed
commit 3e1e2bae17
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Phreeqc.h
View File

@ -84,7 +84,11 @@ public:
int basic_compile(char *commands, void **lnbase, void **vbase, void **lpbase);
int basic_run(char *commands, void *lnbase, void *vbase, void *lpbase);
void basic_free(void);
#ifdef IPHREEQC_NO_FORTRAN_MODULE
double basic_callback(double x1, double x2, char * str);
#else
double basic_callback(double x1, double x2, const char * str);
#endif
void register_basic_callback(double ( *fcn)(double x1, double x2, const char *str, void *cookie), void *cookie1);
#ifdef IPHREEQC_NO_FORTRAN_MODULE
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, size_t l));

5
basicsubs.cpp
View File

@ -3906,8 +3906,13 @@ basic_free(void)
delete this->basic_interpreter;
}
#ifdef IPHREEQC_NO_FORTRAN_MODULE
double Phreeqc::
basic_callback(double x1, double x2, char * str)
#else
double Phreeqc::
basic_callback(double x1, double x2, const char * str)
#endif
{
double local_x1 = x1;
double local_x2 = x2;