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

changed all fortran string length parameters to be size_t

Browse Source 
simplified fortran wrappers for windows


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-10-29 01:59:37 +00:00
parent 9b73f65b6d
commit 9a6cb18dbf
20 changed files with 578 additions and 2362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
IPhreeqc.2008.vcproj
View File

@ -87,7 +87,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir lib &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;lib\$(TargetName).lib&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=lib&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@ -160,7 +160,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir libx64 &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;libx64\$(TargetName).lib&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=libx64&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;"
/>
</Configuration>
<Configuration
@ -233,7 +233,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=lib&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc*.pdb&quot; &quot;%DEST%\.&quot;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=lib&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc*.pdb&quot; &quot;%DEST%\.&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@ -268,7 +268,6 @@
Optimization="0"
AdditionalIncludeDirectories="src;src/phreeqcpp"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
PrecompiledHeaderFile=""
@ -307,7 +306,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir libx64 &gt; NUL&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;libx64\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc80.pdb&quot; &quot;libx64\vc80.pdb&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=libx64&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc*.pdb&quot; &quot;%DEST%\.&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@ -388,7 +387,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir dll &gt; NUL&#x0D;&#x0A;copy &quot;$(OutDir)\$(ProjectName).dll&quot; &quot;dll\$(ProjectName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;dll\$(TargetName).lib&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=dll&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@ -470,7 +469,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir dllx64 &gt; NUL&#x0D;&#x0A;copy &quot;$(OutDir)\$(ProjectName).dll&quot; &quot;dllx64\$(ProjectName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;dllx64\$(TargetName).lib&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=dllx64&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@ -552,7 +551,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir dll &gt; NUL&#x0D;&#x0A;copy &quot;$(OutDir)\$(ProjectName)d.dll&quot; &quot;dll\$(ProjectName)d.dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;dll\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc80.pdb&quot; &quot;dll\vc80.pdb&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=dll&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc*.pdb&quot; &quot;%DEST%\.&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
@ -587,7 +586,6 @@
Optimization="0"
AdditionalIncludeDirectories="src;src/phreeqcpp"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PrecompiledHeaderFile=""
@ -636,7 +634,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir dllx64 &gt; NUL&#x0D;&#x0A;copy &quot;$(OutDir)\$(ProjectName)d.dll&quot; &quot;dllx64\$(ProjectName)d.dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;dllx64\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc80.pdb&quot; &quot;dllx64\vc80.pdb&quot;&#x0D;&#x0A;"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=dllx64&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).dll&quot; &quot;%DEST%\$(TargetName).dll&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)vc*.pdb&quot; &quot;%DEST%\.&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
@ -655,6 +653,42 @@
RelativePath=".\src\fwrap.cpp"
>
</File>
<File
RelativePath=".\src\fwrap1.cpp"
>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\fwrap2.cpp"
>
@ -674,14 +708,110 @@
<File
RelativePath=".\src\fwrap6.cpp"
>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\fwrap7.cpp"
>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\fwrap8.cpp"
>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugDll|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\IPhreeqc.cpp"

2
src/IPhreeqc.cpp
View File

@ -874,7 +874,7 @@ void IPhreeqc::SetBasicCallback(double (*fcn)(double x1, double x2, const char *
this->PhreeqcPtr->register_basic_callback(fcn, cookie1);
}
void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, int l))
void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, size_t l))
{
this->PhreeqcPtr->register_fortran_basic_callback(fcn);
}

2
src/IPhreeqc.h
View File

