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

All tests compile in all configurations

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-10 06:12:42 +00:00
parent c3c27d34d8
commit ed8ca4aedd
5 changed files with 237 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPhreeqcLib.cpp
View File

@ -154,7 +154,7 @@ GetComponentCount(int id)
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->ListComponents().size();
return (int)IPhreeqcPtr->ListComponents().size();
}
return IPQ_BADINSTANCE;
}

58
fwrap.cpp
View File

@ -344,7 +344,7 @@ UnLoadDatabaseF(int *id)
}
#if defined(_WIN32)
#if defined(_WIN32) && !defined(_M_AMD64)
#if defined(__cplusplus)
extern "C" {
@ -353,15 +353,15 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:cvf
//
DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
DLL_EXPORT int __stdcall CREATEIPHREEQC(void)
DLL_EXPORT int __stdcall CREATEIPHREEQC(void)
{
return CreateIPhreeqcF();
}
DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id)
DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id)
{
return DestroyIPhreeqcF(id);
}
@ -369,7 +369,7 @@ DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int
{
GetComponentF(id, n, line, line_length);
}
DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
@ -377,35 +377,51 @@ DLL_EXPORT void __stdcall GETDUMPLINE(int *id, int *n, char* line, unsigned int
{
GetDumpLineF(id, n, line, line_length);
}
DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id)
DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id)
{
return GetDumpLineCountF(id);
}
DLL_EXPORT int __stdcall GETDUMPON(int *id)
{
return GetDumpOnF(id);
}
DLL_EXPORT int __stdcall GETDUMPSTRINGON(int *id)
{
return GetDumpStringOnF(id);
}
DLL_EXPORT void __stdcall GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorLineF(id, n, line, line_length);
}
DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id)
DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id)
{
return GetErrorLineCountF(id);
}
DLL_EXPORT int __stdcall GETLOGON(int *id)
DLL_EXPORT int __stdcall GETERRORON(int *id)
{
return GetLogonF(id);
return GetErrorOnF(id);
}
DLL_EXPORT int __stdcall GETOUTPUTON(int *id)
DLL_EXPORT int __stdcall GETLOGON(int *id)
{
return GetOutputF(id);
return GetLogOnF(id);
}
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
DLL_EXPORT int __stdcall GETOUTPUTON(int *id)
{
return GetOutputOnF(id);
}
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTON(int *id)
{
return GetSelectedOutputOnF(id);
}
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
{
return GetSelectedOutputRowCountF(id);
}
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
}
@ -413,15 +429,15 @@ DLL_EXPORT void __stdcall GETWARNINGLINE(int *id, int *n, char* line, unsigned i
{
GetWarningLineF(id, n, line, line_length);
}
DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id)
DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id)
{
return GetWarningLineCountF(id);
}
DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
@ -437,15 +453,15 @@ DLL_EXPORT void __stdcall OUTPUTWARNING(int *id)
{
OutputWarningF(id);
}
DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
{
return RunAccumulatedF(id);
}
DLL_EXPORT int __stdcall RUNFILE(int *id, char *filename, unsigned int len)
DLL_EXPORT int __stdcall RUNFILE(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len)
DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
@ -473,7 +489,7 @@ DLL_EXPORT void __stdcall SETSELECTEDOUTPUTON(int *id, int *selected_on)
{
SetSelectedOutputOnF(id, selected_on);
}
DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
{
return UnLoadDatabaseF(id);
}

4
fwrap.h
View File

