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

renamed Run to RunAccumulated; fixed RunString for fortran wrappers fwrap2 and fwrap3

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4186 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-03-23 22:25:37 +00:00
parent 5249f4be2a
commit 09aa7f357e
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IPhreeqc.cpp
View File

@ -97,9 +97,9 @@ SetDumpStringOn(int value)
} }
int int
Run(void) RunAccumulated(void)
{ {
return IPhreeqc::LibraryInstance()->Run(); return IPhreeqc::LibraryInstance()->RunAccumulated();
} }
int int
@ -1616,9 +1616,9 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
return VR_OUTOFMEMORY; return VR_OUTOFMEMORY;
} }
int IPhreeqc::Run(void) int IPhreeqc::RunAccumulated(void)
{ {
static const char *sz_routine = "Run"; static const char *sz_routine = "RunAccumulated";
try try
{ {
// this may throw // this may throw
@ -1638,7 +1638,7 @@ int IPhreeqc::Run(void)
} }
catch(...) catch(...)
{ {
const char *errmsg = "Run: An unhandled exception occured.\n"; const char *errmsg = "RunAccumulated: An unhandled exception occured.\n";
try try
{ {
this->error_msg(errmsg, STOP); // throws PhreeqcStop this->error_msg(errmsg, STOP); // throws PhreeqcStop

2
IPhreeqc.hpp
View File

@ -57,7 +57,7 @@ public:
bool GetSelectedOutputOn(void)const; bool GetSelectedOutputOn(void)const;
void SetSelectedOutputOn(bool bValue); void SetSelectedOutputOn(bool bValue);
int Run(void); int RunAccumulated(void);
int RunFile(const char* filename); int RunFile(const char* filename);
int RunString(const char* input); int RunString(const char* input);

8
fwrap.cpp
View File

@ -180,9 +180,9 @@ GetComponentF(int *n, char* line, unsigned int line_length)
} }
int int
RunF(void) RunAccumulatedF(void)
{ {
return ::Run(); return ::RunAccumulated();
} }
int int
@ -385,9 +385,9 @@ void __stdcall GETCOMPONENT(int *n, char* line, unsigned int line_length)
{ {
GetComponentF(n, line, line_length); GetComponentF(n, line, line_length);
} }
int __stdcall RUN(void) int __stdcall RUNACCUMULATED(void)
{ {
return RunF(); return RunAccumulatedF();
} }
int __stdcall RUNFILE(char *filename, unsigned int len) int __stdcall RUNFILE(char *filename, unsigned int len)
{ {

2
fwrap.h
View File

@ -11,7 +11,7 @@ extern "C" {
VRESULT AccumulateLineF(char *line, unsigned int line_length); VRESULT AccumulateLineF(char *line, unsigned int line_length);
int RunF(void); int RunAccumulatedF(void);
int RunFileF(char* filename, unsigned int filename_length); int RunFileF(char* filename, unsigned int filename_length);

6
fwrap2.cpp
View File

@ -70,9 +70,9 @@ void GETCOMPONENT(int *n, char* line, unsigned int line_length)
{ {
GetComponentF(n, line, line_length); GetComponentF(n, line, line_length);
} }
int RUN(void) int RUNACCUMULATED(void)
{ {
return RunF(); return RunAccumulatedF();
} }
int RUNFILE(char *filename, unsigned int len) int RUNFILE(char *filename, unsigned int len)
{ {
@ -80,7 +80,7 @@ int RUNFILE(char *filename, unsigned int len)
} }
int RUNSTRING(char *input, unsigned int len) int RUNSTRING(char *input, unsigned int len)
{ {
return RunFileF(input, len); return RunStringF(input, len);
} }
void OUTPUTLINES(void) void OUTPUTLINES(void)
{ {

6
fwrap3.cpp
View File

@ -70,9 +70,9 @@ void getcomponent_(int *n, char* line, unsigned int line_length)
{ {
GetComponentF(n, line, line_length); GetComponentF(n, line, line_length);
} }
int run_(void) int runaccumulated_(void)
{ {
return RunF(); return RunAccumulatedF();
} }
int runfile_(char *filename, unsigned int len) int runfile_(char *filename, unsigned int len)
{ {
@ -80,7 +80,7 @@ int runfile_(char *filename, unsigned int len)
} }
int runstring_(char *input, unsigned int len) int runstring_(char *input, unsigned int len)
{ {
return RunFileF(input, len); return RunStringF(input, len);
} }
void outputlines_(void) void outputlines_(void)
{ {