added missing prototypes and interfaces for fortran

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8494 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-02-15 07:06:38 +00:00
parent f6d279ce20
commit c745dd1aca
3 changed files with 117 additions and 17 deletions

View File

@ -49,6 +49,7 @@
INTEGER(KIND=4) CreateIPhreeqc
INTEGER(KIND=4) DestroyIPhreeqc
INTEGER(KIND=4) GetComponentCount
INTEGER(KIND=4) GetCurrentSelectedOutputUserNumber
LOGICAL(KIND=4) GetDumpFileOn
INTEGER(KIND=4) GetDumpStringLineCount
LOGICAL(KIND=4) GetDumpStringOn

View File

@ -80,6 +80,14 @@
INTEGER(KIND=4) :: GetComponentCount
END FUNCTION GetComponentCount
END INTERFACE
INTERFACE
FUNCTION GetCurrentSelectedOutputUserNumber(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetCurrentSelectedOutputUserNumber
END FUNCTION GetCurrentSelectedOutputUserNumber
END INTERFACE
INTERFACE
@ -123,6 +131,14 @@
END INTERFACE
INTERFACE
SUBROUTINE GetErrorFileName(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(OUT) :: FNAME
END SUBROUTINE GetErrorFileName
END INTERFACE
INTERFACE
FUNCTION GetErrorFileOn(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -139,7 +155,6 @@
END SUBROUTINE
END INTERFACE
INTERFACE
FUNCTION GetErrorStringLineCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -148,6 +163,14 @@
END INTERFACE
INTERFACE
FUNCTION GetErrorStringOn(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4) :: GetErrorStringOn
END FUNCTION GetErrorStringOn
END INTERFACE
INTERFACE
SUBROUTINE GetLogFileName(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -189,6 +212,15 @@
END INTERFACE
INTERFACE
FUNCTION GetNthSelectedOutputUserNumber(ID,N)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4), INTENT(IN) :: N
INTEGER(KIND=4) :: GetNthSelectedOutputUserNumber
END FUNCTION GetNthSelectedOutputUserNumber
END INTERFACE
INTERFACE
SUBROUTINE GetOutputFileName(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -238,6 +270,22 @@
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetSelectedOutputCount
END FUNCTION GetSelectedOutputCount
END INTERFACE
INTERFACE
SUBROUTINE GetSelectedOutputFileName(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(OUT) :: FNAME
END SUBROUTINE GetSelectedOutputFileName
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputFileOn(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -254,14 +302,30 @@
END INTERFACE
INTERFACE
SUBROUTINE GetSelectedOutputStringLine(ID,N,LINE)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4), INTENT(IN) :: N
CHARACTER(LEN=*), INTENT(OUT) :: LINE
END SUBROUTINE
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputStringLineCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetSelectedOutputStringLineCount
END FUNCTION GetSelectedOutputStringLineCount
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputStringOn(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4) :: GetSelectedOutputStringOn
END FUNCTION GetSelectedOutputStringOn
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputValue(ID,ROW,COL,VTYPE,DVALUE,SVALUE)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -275,6 +339,13 @@
END INTERFACE
INTERFACE
SUBROUTINE GetVersionString(VER)
CHARACTER(LEN=*), INTENT(OUT) :: VER
END SUBROUTINE
END INTERFACE
INTERFACE
SUBROUTINE GetWarningStringLine(ID,N,LINE)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -379,6 +450,15 @@
END FUNCTION SetCurrentSelectedOutputUserNumber
END INTERFACE
INTERFACE
FUNCTION SetCurrentSelectedOutputUserNumber(ID,N)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4), INTENT(IN) :: N
INTEGER(KIND=4) :: SetCurrentSelectedOutputUserNumber
END FUNCTION SetCurrentSelectedOutputUserNumber
END INTERFACE
INTERFACE
FUNCTION SetDumpFileName(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -406,6 +486,15 @@
END INTERFACE
INTERFACE
FUNCTION SetErrorFileNameF(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(IN) :: FNAME
INTEGER(KIND=4) :: SetErrorFileNameF
END FUNCTION SetErrorFileNameF
END INTERFACE
INTERFACE
FUNCTION SetErrorFileOn(ID,ERR_FILE_ON)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -478,6 +567,15 @@
END INTERFACE
INTERFACE
FUNCTION SetSelectedOutputFileName(ID,FNAME)
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(IN) :: FNAME
INTEGER(KIND=4) :: SetSelectedOutputFileName
END FUNCTION SetSelectedOutputFileName
END INTERFACE
INTERFACE
FUNCTION SetSelectedOutputFileOn(ID,SEL_ON)
INTEGER(KIND=4), INTENT(IN) :: ID

View File

@ -14,42 +14,42 @@
#define ClearAccumulatedLinesF FC_FUNC (clearaccumulatedlinesf, CLEARACCUMULATEDLINESF)
#define CreateIPhreeqcF FC_FUNC (createiphreeqcf, CREATEIPHREEQCF)
#define DestroyIPhreeqcF FC_FUNC (destroyiphreeqcf, DESTROYIPHREEQCF)
#define GetComponentF FC_FUNC (getcomponentf, GETCOMPONENTF)
#define GetComponentCountF FC_FUNC (getcomponentcountf, GETCOMPONENTCOUNTF)
#define GetCurrentSelectedOutputUserNumberF FC_FUNC (getcurrentselectedoutputusernumberf, GETCURRENTSELECTEDOUTPUTUSERNUMBERF)
#define GetComponentF FC_FUNC (getcomponentf, GETCOMPONENTF)
#define GetDumpFileNameF FC_FUNC (getdumpfilenamef, GETDUMPFILENAMEF)
#define GetDumpFileOnF FC_FUNC (getdumpfileonf, GETDUMPFILEONF)
#define GetDumpStringLineCountF FC_FUNC (getdumpstringlinecountf, GETDUMPSTRINGLINECOUNTF)
#define GetDumpStringLineF FC_FUNC (getdumpstringlinef, GETDUMPSTRINGLINEF)
#define GetDumpStringLineCountF FC_FUNC (getdumpstringlinecountf, GETDUMPSTRINGLINECOUNTF)
#define GetDumpStringOnF FC_FUNC (getdumpstringonf, GETDUMPSTRINGONF)
#define GetErrorFileNameF FC_FUNC (geterrorfilenamef, GETERRORFILENAMEF)
#define GetErrorFileOnF FC_FUNC (geterrorfileonf, GETERRORFILEONF)
#define GetErrorStringLineCountF FC_FUNC (geterrorstringlinecountf, GETERRORSTRINGLINECOUNTF)
#define GetErrorStringLineF FC_FUNC (geterrorstringlinef, GETERRORSTRINGLINEF)
#define GetErrorStringLineCountF FC_FUNC (geterrorstringlinecountf, GETERRORSTRINGLINECOUNTF)
#define GetErrorStringOnF FC_FUNC (geterrorstringonf, GETERRORSTRINGONF)
#define GetLogFileNameF FC_FUNC (getlogfilenamef, GETLOGFILENAMEF)
#define GetLogFileOnF FC_FUNC (getlogfileonf, GETLOGFILEONF)
#define GetLogStringLineCountF FC_FUNC (getlogstringlinecountf, GETLOGSTRINGLINECOUNTF)
#define GetLogStringLineF FC_FUNC (getlogstringlinef, GETLOGSTRINGLINEF)
#define GetLogStringLineCountF FC_FUNC (getlogstringlinecountf, GETLOGSTRINGLINECOUNTF)
#define GetLogStringOnF FC_FUNC (getlogstringonf, GETLOGSTRINGONF)
#define GetNthSelectedOutputUserNumberF FC_FUNC (getnthselectedoutputusernumberf, GETNTHSELECTEDOUTPUTUSERNUMBERF)
#define GetOutputFileNameF FC_FUNC (getoutputfilenamef, GETOUTPUTFILENAMEF)
#define GetOutputFileOnF FC_FUNC (getoutputfileonf, GETOUTPUTFILEONF)
#define GetOutputStringLineCountF FC_FUNC (getoutputstringlinecountf, GETOUTPUTSTRINGLINECOUNTF)
#define GetOutputStringLineF FC_FUNC (getoutputstringlinef, GETOUTPUTSTRINGLINEF)
#define GetOutputStringLineCountF FC_FUNC (getoutputstringlinecountf, GETOUTPUTSTRINGLINECOUNTF)
#define GetOutputStringOnF FC_FUNC (getoutputstringonf, GETOUTPUTSTRINGONF)
#define GetSelectedOutputColumnCountF FC_FUNC (getselectedoutputcolumncountf, GETSELECTEDOUTPUTCOLUMNCOUNTF)
#define GetSelectedOutputCountF FC_FUNC (getselectedoutputcountf, GETSELECTEDOUTPUTCOUNTF)
#define GetSelectedOutputFileNameF FC_FUNC (getselectedoutputfilenamef, GETSELECTEDOUTPUTFILENAMEF)
#define GetSelectedOutputFileOnF FC_FUNC (getselectedoutputfileonf, GETSELECTEDOUTPUTFILEONF)
#define GetSelectedOutputRowCountF FC_FUNC (getselectedoutputrowcountf, GETSELECTEDOUTPUTROWCOUNTF)
#define GetSelectedOutputStringLineCountF FC_FUNC (getselectedoutputstringlinecountf, GETSELECTEDOUTPUTSTRINGLINECOUNTF)
#define GetSelectedOutputStringLineF FC_FUNC (getselectedoutputstringlinef, GETSELECTEDOUTPUTSTRINGLINEF)
#define GetSelectedOutputStringLineCountF FC_FUNC (getselectedoutputstringlinecountf, GETSELECTEDOUTPUTSTRINGLINECOUNTF)
#define GetSelectedOutputStringOnF FC_FUNC (getselectedoutputstringonf, GETSELECTEDOUTPUTSTRINGONF)
#define GetSelectedOutputValueF FC_FUNC (getselectedoutputvaluef, GETSELECTEDOUTPUTVALUEF)
#define GetVersionStringF FC_FUNC (getversionstringf, GETVERSIONSTRINGF)
#define GetWarningStringLineCountF FC_FUNC (getwarningstringlinecountf, GETWARNINGSTRINGLINECOUNTF)
#define GetWarningStringLineF FC_FUNC (getwarningstringlinef, GETWARNINGSTRINGLINEF)
#define GetWarningStringLineCountF FC_FUNC (getwarningstringlinecountf, GETWARNINGSTRINGLINECOUNTF)
#define LoadDatabaseF FC_FUNC (loaddatabasef, LOADDATABASEF)
#define LoadDatabaseStringF FC_FUNC (loaddatabasestringf, LOADDATABASESTRINGF)
#define OutputAccumulatedLinesF FC_FUNC (outputaccumulatedlinesf, OUTPUTACCUMULATEDLINESF)
@ -87,42 +87,42 @@ extern "C" {
IPQ_RESULT ClearAccumulatedLinesF(int *id);
int CreateIPhreeqcF(void);
int DestroyIPhreeqcF(int *id);
void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
int GetComponentCountF(int *id);
int GetCurrentSelectedOutputUserNumberF(int *id);
void GetComponentF(int *id, int* n, char* line, unsigned int line_length);
void GetDumpFileNameF(int *id, char* filename, unsigned int filename_length);
int GetDumpFileOnF(int *id);
int GetDumpStringLineCountF(int *id);
void GetDumpStringLineF(int *id, int* n, char* line, unsigned int line_length);
int GetDumpStringLineCountF(int *id);
int GetDumpStringOnF(int *id);
void GetErrorFileNameF(int *id, char* filename, unsigned int filename_length);
int GetErrorFileOnF(int *id);
int GetErrorStringLineCountF(int *id);
void GetErrorStringLineF(int *id, int* n, char* line, unsigned int line_length);
int GetErrorStringLineCountF(int *id);
int GetErrorStringOnF(int *id);
void GetLogFileNameF(int *id, char* filename, unsigned int filename_length);
int GetLogFileOnF(int *id);
int GetLogStringLineCountF(int *id);
void GetLogStringLineF(int *id, int* n, char* line, unsigned int 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);
int GetOutputFileOnF(int *id);
int GetOutputStringLineCountF(int *id);
void GetOutputStringLineF(int *id, int* n, char* line, unsigned int 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);
int GetSelectedOutputFileOnF(int *id);
int GetSelectedOutputRowCountF(int *id);
int GetSelectedOutputStringLineCountF(int *id);
void GetSelectedOutputStringLineF(int *id, int* n, char* line, unsigned int 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);
int GetWarningStringLineCountF(int *id);
void GetWarningStringLineF(int *id, int* n, char* line, unsigned int 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);
void OutputAccumulatedLinesF(int *id);
@ -149,6 +149,7 @@ extern "C" {
IPQ_RESULT SetSelectedOutputFileOnF(int *id, int* selected_output_file_on);
IPQ_RESULT SetSelectedOutputStringOnF(int *id, int* selected_output_string_on);
#if defined(__cplusplus)
}
#endif