@ -1663,7 +1663,7 @@ Headings
* @par File ic :
* @include ic
*/
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, int l));
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l));
/**

2
src/IPhreeqc.hpp
View File

@ -710,7 +710,7 @@ public:
* @param fcn The name of a user-defined function.
* @see SetBasicCallback
*/
void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, int l));
void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, size_t l));
/**
* Sets the current <B>SELECTED_OUTPUT</B> user number for use in subsequent calls to (@ref GetSelectedOutputColumnCount,

2
src/IPhreeqcLib.cpp
View File

@ -783,7 +783,7 @@ SetBasicCallback(int id, double (*fcn)(double x1, double x2, const char *str, vo
}
IPQ_RESULT
SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, int l))
SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l))
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)

274
src/fimpl.h Normal file
View File

@ -0,0 +1,274 @@
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(accumulateline, ACCUMULATELINE, accumulateline_, ACCUMULATELINE_)(int *id, char *line, size_t len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(adderror, ADDERROR, adderror_, ADDERROR_)(int *id, char *error_msg, size_t len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(addwarning, ADDWARNING, addwarning_, ADDWARNING_)(int *id, char *warn_msg, size_t len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(clearaccumulatedlines, CLEARACCUMULATEDLINES, clearaccumulatedlines_, CLEARACCUMULATEDLINES_)(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(createiphreeqc, CREATEIPHREEQC, createiphreeqc_, CREATEIPHREEQC_)(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(destroyiphreeqc, DESTROYIPHREEQC, destroyiphreeqc_, DESTROYIPHREEQC_)(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getcomponent, GETCOMPONENT, getcomponent_, GETCOMPONENT_)(int *id, int *n, char* line, size_t line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getcomponentcount, GETCOMPONENTCOUNT, getcomponentcount_, GETCOMPONENTCOUNT_)(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getcurrentselectedoutputusernumber, GETCURRENTSELECTEDOUTPUTUSERNUMBER, getcurrentselectedoutputusernumber_, GETCURRENTSELECTEDOUTPUTUSERNUMBER_)(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getdumpfilename, GETDUMPFILENAME, getdumpfilename_, GETDUMPFILENAME_)(int *id, char *filename, size_t len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getdumpfileon, GETDUMPFILEON, getdumpfileon_, GETDUMPFILEON_)(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getdumpstringline, GETDUMPSTRINGLINE, getdumpstringline_, GETDUMPSTRINGLINE_)(int *id, int *n, char* line, size_t line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getdumpstringlinecount, GETDUMPSTRINGLINECOUNT, getdumpstringlinecount_, GETDUMPSTRINGLINECOUNT_)(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getdumpstringon, GETDUMPSTRINGON, getdumpstringon_, GETDUMPSTRINGON_)(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(geterrorfilename, GETERRORFILENAME, geterrorfilename_, GETERRORFILENAME_)(int *id, char *filename, size_t len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(geterrorfileon, GETERRORFILEON, geterrorfileon_, GETERRORFILEON_)(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(geterrorstringline, GETERRORSTRINGLINE, geterrorstringline_, GETERRORSTRINGLINE_)(int *id, int *n, char* line, size_t line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(geterrorstringlinecount, GETERRORSTRINGLINECOUNT, geterrorstringlinecount_, GETERRORSTRINGLINECOUNT_)(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(geterrorstringon, GETERRORSTRINGON, geterrorstringon_, GETERRORSTRINGON_)(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getlogfilename, GETLOGFILENAME, getlogfilename_, GETLOGFILENAME_)(int *id, char *filename, size_t len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getlogfileon, GETLOGFILEON, getlogfileon_, GETLOGFILEON_)(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getlogstringline, GETLOGSTRINGLINE, getlogstringline_, GETLOGSTRINGLINE_)(int *id, int *n, char* line, size_t line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getlogstringlinecount, GETLOGSTRINGLINECOUNT, getlogstringlinecount_, GETLOGSTRINGLINECOUNT_)(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getlogstringon, GETLOGSTRINGON, getlogstringon_, GETLOGSTRINGON_)(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getnthselectedoutputusernumber, GETNTHSELECTEDOUTPUTUSERNUMBER, getnthselectedoutputusernumber_, GETNTHSELECTEDOUTPUTUSERNUMBER_)(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getoutputfilename, GETOUTPUTFILENAME, getoutputfilename_, GETOUTPUTFILENAME_)(int *id, char *filename, size_t len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getoutputfileon, GETOUTPUTFILEON, getoutputfileon_, GETOUTPUTFILEON_)(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getoutputstringline, GETOUTPUTSTRINGLINE, getoutputstringline_, GETOUTPUTSTRINGLINE_)(int *id, int *n, char* line, size_t line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getoutputstringlinecount, GETOUTPUTSTRINGLINECOUNT, getoutputstringlinecount_, GETOUTPUTSTRINGLINECOUNT_)(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getoutputstringon, GETOUTPUTSTRINGON, getoutputstringon_, GETOUTPUTSTRINGON_)(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputcolumncount, GETSELECTEDOUTPUTCOLUMNCOUNT, getselectedoutputcolumncount_, GETSELECTEDOUTPUTCOLUMNCOUNT_)(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputcount, GETSELECTEDOUTPUTCOUNT, getselectedoutputcount_, GETSELECTEDOUTPUTCOUNT_)(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getselectedoutputfilename, GETSELECTEDOUTPUTFILENAME, getselectedoutputfilename_, GETSELECTEDOUTPUTFILENAME_)(int *id, char *filename, size_t len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputfileon, GETSELECTEDOUTPUTFILEON, getselectedoutputfileon_, GETSELECTEDOUTPUTFILEON_)(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputrowcount, GETSELECTEDOUTPUTROWCOUNT, getselectedoutputrowcount_, GETSELECTEDOUTPUTROWCOUNT_)(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getselectedoutputstringline, GETSELECTEDOUTPUTSTRINGLINE, getselectedoutputstringline_, GETSELECTEDOUTPUTSTRINGLINE_)(int *id, int *n, char* line, size_t line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputstringlinecount, GETSELECTEDOUTPUTSTRINGLINECOUNT, getselectedoutputstringlinecount_, GETSELECTEDOUTPUTSTRINGLINECOUNT_)(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputstringon, GETSELECTEDOUTPUTSTRINGON, getselectedoutputstringon_, GETSELECTEDOUTPUTSTRINGON_)(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getselectedoutputvalue, GETSELECTEDOUTPUTVALUE, getselectedoutputvalue_, GETSELECTEDOUTPUTVALUE_)(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, size_t svalue_length)
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getversionstring, GETVERSIONSTRING, getversionstring_, GETVERSIONSTRING_)(char* version, size_t version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(getwarningstringline, GETWARNINGSTRINGLINE, getwarningstringline_, GETWARNINGSTRINGLINE_)(int *id, int *n, char* line, size_t line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(getwarningstringlinecount, GETWARNINGSTRINGLINECOUNT, getwarningstringlinecount_, GETWARNINGSTRINGLINECOUNT_)(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(loaddatabase, LOADDATABASE, loaddatabase_, LOADDATABASE_)(int *id, char *filename, size_t len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(loaddatabasestring, LOADDATABASESTRING, loaddatabasestring_, LOADDATABASESTRING_)(int *id, char *input, size_t len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(outputaccumulatedlines, OUTPUTACCUMULATEDLINES, outputaccumulatedlines_, OUTPUTACCUMULATEDLINES_)(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(outputerrorstring, OUTPUTERRORSTRING, outputerrorstring_, OUTPUTERRORSTRING_)(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void IPQ_DECL IPQ_CASE_UND(outputwarningstring, OUTPUTWARNINGSTRING, outputwarningstring_, OUTPUTWARNINGSTRING_)(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(runaccumulated, RUNACCUMULATED, runaccumulated_, RUNACCUMULATED_)(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(runfile, RUNFILE, runfile_, RUNFILE_)(int *id, char *filename, size_t len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(runstring, RUNSTRING, runstring_, RUNSTRING_)(int *id, char *input, size_t len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setbasicfortrancallback, SETBASICFORTRANCALLBACK, setbasicfortrancallback_, SETBASICFORTRANCALLBACK_)(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setcurrentselectedoutputusernumber, SETCURRENTSELECTEDOUTPUTUSERNUMBER, setcurrentselectedoutputusernumber_, SETCURRENTSELECTEDOUTPUTUSERNUMBER_)(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setdumpfilename, SETDUMPFILENAME, setdumpfilename_, SETDUMPFILENAME_)(int *id, char *filename, size_t len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setdumpfileon, SETDUMPFILEON, setdumpfileon_, SETDUMPFILEON_)(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setdumpstringon, SETDUMPSTRINGON, setdumpstringon_, SETDUMPSTRINGON_)(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(seterrorfilename, SETERRORFILENAME, seterrorfilename_, SETERRORFILENAME_)(int *id, char *filename, size_t len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(seterrorfileon, SETERRORFILEON, seterrorfileon_, SETERRORFILEON_)(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(seterrorstringon, SETERRORSTRINGON, seterrorstringon_, SETERRORSTRINGON_)(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setlogfilename, SETLOGFILENAME, setlogfilename_, SETLOGFILENAME_)(int *id, char *filename, size_t len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setlogfileon, SETLOGFILEON, setlogfileon_, SETLOGFILEON_)(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setlogstringon, SETLOGSTRINGON, setlogstringon_, SETLOGSTRINGON_)(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setoutputfilename, SETOUTPUTFILENAME, setoutputfilename_, SETOUTPUTFILENAME_)(int *id, char *filename, size_t len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setoutputfileon, SETOUTPUTFILEON, setoutputfileon_, SETOUTPUTFILEON_)(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setoutputstringon, SETOUTPUTSTRINGON, setoutputstringon_, SETOUTPUTSTRINGON_)(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setselectedoutputfilename, SETSELECTEDOUTPUTFILENAME, setselectedoutputfilename_, SETSELECTEDOUTPUTFILENAME_)(int *id, char *filename, size_t len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setselectedoutputfileon, SETSELECTEDOUTPUTFILEON, setselectedoutputfileon_, SETSELECTEDOUTPUTFILEON_)(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setselectedoutputstringon, SETSELECTEDOUTPUTSTRINGON, setselectedoutputstringon_, SETSELECTEDOUTPUTSTRINGON_)(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}

352
src/fwrap.cpp
View File

@ -9,10 +9,10 @@
#include "fwrap.h"
char *
f2cstring(char* fstring, int len)
f2cstring(char* fstring, size_t len)
{
char *cstr, *str;
int i;
size_t i;
str = fstring;
for (i = len - 1; i >= 0 && !isgraph((int)str[i]); i--);
@ -25,9 +25,9 @@ f2cstring(char* fstring, int len)
}
void
padfstring(char *dest, const char *src, unsigned int len)
padfstring(char *dest, const char *src, size_t len)
{
unsigned int sofar;
size_t sofar;
for (sofar = 0; (sofar < len) && (*src != '\0'); ++sofar)
*dest++ = *src++;
@ -37,7 +37,7 @@ padfstring(char *dest, const char *src, unsigned int len)
}
IPQ_RESULT
AccumulateLineF(int *id, char *line, unsigned int line_length)
AccumulateLineF(int *id, char *line, size_t line_length)
{
IPQ_RESULT n;
char* cline;
@ -55,7 +55,7 @@ AccumulateLineF(int *id, char *line, unsigned int line_length)
}
int
AddErrorF(int *id, char *error_msg, unsigned int len)
AddErrorF(int *id, char *error_msg, size_t len)
{
int n;
char* cmsg;
@ -73,7 +73,7 @@ AddErrorF(int *id, char *error_msg, unsigned int len)
}
int
AddWarningF(int *id, char *warn_msg, unsigned int len)
AddWarningF(int *id, char *warn_msg, size_t len)
{
int n;
char* cmsg;
@ -115,7 +115,7 @@ GetComponentCountF(int *id)
}
void
GetComponentF(int *id, int *n, char* comp, unsigned int line_length)
GetComponentF(int *id, int *n, char* comp, size_t line_length)
{
padfstring(comp, ::GetComponent(*id, (*n) - 1), line_length);
}
@ -127,7 +127,7 @@ GetCurrentSelectedOutputUserNumberF(int *id)
}
void
GetDumpFileNameF(int *id, char* fname, unsigned int fname_length)
GetDumpFileNameF(int *id, char* fname, size_t fname_length)
{
padfstring(fname, ::GetDumpFileName(*id), fname_length);
}
@ -149,7 +149,7 @@ GetDumpStringLineCountF(int *id)
}
void
GetDumpStringLineF(int *id, int* n, char* line, unsigned int line_length)
GetDumpStringLineF(int *id, int* n, char* line, size_t line_length)
{
padfstring(line, ::GetDumpStringLine(*id, (*n) - 1), line_length);
}
@ -161,7 +161,7 @@ GetDumpStringOnF(int *id)
}
void
GetErrorFileNameF(int *id, char* fname, unsigned int fname_length)
GetErrorFileNameF(int *id, char* fname, size_t fname_length)
{
padfstring(fname, ::GetErrorFileName(*id), fname_length);
}
@ -183,7 +183,7 @@ GetErrorStringLineCountF(int *id)
}
void
GetErrorStringLineF(int *id, int* n, char* line, unsigned int line_length)
GetErrorStringLineF(int *id, int* n, char* line, size_t line_length)
{
padfstring(line, ::GetErrorStringLine(*id, (*n) - 1), line_length);
}
@ -195,7 +195,7 @@ GetErrorStringOnF(int *id)
}
void
GetLogFileNameF(int *id, char* fname, unsigned int fname_length)
GetLogFileNameF(int *id, char* fname, size_t fname_length)
{
padfstring(fname, ::GetLogFileName(*id), fname_length);
}
@ -213,7 +213,7 @@ GetLogStringLineCountF(int *id)
}
void
GetLogStringLineF(int *id, int* n, char* line, unsigned int line_length)
GetLogStringLineF(int *id, int* n, char* line, size_t line_length)
{
padfstring(line, ::GetLogStringLine(*id, (*n) - 1), line_length);
}
@ -231,7 +231,7 @@ GetNthSelectedOutputUserNumberF(int *id, int* n)
}
void
GetOutputFileNameF(int *id, char* fname, unsigned int fname_length)
GetOutputFileNameF(int *id, char* fname, size_t fname_length)
{
padfstring(fname, ::GetOutputFileName(*id), fname_length);
}
@ -243,7 +243,7 @@ GetOutputStringLineCountF(int *id)
}
void
GetOutputStringLineF(int *id, int* n, char* line, unsigned int line_length)
GetOutputStringLineF(int *id, int* n, char* line, size_t line_length)
{
padfstring(line, ::GetOutputStringLine(*id, (*n) - 1), line_length);
}
@ -273,7 +273,7 @@ GetSelectedOutputCountF(int *id)
}
void
GetSelectedOutputFileNameF(int *id, char* fname, unsigned int fname_length)
GetSelectedOutputFileNameF(int *id, char* fname, size_t fname_length)
{
padfstring(fname, ::GetSelectedOutputFileName(*id), fname_length);
}
@ -295,7 +295,7 @@ GetSelectedOutputStringLineCountF(int *id)
}
void
GetSelectedOutputStringLineF(int *id, int* n, char* line, unsigned int line_length)
GetSelectedOutputStringLineF(int *id, int* n, char* line, size_t line_length)
{
padfstring(line, ::GetSelectedOutputStringLine(*id, (*n) - 1), line_length);
}
@ -318,7 +318,7 @@ GetSelectedOutputRowCountF(int *id)
}
IPQ_RESULT
GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length)
GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, size_t svalue_length)
{
IPQ_RESULT result;
VAR v;
@ -360,7 +360,7 @@ GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue,
}
void
GetVersionStringF(char* version, unsigned int version_length)
GetVersionStringF(char* version, size_t version_length)
{
padfstring(version, ::GetVersionString(), version_length);
}
@ -376,13 +376,13 @@ GetWarningStringLineCountF(int *id)
}
void
GetWarningStringLineF(int *id, int* n, char* line, unsigned int line_length)
GetWarningStringLineF(int *id, int* n, char* line, size_t line_length)
{
padfstring(line, ::GetWarningStringLine(*id, (*n) - 1), line_length);
}
int
LoadDatabaseF(int *id, char* filename, unsigned int filename_length)
LoadDatabaseF(int *id, char* filename, size_t filename_length)
{
char* cfilename;
@ -399,7 +399,7 @@ LoadDatabaseF(int *id, char* filename, unsigned int filename_length)
}
int
LoadDatabaseStringF(int *id, char* input, unsigned int input_length)
LoadDatabaseStringF(int *id, char* input, size_t input_length)
{
char* cinput;
@ -440,7 +440,7 @@ RunAccumulatedF(int *id)
}
int
RunFileF(int *id, char* filename, unsigned int filename_length)
RunFileF(int *id, char* filename, size_t filename_length)
{
char* cfilename;
@ -457,7 +457,7 @@ RunFileF(int *id, char* filename, unsigned int filename_length)
}
int
RunStringF(int *id, char* input, unsigned int input_length)
RunStringF(int *id, char* input, size_t input_length)
{
char* cinput;
@ -474,7 +474,7 @@ RunStringF(int *id, char* input, unsigned int input_length)
}
IPQ_RESULT
SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l))
{
return ::SetBasicFortranCallback(*id, fcn);
}
@ -486,7 +486,7 @@ SetCurrentSelectedOutputUserNumberF(int *id, int *n)
}
IPQ_RESULT
SetDumpFileNameF(int *id, char* fname, unsigned int fname_length)
SetDumpFileNameF(int *id, char* fname, size_t fname_length)
{
char* cinput;
@ -515,7 +515,7 @@ SetDumpStringOnF(int *id, int* dump_string_on)
}
IPQ_RESULT
SetErrorFileNameF(int *id, char* fname, unsigned int fname_length)
SetErrorFileNameF(int *id, char* fname, size_t fname_length)
{
char* cinput;
@ -544,7 +544,7 @@ SetErrorStringOnF(int *id, int* error_string_on)
}
IPQ_RESULT
SetLogFileNameF(int *id, char* fname, unsigned int fname_length)
SetLogFileNameF(int *id, char* fname, size_t fname_length)
{
char* cinput;
@ -573,7 +573,7 @@ SetLogStringOnF(int *id, int* log_string_on)
}
IPQ_RESULT
SetOutputFileNameF(int *id, char* fname, unsigned int fname_length)
SetOutputFileNameF(int *id, char* fname, size_t fname_length)
{
char* cinput;
@ -602,7 +602,7 @@ SetOutputStringOnF(int *id, int* output_string_on)
}
IPQ_RESULT
SetSelectedOutputFileNameF(int *id, char* fname, unsigned int fname_length)
SetSelectedOutputFileNameF(int *id, char* fname, size_t fname_length)
{
char* cinput;
@ -629,293 +629,3 @@ SetSelectedOutputStringOnF(int *id, int* selected_output_string_on)
{
return ::SetSelectedOutputStringOn(*id, *selected_output_string_on);
}
#if defined(_WIN32) && !defined(_M_AMD64)
#if defined(__cplusplus)
extern "C" {
#endif
//
// Intel Fortran compiler 9.1 /iface:cvf
//
IPQ_DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int __stdcall ADDERROR(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int __stdcall ADDWARNING(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int __stdcall CLEARACCUMULATEDLINES(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int __stdcall CREATEIPHREEQC(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall GETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETDUMPFILEON(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void __stdcall GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETDUMPSTRINGLINECOUNT(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETDUMPSTRINGON(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall GETERRORFILENAME(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETERRORFILEON(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void __stdcall GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETERRORSTRINGLINECOUNT(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETERRORSTRINGON(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall GETLOGFILENAME(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETLOGFILEON(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall GETLOGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGLINECOUNT(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGON(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETNTHSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall GETOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTFILEON(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void __stdcall GETOUTPUTSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTSTRINGLINECOUNT(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTSTRINGON(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOUNT(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTFILEON(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTSTRINGLINECOUNT(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTSTRINGON(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void __stdcall GETVERSIONSTRING(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETWARNINGSTRINGLINECOUNT(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void __stdcall OUTPUTERRORSTRING(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int __stdcall RUNACCUMULATED(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int __stdcall RUNFILE(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int __stdcall SETBASICFORTRANCALLBACK(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall SETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPFILEON(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPSTRINGON(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int __stdcall SETERRORFILENAME(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETERRORFILEON(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int __stdcall SETERRORSTRINGON(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int __stdcall SETLOGFILENAME(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETLOGFILEON(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall SETLOGSTRINGON(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTFILEON(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTSTRINGON(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTSTRINGON(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#if defined(__cplusplus)
}
#endif
#endif // _WIN32

56
src/fwrap.h
View File

@ -81,71 +81,71 @@
extern "C" {
#endif
IPQ_RESULT AccumulateLineF(int *id, char *line, unsigned int line_length);
int AddErrorF(int *id, char *error_msg, unsigned int len);
int AddWarningF(int *id, char *warn_msg, unsigned int len);
IPQ_RESULT AccumulateLineF(int *id, char *line, size_t line_length);
int AddErrorF(int *id, char *error_msg, size_t len);
int AddWarningF(int *id, char *warn_msg, size_t len);
IPQ_RESULT ClearAccumulatedLinesF(int *id);
int CreateIPhreeqcF(void);
int DestroyIPhreeqcF(int *id);
void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
void GetComponentF(int *id, int* n, char* line, size_t line_length);
int GetComponentCountF(int *id);
int GetCurrentSelectedOutputUserNumberF(int *id);
void GetDumpFileNameF(int *id, char* filename, unsigned int filename_length);
void GetDumpFileNameF(int *id, char* filename, size_t filename_length);
int GetDumpFileOnF(int *id);
void GetDumpStringLineF(int *id, int* n, char* line, unsigned int line_length);
void GetDumpStringLineF(int *id, int* n, char* line, size_t line_length);
int GetDumpStringLineCountF(int *id);
int GetDumpStringOnF(int *id);
void GetErrorFileNameF(int *id, char* filename, unsigned int filename_length);
void GetErrorFileNameF(int *id, char* filename, size_t filename_length);
int GetErrorFileOnF(int *id);
void GetErrorStringLineF(int *id, int* n, char* line, unsigned int line_length);
void GetErrorStringLineF(int *id, int* n, char* line, size_t line_length);
int GetErrorStringLineCountF(int *id);
int GetErrorStringOnF(int *id);
void GetLogFileNameF(int *id, char* filename, unsigned int filename_length);
void GetLogFileNameF(int *id, char* filename, size_t filename_length);
int GetLogFileOnF(int *id);
void GetLogStringLineF(int *id, int* n, char* line, unsigned int line_length);
void GetLogStringLineF(int *id, int* n, char* line, size_t line_length);
int GetLogStringLineCountF(int *id);
int GetLogStringOnF(int *id);
int GetNthSelectedOutputUserNumberF(int *id, int* n);
void GetOutputFileNameF(int *id, char* filename, unsigned int filename_length);
void GetOutputFileNameF(int *id, char* filename, size_t filename_length);
int GetOutputFileOnF(int *id);
void GetOutputStringLineF(int *id, int* n, char* line, unsigned int line_length);
void GetOutputStringLineF(int *id, int* n, char* line, size_t line_length);
int GetOutputStringLineCountF(int *id);
int GetOutputStringOnF(int *id);
int GetSelectedOutputColumnCountF(int *id);
int GetSelectedOutputCountF(int *id);
void GetSelectedOutputFileNameF(int *id, char* filename, unsigned int filename_length);
void GetSelectedOutputFileNameF(int *id, char* filename, size_t filename_length);
int GetSelectedOutputFileOnF(int *id);
int GetSelectedOutputRowCountF(int *id);
void GetSelectedOutputStringLineF(int *id, int* n, char* line, unsigned int line_length);
void GetSelectedOutputStringLineF(int *id, int* n, char* line, size_t line_length);
int GetSelectedOutputStringLineCountF(int *id);
int GetSelectedOutputStringOnF(int *id);
IPQ_RESULT GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length);
void GetVersionStringF(char* version, unsigned int version_length);
void GetWarningStringLineF(int *id, int* n, char* line, unsigned int line_length);
IPQ_RESULT GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, size_t svalue_length);
void GetVersionStringF(char* version, size_t version_length);
void GetWarningStringLineF(int *id, int* n, char* line, size_t line_length);
int GetWarningStringLineCountF(int *id);
int LoadDatabaseF(int *id, char* filename, unsigned int filename_length);
int LoadDatabaseStringF(int *id, char* input, unsigned int input_length);
int LoadDatabaseF(int *id, char* filename, size_t filename_length);
int LoadDatabaseStringF(int *id, char* input, size_t input_length);
void OutputAccumulatedLinesF(int *id);
void OutputErrorStringF(int *id);
void OutputWarningStringF(int *id);
int RunAccumulatedF(int *id);
int RunFileF(int *id, char* filename, unsigned int filename_length);
int RunStringF(int *id, char* input, unsigned int input_length);
IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, int l));
int RunFileF(int *id, char* filename, size_t filename_length);
int RunStringF(int *id, char* input, size_t input_length);
IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l));
IPQ_RESULT SetCurrentSelectedOutputUserNumberF(int *id, int *n);
IPQ_RESULT SetDumpFileNameF(int *id, char* fname, unsigned int fname_length);
IPQ_RESULT SetDumpFileNameF(int *id, char* fname, size_t fname_length);
IPQ_RESULT SetDumpFileOnF(int *id, int* dump_on);
IPQ_RESULT SetDumpStringOnF(int *id, int* dump_string_on);
IPQ_RESULT SetErrorFileNameF(int *id, char* fname, unsigned int fname_length);
IPQ_RESULT SetErrorFileNameF(int *id, char* fname, size_t fname_length);
IPQ_RESULT SetErrorFileOnF(int *id, int* error_file_on);
IPQ_RESULT SetErrorStringOnF(int *id, int* error_string_on);
IPQ_RESULT SetLogFileNameF(int *id, char* fname, unsigned int fname_length);
IPQ_RESULT SetLogFileNameF(int *id, char* fname, size_t fname_length);
IPQ_RESULT SetLogFileOnF(int *id, int* log_file_on);
IPQ_RESULT SetLogStringOnF(int *id, int* log_string_on);
IPQ_RESULT SetOutputFileNameF(int *id, char* fname, unsigned int fname_length);
IPQ_RESULT SetOutputFileNameF(int *id, char* fname, size_t fname_length);
IPQ_RESULT SetOutputFileOnF(int *id, int* output_on);
IPQ_RESULT SetOutputStringOnF(int *id, int* output_string_on);
IPQ_RESULT SetSelectedOutputFileNameF(int *id, char* fname, unsigned int fname_length);
IPQ_RESULT SetSelectedOutputFileNameF(int *id, char* fname, size_t fname_length);
IPQ_RESULT SetSelectedOutputFileOnF(int *id, int* selected_output_file_on);
IPQ_RESULT SetSelectedOutputStringOnF(int *id, int* selected_output_string_on);
@ -153,5 +153,5 @@ extern "C" {
#if defined(__cplusplus)
}
#endif
void padfstring(char *dest, const char *src, unsigned int len);
void padfstring(char *dest, const char *src, size_t len);
#endif /* __FWRAP__H */

