still working on docs

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4332 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-04 07:04:52 +00:00
parent 9de5eada69
commit 0c2b055f18
3 changed files with 808 additions and 496 deletions

View File

@ -16,8 +16,13 @@ AC_DEFINE(USE_PHRQ_ALLOC)
AC_DEFINE(NDEBUG)
# Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
# Check if the fortran interface should be included
AC_MSG_CHECKING([if Fortran interface included])
@ -45,10 +50,16 @@ AC_PROG_LIBTOOL
# Checks for libraries.
# Checks for header files.
AC_CHECK_HEADERS([float.h limits.h memory.h stddef.h stdlib.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_FUNC_STRTOD
AC_CHECK_FUNCS([floor memchr memmove memset pow sqrt strchr strcspn strrchr strstr strtol])
AC_CONFIG_FILES([

View File

@ -15,6 +15,15 @@
INTEGER,PARAMETER :: IPQ_BADINSTANCE = -6
INTERFACE
FUNCTION AccumulateLine(ID, LINE)
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(IN) :: LINE
INTEGER(KIND=4) :: AccumulateLine
END FUNCTION AccumulateLine
END INTERFACE
INTERFACE
FUNCTION CreateIPhreeqc()
INTEGER(KIND=4) :: CreateIPhreeqc
@ -24,12 +33,134 @@
INTERFACE
FUNCTION DestroyIPhreeqc(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: DestroyIPhreeqc
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: DestroyIPhreeqc
END FUNCTION DestroyIPhreeqc
END INTERFACE
INTERFACE
SUBROUTINE GetComponent(ID,N,COMP)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4), INTENT(IN) :: N
CHARACTER(LEN=*), INTENT(OUT) :: COMP
END SUBROUTINE GetComponent
END INTERFACE
INTERFACE
FUNCTION GetComponentCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetComponentCount
END FUNCTION GetComponentCount
END INTERFACE
INTERFACE
SUBROUTINE GetDumpLine(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 GetDumpLineCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetDumpLineCount
END FUNCTION GetDumpLineCount
END INTERFACE
!!! TODO GetDumpOn
!!! GetDumpString not implemented
!!! TODO GetDumpStringOn
INTERFACE
SUBROUTINE GetErrorLine(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 GetErrorLineCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetErrorLineCount
END FUNCTION GetErrorLineCount
END INTERFACE
!!! TODO GetErrorOn
!!! GetLastErrorString not implemented
!!! GetLastWarningString not implemented
!!! TODO GetLogOn
!!! TODO GetOutputOn
INTERFACE
FUNCTION GetSelectedOutputColumnCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetSelectedOutputColumnCount
END FUNCTION GetSelectedOutputColumnCount
END INTERFACE
!!! TODO GetSelectedOutputOn
INTERFACE
FUNCTION GetSelectedOutputRowCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetSelectedOutputRowCount
END FUNCTION GetSelectedOutputRowCount
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputValue(ID,ROW,COL,VTYPE,DVALUE,SVALUE)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4), INTENT(IN) :: ROW
INTEGER(KIND=4), INTENT(IN) :: COL
INTEGER(KIND=4), INTENT(OUT) :: VTYPE
REAL(KIND=8), INTENT(OUT) :: DVALUE
CHARACTER(LEN=*), INTENT(OUT) :: SVALUE
INTEGER(KIND=4) :: GetSelectedOutputValue
END FUNCTION GetSelectedOutputValue
END INTERFACE
INTERFACE
SUBROUTINE GetWarningLine(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 GetWarningLineCount(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: GetWarningLineCount
END FUNCTION GetWarningLineCount
END INTERFACE
INTERFACE
FUNCTION LoadDatabase(ID,FILENAME)
INTEGER(KIND=4), INTENT(IN) :: ID
@ -41,208 +172,108 @@
INTERFACE
FUNCTION LoadDatabaseString(ID,INPUT)
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: INPUT
INTEGER(KIND=4) :: LoadDatabaseString
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(IN) :: INPUT
INTEGER(KIND=4) :: LoadDatabaseString
END FUNCTION LoadDatabaseString
END INTERFACE
INTERFACE
SUBROUTINE OutputLastError(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4), INTENT(IN) :: ID
END SUBROUTINE OutputLastError
END INTERFACE
!!! TODO OutputLastWarning
INTERFACE
SUBROUTINE OutputLines(ID)
INTEGER(KIND=4), INTENT(IN) :: ID
END SUBROUTINE OutputLines
END INTERFACE
INTERFACE
FUNCTION AccumulateLine(ID, LINE)
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: LINE
INTEGER(KIND=4) :: AccumulateLine
END FUNCTION AccumulateLine
END INTERFACE
INTERFACE
FUNCTION RunAccumulated(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: RunAccumulated
INTEGER(KIND=4), INTENT(IN) :: ID
INTEGER(KIND=4) :: RunAccumulated
END FUNCTION RunAccumulated
END INTERFACE
INTERFACE
FUNCTION RunFile(ID,FNAME)
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: FNAME
INTEGER(KIND=4) :: RunFile
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(IN) :: FNAME
INTEGER(KIND=4) :: RunFile
END FUNCTION RunFile
END INTERFACE
INTERFACE
FUNCTION RunString(ID,INPUT)
INTEGER(KIND=4) :: ID
CHARACTER(LEN=*) :: INPUT
INTEGER(KIND=4) :: RunString
INTEGER(KIND=4), INTENT(IN) :: ID
CHARACTER(LEN=*), INTENT(IN) :: INPUT
INTEGER(KIND=4) :: RunString
END FUNCTION RunString
END INTERFACE
INTERFACE
FUNCTION SetSelectedOutputOn(ID,SEL_ON)
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: SEL_ON
INTEGER(KIND=4) :: SetSelectedOutputOn
END FUNCTION SetSelectedOutputOn
END INTERFACE
INTERFACE
FUNCTION SetOutputOn(ID,OUT_ON)
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: OUT_ON
INTEGER(KIND=4) :: SetOutputOn
END FUNCTION SetOutputOn
END INTERFACE
INTERFACE
FUNCTION SetErrorOn(ID,ERR_ON)
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: ERR_ON
INTEGER(KIND=4) :: SetErrorOn
END FUNCTION SetErrorOn
END INTERFACE
INTERFACE
FUNCTION SetLogOn(ID,LOG_ON)
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: LOG_ON
INTEGER(KIND=4) :: SetLogOn
END FUNCTION SetLogOn
END INTERFACE
INTERFACE
FUNCTION SetDumpOn(ID,DUMP_ON)
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: DUMP_ON
INTEGER(KIND=4) :: SetDumpOn
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4), INTENT(IN) :: DUMP_ON
INTEGER(KIND=4) :: SetDumpOn
END FUNCTION SetDumpOn
END INTERFACE
INTERFACE
FUNCTION SetDumpStringOn(ID,DUMP_STRING_ON)
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: DUMP_STRING_ON
INTEGER(KIND=4) :: SetDumpStringOn
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4), INTENT(IN) :: DUMP_STRING_ON
INTEGER(KIND=4) :: SetDumpStringOn
END FUNCTION SetDumpStringOn
END INTERFACE
INTERFACE
SUBROUTINE OutputLines(ID)
INTEGER(KIND=4) :: ID
END SUBROUTINE OutputLines
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputRowCount(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetSelectedOutputRowCount
END FUNCTION GetSelectedOutputRowCount
FUNCTION SetErrorOn(ID,ERR_ON)
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4), INTENT(IN) :: ERR_ON
INTEGER(KIND=4) :: SetErrorOn
END FUNCTION SetErrorOn
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputColumnCount(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetSelectedOutputColumnCount
END FUNCTION GetSelectedOutputColumnCount
FUNCTION SetLogOn(ID,LOG_ON)
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4), INTENT(IN) :: LOG_ON
INTEGER(KIND=4) :: SetLogOn
END FUNCTION SetLogOn
END INTERFACE
INTERFACE
FUNCTION GetSelectedOutputValue(ID,ROW,COL,VTYPE,DVALUE,SVALUE)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: ROW
INTEGER(KIND=4) :: COL
INTEGER(KIND=4) :: VTYPE
REAL(KIND=8) :: DVALUE
CHARACTER(LEN=*) :: SVALUE
INTEGER(KIND=4) :: GetSelectedOutputValue
END FUNCTION GetSelectedOutputValue
FUNCTION SetOutputOn(ID,OUT_ON)
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4), INTENT(IN) :: OUT_ON
INTEGER(KIND=4) :: SetOutputOn
END FUNCTION SetOutputOn
END INTERFACE
INTERFACE
FUNCTION GetDumpLineCount(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetDumpLineCount
END FUNCTION GetDumpLineCount
END INTERFACE
INTERFACE
SUBROUTINE GetDumpLine(ID,N,LINE)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: N
CHARACTER(LEN=*) :: LINE
END SUBROUTINE
END INTERFACE
INTERFACE
FUNCTION GetErrorLineCount(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetErrorLineCount
END FUNCTION GetErrorLineCount
END INTERFACE
INTERFACE
SUBROUTINE GetErrorLine(ID,N,LINE)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: N
CHARACTER(LEN=*) :: LINE
END SUBROUTINE
END INTERFACE
INTERFACE
FUNCTION GetWarningLineCount(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetWarningLineCount
END FUNCTION GetWarningLineCount
END INTERFACE
INTERFACE
SUBROUTINE GetWarningLine(ID,N,LINE)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: N
CHARACTER(LEN=*) :: LINE
END SUBROUTINE
END INTERFACE
INTERFACE
FUNCTION GetComponentCount(ID)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: GetComponentCount
END FUNCTION GetComponentCount
END INTERFACE
INTERFACE
SUBROUTINE GetComponent(ID,N,COMP)
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: N
CHARACTER(LEN=*) :: COMP
END SUBROUTINE GetComponent
FUNCTION SetSelectedOutputOn(ID,SEL_ON)
INTEGER(KIND=4), INTENT(IN) :: ID
LOGICAL(KIND=4), INTENT(IN) :: SEL_ON
INTEGER(KIND=4) :: SetSelectedOutputOn
END FUNCTION SetSelectedOutputOn
END INTERFACE
!!! TODO UnLoadDatabase

File diff suppressed because it is too large Load Diff