@ -56,11 +56,11 @@ extern "C" {
void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
int GetDumpLineCountF(int *id);
void GetDumpLineF(int *id, int* n, char* line, unsigned int line_length);
int GetDumpOnF(int *id);
int GetDumpStringOnF(int *id);
int GetErrorLineCountF(int *id);
void GetErrorLineF(int *id, int* n, char* line, unsigned int line_length);
int GetErrorOnF(int *id);
int GetDumpOnF(int *id);
int GetDumpStringOnF(int *id);
int GetLogOnF(int *id);
int GetOutputOnF(int *id);
int GetSelectedOutputColumnCountF(int *id);

169
fwrap2.cpp
View File

@ -3,6 +3,7 @@
#if defined(_WIN32)
#if defined(__cplusplus)
extern "C" {
#endif
@ -10,53 +11,117 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:cvf
//
DLL_EXPORT int CREATEIPHREEQC(void)
DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
DLL_EXPORT int CREATEIPHREEQC(void)
{
return CreateIPhreeqcF();
}
DLL_EXPORT int DESTROYIPHREEQC(int *id)
DLL_EXPORT int DESTROYIPHREEQC(int *id)
{
return DestroyIPhreeqcF(id);
}
DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpLineF(id, n, line, line_length);
}
DLL_EXPORT int GETDUMPLINECOUNT(int *id)
{
return GetDumpLineCountF(id);
}
DLL_EXPORT int GETDUMPON(int *id)
{
return GetDumpOnF(id);
}
DLL_EXPORT int GETDUMPSTRINGON(int *id)
{
return GetDumpStringOnF(id);
}
DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorLineF(id, n, line, line_length);
}
DLL_EXPORT int GETERRORLINECOUNT(int *id)
{
return GetErrorLineCountF(id);
}
DLL_EXPORT int GETERRORON(int *id)
{
return GetErrorOnF(id);
}
DLL_EXPORT int GETLOGON(int *id)
{
return GetLogOnF(id);
}
DLL_EXPORT int GETOUTPUTON(int *id)
{
return GetOutputOnF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTON(int *id)
{
return GetSelectedOutputOnF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
{
return GetSelectedOutputRowCountF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
}
DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningLineF(id, n, line, line_length);
}
DLL_EXPORT int GETWARNINGLINECOUNT(int *id)
{
return GetWarningLineCountF(id);
}
DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
DLL_EXPORT int UNLOADDATABASE(int *id)
{
return UnLoadDatabaseF(id);
}
DLL_EXPORT void OUTPUTERROR(int *id)
{
OutputErrorF(id);
}
DLL_EXPORT void OUTPUTLINES(int *id)
{
OutputLinesF(id);
}
DLL_EXPORT void OUTPUTWARNING(int *id)
{
OutputWarningF(id);
}
DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
DLL_EXPORT int RUNACCUMULATED(int *id)
{
return AccumulateLineF(id, line, len);
return RunAccumulatedF(id);
}
DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on)
DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len)
{
SetSelectedOutputOnF(id, selected_on);
return RunFileF(id, filename, len);
}
DLL_EXPORT void SETOUTPUTON(int *id, int *output_on)
DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
{
SetOutputOnF(id, output_on);
}
DLL_EXPORT void SETERRORON(int *id, int *error_on)
{
SetErrorOnF(id, error_on);
}
DLL_EXPORT void SETLOGON(int *id, int *log_on)
{
SetLogOnF(id, log_on);
return RunStringF(id, input, len);
}
DLL_EXPORT void SETDUMPON(int *id, int *dump_on)
{
@ -66,65 +131,25 @@ DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on)
{
SetDumpStringOnF(id, dump_string_on);
}
DLL_EXPORT int GETDUMPLINECOUNT(int *id)
DLL_EXPORT void SETERRORON(int *id, int *error_on)
{
return GetDumpLineCountF(id);
SetErrorOnF(id, error_on);
}
DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length)
DLL_EXPORT void SETLOGON(int *id, int *log_on)
{
GetDumpLineF(id, n, line, line_length);
SetLogOnF(id, log_on);
}
DLL_EXPORT int GETERRORLINECOUNT(int *id)
DLL_EXPORT void SETOUTPUTON(int *id, int *output_on)
{
return GetErrorLineCountF(id);
SetOutputOnF(id, output_on);
}
DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length)
DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on)
{
GetErrorLineF(id, n, line, line_length);
SetSelectedOutputOnF(id, selected_on);
}
DLL_EXPORT int GETWARNINGLINECOUNT(int *id)
DLL_EXPORT int UNLOADDATABASE(int *id)
{
return GetWarningLineCountF(id);
}
DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningLineF(id, n, line, line_length);
}
DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
DLL_EXPORT int RUNACCUMULATED(int *id)
{
return RunAccumulatedF(id);
}
DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
DLL_EXPORT void OUTPUTLINES(int *id)
{
OutputLinesF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
{
return GetSelectedOutputRowCountF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
DLL_EXPORT int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
return UnLoadDatabaseF(id);
}
#if defined(__cplusplus)

176
fwrap3.cpp
View File

@ -10,45 +10,125 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:cref /assume:underscore
//
DLL_EXPORT int createiphreeqc_(void)
DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
DLL_EXPORT int createiphreeqc_(void)
{
return CreateIPhreeqcF();
}
DLL_EXPORT int destroyiphreeqc_(int *id)
DLL_EXPORT int destroyiphreeqc_(int *id)
{
return DestroyIPhreeqcF(id);
}
DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
DLL_EXPORT int getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpLineF(id, n, line, line_length);
}
DLL_EXPORT int getdumplinecount_(int *id)
{
return GetDumpLineCountF(id);
}
DLL_EXPORT int getdumpon_(int *id)
{
return GetDumpOnF(id);
}
DLL_EXPORT int getdumpstringon_(int *id)
{
return GetDumpStringOnF(id);
}
DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorLineF(id, n, line, line_length);
}
DLL_EXPORT int geterrorlinecount_(int *id)
{
return GetErrorLineCountF(id);
}
DLL_EXPORT int geterroron_(int *id)
{
return GetErrorOnF(id);
}
DLL_EXPORT int getlogon_(int *id)
{
return GetLogOnF(id);
}
DLL_EXPORT int getoutputon_(int *id)
{
return GetOutputOnF(id);
}
DLL_EXPORT int getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
DLL_EXPORT int getselectedoutputon_(int *id)
{
return GetSelectedOutputOnF(id);
}
DLL_EXPORT int getselectedoutputrowcount_(int *id)
{
return GetSelectedOutputRowCountF(id);
}
DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
}
DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningLineF(id, n, line, line_length);
}
DLL_EXPORT int getwarninglinecount_(int *id)
{
return GetWarningLineCountF(id);
}
DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
DLL_EXPORT int unloaddatabase_(int *id)
{
return UnLoadDatabaseF(id);
}
DLL_EXPORT void outputerror_(int *id)
{
OutputErrorF(id);
}
DLL_EXPORT void outputlines_(int *id)
{
OutputLinesF(id);
}
DLL_EXPORT void outputwarning_(int *id)
{
OutputWarningF(id);
}
DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
DLL_EXPORT int runaccumulated_(int *id)
{
return AccumulateLineF(id, line, len);
return RunAccumulatedF(id);
}
DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on)
DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len)
{
SetSelectedOutputOnF(id, selected_on);
return RunFileF(id, filename, len);
}
DLL_EXPORT void setoutputon_(int *id, int *output_on)
DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
{
SetOutputOnF(id, output_on);
return RunStringF(id, input, len);
}
DLL_EXPORT void setdumpon_(int *id, int *dump_on)
{
SetDumpOnF(id, dump_on);
}
DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
{
SetDumpStringOnF(id, dump_string_on);
}
DLL_EXPORT void seterroron_(int *id, int *error_on)
{
@ -58,73 +138,17 @@ DLL_EXPORT void setlogon_(int *id, int *log_on)
{
SetLogOnF(id, log_on);
}
DLL_EXPORT void setdumpon_(int *id, int *dump_on)
DLL_EXPORT void setoutputon_(int *id, int *output_on)
{
SetLogOnF(id, dump_on);
SetOutputOnF(id, output_on);
}
DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on)
DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on)
{
SetDumpStringOnF(id, dump_string_on);
SetSelectedOutputOnF(id, selected_on);
}
DLL_EXPORT int getdumplinecount_(int *id)
DLL_EXPORT int unloaddatabase_(int *id)
{
return GetDumpLineCountF(id);
}
DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpLineF(id, n, line, line_length);
}
DLL_EXPORT int geterrorlinecount_(int *id)
{
return GetErrorLineCountF(id);
}
DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorLineF(id, n, line, line_length);
}
DLL_EXPORT int getwarninglinecount_(int *id)
{
return GetWarningLineCountF(id);
}
DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningLineF(id, n, line, line_length);
}
DLL_EXPORT int getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
DLL_EXPORT int runaccumulated_(int *id)
{
return RunAccumulatedF(id);
}
DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
DLL_EXPORT void outputlines_(int *id)
{
OutputLinesF(id);
}
DLL_EXPORT int getselectedoutputrowcount_(int *id)
{
return GetSelectedOutputRowCountF(id);
}
DLL_EXPORT int getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
return UnLoadDatabaseF(id);
}
#if defined(__cplusplus)