22
src/fwrap1.cpp Normal file
View File

@ -0,0 +1,22 @@
#include "IPhreeqc.h"
#include "fwrap.h"
#if defined(_WIN32) && !defined(_M_AMD64)
#if defined(__cplusplus)
extern "C" {
#endif
//
// Intel Fortran compiler 9.1 /iface:cvf
//
#define IPQ_DECL __stdcall
#define IPQ_CASE_UND(name, NAME, name_, NAME_) NAME
#include "fimpl.h"
#if defined(__cplusplus)
}
#endif
#endif

277
src/fwrap2.cpp
View File

@ -3,7 +3,6 @@
#if defined(_WIN32)
#if defined(__cplusplus)
extern "C" {
#endif
@ -11,278 +10,10 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:cvf
//
IPQ_DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int ADDERROR(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int ADDWARNING(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int CLEARACCUMULATEDLINES(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int CREATEIPHREEQC(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int DESTROYIPHREEQC(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int GETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void GETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETDUMPFILEON(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETDUMPSTRINGLINECOUNT(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETDUMPSTRINGON(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void GETERRORFILENAME(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETERRORFILEON(int *id)
{
return GetErrorFileOnF(id);
}
IPQ_DLL_EXPORT void GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETERRORSTRINGLINECOUNT(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETERRORSTRINGON(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void GETLOGFILENAME(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETLOGFILEON(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void GETLOGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETLOGSTRINGON(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int GETLOGSTRINGLINECOUNT(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETNTHSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void GETOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETOUTPUTFILEON(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void GETOUTPUTSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETOUTPUTSTRINGLINECOUNT(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETOUTPUTSTRINGON(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOUNT(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void GETSELECTEDOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTFILEON(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void GETSELECTEDOUTPUTSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTSTRINGLINECOUNT(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTSTRINGON(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void GETVERSIONSTRING(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
IPQ_DLL_EXPORT void GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETWARNINGSTRINGLINECOUNT(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void OUTPUTACCUMULATEDLINES(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void OUTPUTERRORSTRING(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void OUTPUTWARNINGSTRING(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int RUNACCUMULATED(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int SETBASICFORTRANCALLBACK(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int SETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int SETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETDUMPFILEON(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int SETDUMPSTRINGON(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int SETERRORFILENAME(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETERRORFILEON(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int SETERRORSTRINGON(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int SETLOGFILENAME(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETLOGFILEON(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int SETLOGSTRINGON(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int SETOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETOUTPUTFILEON(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int SETOUTPUTSTRINGON(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTFILEON(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTSTRINGON(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL
#define IPQ_CASE_UND(name, NAME, name_, NAME_) NAME
#include "fimpl.h"
#if defined(__cplusplus)
}

278
src/fwrap3.cpp
View File

@ -10,280 +10,10 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:cref /assume:underscore
//
IPQ_DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int adderror_(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int addwarning_(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int clearaccumulatedlines_(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int createiphreeqc_(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int destroyiphreeqc_(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int getcurrentselectedoutputusernumber_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void getdumpfilename_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getdumpfileon_(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getdumpstringlinecount_(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int getdumpstringon_(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void geterrorfilename_(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int geterrorfileon_(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int geterrorstringlinecount_(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int geterrorstringon_(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void getlogfilename_(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getlogfileon_(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void getlogstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getlogstringlinecount_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int getlogstringon_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int getnthselectedoutputusernumber_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void getoutputfilename_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getoutputfileon_(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void getoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getoutputstringlinecount_(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int getoutputstringon_(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcount_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void getselectedoutputfilename_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getselectedoutputfileon_(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int getselectedoutputrowcount_(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void getselectedoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getselectedoutputstringlinecount_(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int getselectedoutputstringon_(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void getversionstring_(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getwarningstringlinecount_(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void outputaccumulatedlines_(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void outputerrorstring_(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void outputwarningstring_(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int runaccumulated_(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int runstring_(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int setbasicfortrancallback_(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int setcurrentselectedoutputusernumber_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int setdumpfilename_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setdumpfileon_(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int setdumpstringon_(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int seterrorfilename_(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int seterrorfileon_(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int seterrorstringon_(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int setlogfilename_(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setlogfileon_(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int setlogstringon_(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int setoutputfilename_(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setoutputfileon_(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int setoutputstringon_(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int setselectedoutputfilename_(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setselectedoutputfileon_(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int setselectedoutputstringon_(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL
#define IPQ_CASE_UND(name, NAME, name_, NAME_) name_
#include "fimpl.h"
#if defined(__cplusplus)
}

278
src/fwrap4.cpp
View File

@ -10,280 +10,10 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:default /names:lowercase
//
IPQ_DLL_EXPORT int accumulateline(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int adderror(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int addwarning(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int clearaccumulatedlines(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int createiphreeqc(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int destroyiphreeqc(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void getcomponent(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getcomponentcount(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int getcurrentselectedoutputusernumber(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void getdumpfilename(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getdumpfileon(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void getdumpstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getdumpstringlinecount(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int getdumpstringon(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void geterrorfilename(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int geterrorfileon(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void geterrorstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int geterrorstringlinecount(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int geterrorstringon(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void getlogfilename(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getlogfileon(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void getlogstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getlogstringlinecount(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int getlogstringon(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int getnthselectedoutputusernumber(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void getoutputfilename(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getoutputfileon(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void getoutputstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getoutputstringlinecount(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int getoutputstringon(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcolumncount(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcount(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void getselectedoutputfilename(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int getselectedoutputfileon(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int getselectedoutputrowcount(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void getselectedoutputstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getselectedoutputstringlinecount(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int getselectedoutputstringon(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void getversionstring(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void getwarningstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int getwarningstringlinecount(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int loaddatabase(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int loaddatabasestring(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void outputaccumulatedlines(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void outputerrorstring(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void outputwarningstring(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int runaccumulated(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int runfile(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int runstring(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int setbasicfortrancallback(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int setcurrentselectedoutputusernumber(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int setdumpfilename(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setdumpfileon(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int setdumpstringon(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int seterrorfilename(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int seterrorfileon(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int seterrorstringon(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int setlogfilename(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setlogfileon(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int setlogstringon(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int setoutputfilename(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setoutputfileon(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int setoutputstringon(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int setselectedoutputfilename(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int setselectedoutputfileon(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int setselectedoutputstringon(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL
#define IPQ_CASE_UND(name, NAME, name_, NAME_) name
#include "fimpl.h"
#if defined(__cplusplus)
}

279
src/fwrap5.cpp
View File

@ -7,284 +7,13 @@
extern "C" {
#endif
//
// Intel Fortran compiler 9.1 /iface:default /names:default /assume:underscore
//
IPQ_DLL_EXPORT int ACCUMULATELINE_(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int ADDERROR_(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int ADDWARNING_(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int CLEARACCUMULATEDLINES_(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int CREATEIPHREEQC_(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int DESTROYIPHREEQC_(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void GETCOMPONENT_(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETCOMPONENTCOUNT_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int GETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void GETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETDUMPFILEON_(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void GETDUMPSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETDUMPSTRINGLINECOUNT_(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETDUMPSTRINGON_(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void GETERRORFILENAME_(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETERRORFILEON_(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void GETERRORSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETERRORSTRINGLINECOUNT_(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETERRORSTRINGON_(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void GETLOGFILENAM_E(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETLOGFILEON_(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void GETLOGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETLOGSTRINGLINECOUNT_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETLOGSTRINGON_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int GETNTHSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void GETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETOUTPUTFILEON_(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void GETOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETOUTPUTSTRINGLINECOUNT_(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETOUTPUTSTRINGON_(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOUNT_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void GETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTFILEO_N(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT_(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void GETSELECTEDOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTSTRINGLINECOUNT_(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTSTRINGON_(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void GETVERSIONSTRING_(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void GETWARNINGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETWARNINGSTRINGLINECOUNT_(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int LOADDATABASE_(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int LOADDATABASESTRING_(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void OUTPUTACCUMULATEDLINES_(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void OUTPUTERRORSTRING_(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void OUTPUTWARNINGSTRING_(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int RUNACCUMULATED_(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int RUNFILE_(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int RUNSTRING_(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int SETBASICFORTRANCALLBACK_(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int SETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETDUMPFILEON_(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int SETDUMPSTRINGON_(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int SETERRORFILENAME_(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETERRORFILEON_(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int SETERRORSTRINGON_(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int SETLOGFILENAME_(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETLOGFILEON_(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int SETLOGSTRINGON_(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int SETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETOUTPUTFILEON_(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int SETOUTPUTSTRINGON_(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTFILEON_(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int SETSELECTEDOUTPUTSTRINGON_(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL
#define IPQ_CASE_UND(name, NAME, name_, NAME_) NAME_
#include "fimpl.h"
#if defined(__cplusplus)
}

280
src/fwrap6.cpp
View File

@ -8,283 +8,13 @@ extern "C" {
#endif
//
// Intel Fortran compiler 9.1 /iface:cvf
// Intel Fortran compiler 9.1 /iface:stdref /names:uppercase /assume:underscore
//
IPQ_DLL_EXPORT int __stdcall ACCUMULATELINE_(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int __stdcall ADDERROR_(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int __stdcall ADDWARNING_(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int __stdcall CLEARACCUMULATEDLINES_(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int __stdcall CREATEIPHREEQC_(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int __stdcall DESTROYIPHREEQC_(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void __stdcall GETCOMPONENT_(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETCOMPONENTCOUNT_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall GETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETDUMPFILEON_(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void __stdcall GETDUMPSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETDUMPSTRINGLINECOUNT_(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETDUMPSTRINGON_(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall GETERRORFILENAME_(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETERRORFILEON_(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void __stdcall GETERRORSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETERRORSTRINGLINECOUNT_(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETERRORSTRINGON_(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall GETLOGFILENAME_(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETLOGFILEON_(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall GETLOGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGLINECOUNT_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGON_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETNTHSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall GETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTFILEON_(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void __stdcall GETOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTSTRINGLINECOUNT_(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETOUTPUTSTRINGON_(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOUNT_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTFILEON_(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT_(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTSTRINGLINECOUNT_(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTSTRINGON_(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void __stdcall GETVERSIONSTRING_(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall GETWARNINGSTRINGLINECOUNT_(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall LOADDATABASE_(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall LOADDATABASESTRING_(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES_(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void __stdcall OUTPUTERRORSTRING_(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING_(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int __stdcall RUNACCUMULATED_(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int __stdcall RUNFILE_(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall RUNSTRING_(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int __stdcall SETBASICFORTRANCALLBACK_(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall SETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPFILEON_(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPSTRINGON_(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int __stdcall SETERRORFILENAME_(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETERRORFILEON_(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int __stdcall SETERRORSTRINGON_(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int __stdcall SETLOGFILENAME_(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETLOGFILEON_(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall SETLOGSTRINGON_(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTFILEON_(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall SETOUTPUTSTRINGON_(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTFILEON_(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int __stdcall SETSELECTEDOUTPUTSTRINGON_(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL __stdcall
#define IPQ_CASE_UND(name, NAME, name_, NAME_) NAME_
#include "fimpl.h"
#if defined(__cplusplus)
}
#endif

279
src/fwrap7.cpp
View File

@ -10,280 +10,11 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:stdref /names:lowercase /assume:underscore
//
IPQ_DLL_EXPORT int __stdcall accumulateline_(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int __stdcall adderror_(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int __stdcall addwarning_(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int __stdcall clearaccumulatedlines_(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int __stdcall createiphreeqc_(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int __stdcall destroyiphreeqc_(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void __stdcall getcomponent_(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getcurrentselectedoutputusernumber_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall getdumpfilename_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getdumpfileon_(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void __stdcall getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getdumpstringlinecount_(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getdumpstringon_(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall geterrorfilename_(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall geterrorfileon_(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void __stdcall geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall geterrorstringlinecount_(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall geterrorstringon_(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall getlogfilename_(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getlogfileon_(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall getlogstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getlogstringlinecount_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getlogstringon_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getnthselectedoutputusernumber_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall getoutputfilename_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getoutputfileon_(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void __stdcall getoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getoutputstringlinecount_(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getoutputstringon_(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputcount_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall getselectedoutputfilename_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputfileon_(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputrowcount_(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void __stdcall getselectedoutputstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputstringlinecount_(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputstringon_(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void __stdcall getversionstring_(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void __stdcall getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getwarningstringlinecount_(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall loaddatabase_(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall loaddatabasestring_(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void __stdcall outputaccumulatedlines_(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void __stdcall outputerrorstring_(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void __stdcall outputwarningstring_(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int __stdcall runaccumulated_(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int __stdcall runfile_(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall runstring_(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int __stdcall setbasicfortrancallback_(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall setcurrentselectedoutputusernumber_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall setdumpfilename_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setdumpfileon_(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int __stdcall setdumpstringon_(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int __stdcall seterrorfilename_(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall seterrorfileon_(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int __stdcall seterrorstringon_(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int __stdcall setlogfilename_(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setlogfileon_(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall setlogstringon_(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall setoutputfilename_(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setoutputfileon_(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall setoutputstringon_(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall setselectedoutputfilename_(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setselectedoutputfileon_(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int __stdcall setselectedoutputstringon_(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL __stdcall
#define IPQ_CASE_UND(name, NAME, name_, NAME_) name_
#include "fimpl.h"
#if defined(__cplusplus)
}
#endif

279
src/fwrap8.cpp
View File

@ -10,280 +10,11 @@ extern "C" {
//
// Intel Fortran compiler 9.1 /iface:stdref /names:lowercase
//
IPQ_DLL_EXPORT int __stdcall accumulateline(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
IPQ_DLL_EXPORT int __stdcall adderror(int *id, char *error_msg, unsigned int len)
{
return AddErrorF(id, error_msg, len);
}
IPQ_DLL_EXPORT int __stdcall addwarning(int *id, char *warn_msg, unsigned int len)
{
return AddWarningF(id, warn_msg, len);
}
IPQ_DLL_EXPORT int __stdcall clearaccumulatedlines(int *id)
{
return ClearAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT int __stdcall createiphreeqc(void)
{
return CreateIPhreeqcF();
}
IPQ_DLL_EXPORT int __stdcall destroyiphreeqc(int *id)
{
return DestroyIPhreeqcF(id);
}
IPQ_DLL_EXPORT void __stdcall getcomponent(int *id, int *n, char* line, unsigned int line_length)
{
GetComponentF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getcomponentcount(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getcurrentselectedoutputusernumber(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall getdumpfilename(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getdumpfileon(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
IPQ_DLL_EXPORT void __stdcall getdumpstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getdumpstringlinecount(int *id)
{
return GetDumpStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getdumpstringon(int *id)
{
return GetDumpStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall geterrorfilename(int *id, char *filename, unsigned int len)
{
GetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall geterrorfileon(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
IPQ_DLL_EXPORT void __stdcall geterrorstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall geterrorstringlinecount(int *id)
{
return GetErrorStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall geterrorstringon(int *id)
{
return GetErrorStringOnF(id);
}
IPQ_DLL_EXPORT void __stdcall getlogfilename(int *id, char *filename, unsigned int len)
{
GetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getlogfileon(int *id)
{
return GetLogFileOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall getlogstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getlogstringlinecount(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getlogstringon(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getnthselectedoutputusernumber(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall getoutputfilename(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getoutputfileon(int *id)
{
return GetOutputFileOnF(id);
}
// GetOutputString
IPQ_DLL_EXPORT void __stdcall getoutputstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getoutputstringlinecount(int *id)
{
return GetOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getoutputstringon(int *id)
{
return GetOutputStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputcolumncount(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputcount(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall getselectedoutputfilename(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputfileon(int *id)
{
return GetSelectedOutputFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputrowcount(int *id)
{
return GetSelectedOutputRowCountF(id);
}
// GetSelectedOutputString
IPQ_DLL_EXPORT void __stdcall getselectedoutputstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetSelectedOutputStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputstringlinecount(int *id)
{
return GetSelectedOutputStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputstringon(int *id)
{
return GetSelectedOutputStringOnF(id);
}
IPQ_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);
}
IPQ_DLL_EXPORT void __stdcall getversionstring(char* version, unsigned int version_length)
{
GetVersionStringF(version, version_length);
}
// GetWarningString
IPQ_DLL_EXPORT void __stdcall getwarningstringline(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int __stdcall getwarningstringlinecount(int *id)
{
return GetWarningStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall loaddatabase(int *id, char *filename, unsigned int len)
{
return LoadDatabaseF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall loaddatabasestring(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
IPQ_DLL_EXPORT void __stdcall outputaccumulatedlines(int *id)
{
OutputAccumulatedLinesF(id);
}
IPQ_DLL_EXPORT void __stdcall outputerrorstring(int *id)
{
OutputErrorStringF(id);
}
IPQ_DLL_EXPORT void __stdcall outputwarningstring(int *id)
{
OutputWarningStringF(id);
}
IPQ_DLL_EXPORT int __stdcall runaccumulated(int *id)
{
return RunAccumulatedF(id);
}
IPQ_DLL_EXPORT int __stdcall runfile(int *id, char *filename, unsigned int len)
{
return RunFileF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall runstring(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int __stdcall setbasicfortrancallback(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall setcurrentselectedoutputusernumber(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall setdumpfilename(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setdumpfileon(int *id, int *dump_on)
{
return SetDumpFileOnF(id, dump_on);
}
IPQ_DLL_EXPORT int __stdcall setdumpstringon(int *id, int *dump_string_on)
{
return SetDumpStringOnF(id, dump_string_on);
}
IPQ_DLL_EXPORT int __stdcall seterrorfilename(int *id, char *filename, unsigned int len)
{
return SetErrorFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall seterrorfileon(int *id, int *error_on)
{
return SetErrorFileOnF(id, error_on);
}
IPQ_DLL_EXPORT int __stdcall seterrorstringon(int *id, int *error_string_on)
{
return SetErrorStringOnF(id, error_string_on);
}
IPQ_DLL_EXPORT int __stdcall setlogfilename(int *id, char *filename, unsigned int len)
{
return SetLogFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setlogfileon(int *id, int *log_on)
{
return SetLogFileOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall setlogstringon(int *id, int *log_on)
{
return SetLogStringOnF(id, log_on);
}
IPQ_DLL_EXPORT int __stdcall setoutputfilename(int *id, char *filename, unsigned int len)
{
return SetOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setoutputfileon(int *id, int *output_on)
{
return SetOutputFileOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall setoutputstringon(int *id, int *output_on)
{
return SetOutputStringOnF(id, output_on);
}
IPQ_DLL_EXPORT int __stdcall setselectedoutputfilename(int *id, char *filename, unsigned int len)
{
return SetSelectedOutputFileNameF(id, filename, len);
}
IPQ_DLL_EXPORT int __stdcall setselectedoutputfileon(int *id, int *selout_file_on)
{
return SetSelectedOutputFileOnF(id, selout_file_on);
}
IPQ_DLL_EXPORT int __stdcall setselectedoutputstringon(int *id, int *selout_string_on)
{
return SetSelectedOutputStringOnF(id, selout_string_on);
}
#define IPQ_DECL __stdcall
#define IPQ_CASE_UND(name, NAME, name_, NAME_) name
#include "fimpl.h"
#if defined(__cplusplus)
}
#endif

24
tests/test_c.2008.vcproj
View File

@ -44,14 +44,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@ -123,14 +122,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -201,12 +199,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -281,12 +278,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -360,14 +356,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@ -439,14 +434,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -517,12 +511,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -597,12 +590,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool

24
tests/test_cxx.2008.vcproj
View File

@ -44,14 +44,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@ -123,14 +122,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -201,12 +199,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -280,12 +277,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -358,14 +354,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@ -437,14 +432,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -515,12 +509,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@ -594,12 +587,11 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include"
AdditionalIncludeDirectories="../include;../src;../src/phreeqcpp"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool

40
tests/test_f.2008.vfproj
View File

@ -5,92 +5,84 @@
<Platform Name="x64"/></Platforms>
<Configurations>
<Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="DebugDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="ReleaseDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="DebugDll|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dllx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="ReleaseDll|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dllx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files>
<Filter Name="Header Files" Filter="fi;fd"/>

40
tests/test_f90.2008.vfproj
View File

@ -5,92 +5,84 @@
<Platform Name="x64"/></Platforms>
<Configurations>
<Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|x64">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="ReleaseDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="ReleaseDll|x64">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include;../src"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="DebugDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="DebugDll|x64">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include;../src" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
copy ex2.in ex2"/>
<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat&#xA;copy ex2.in ex2"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files>
<Filter Name="Header Files" Filter="fi;fd"/>