mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
still working on autotools integration
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4261 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
ffc76d6a4a
commit
961ceeb1a5
@ -1,3 +1,10 @@
|
||||
# Subdirectories to descend into.
|
||||
SUBDIRS = src test testcpp
|
||||
|
||||
if BUILD_FORTRAN
|
||||
FORTRAN_DIRS = test
|
||||
else
|
||||
FORTRAN_DIRS =
|
||||
endif
|
||||
|
||||
SUBDIRS = src $(FORTRAN_DIRS) testcpp
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
22
configure.ac
22
configure.ac
@ -1,13 +1,28 @@
|
||||
# Prelude.
|
||||
AC_INIT([IPhreeqc], [1.0], [charlton@usgs.gov])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
AC_CONFIG_AUX_DIR([config])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CXX
|
||||
AC_PROG_F77
|
||||
AC_F77_LIBRARY_LDFLAGS
|
||||
|
||||
# Check if the fortran interface should be included
|
||||
AC_MSG_CHECKING([if Fortran interface included])
|
||||
AC_ARG_ENABLE([fortran],
|
||||
[AC_HELP_STRING([--enable-fortran],
|
||||
[include the Fortran interface @<:@default=yes@:>@])],
|
||||
[IPQ_FORTRAN=$enableval],
|
||||
[IPQ_FORTRAN=yes])
|
||||
|
||||
if test "X$IPQ_FORTRAN" = "Xyes"; then
|
||||
echo "yes"
|
||||
AC_PROG_F77
|
||||
AC_F77_LIBRARY_LDFLAGS
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
AM_CONDITIONAL([BUILD_FORTRAN], [test "X$IPQ_FORTRAN" = "Xyes"])
|
||||
|
||||
# Disable shared library building by default (use --enable-shared to enable)
|
||||
AC_DISABLE_SHARED
|
||||
@ -16,3 +31,4 @@ AC_PROG_LIBTOOL
|
||||
# Output files.
|
||||
AC_CONFIG_FILES([Makefile src/Makefile test/Makefile testcpp/Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ PROJECT_NAME = IPhreeqc
|
||||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = BETA
|
||||
PROJECT_NUMBER = 1.0
|
||||
|
||||
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
|
||||
# base path where the generated documentation will be put.
|
||||
|
||||
@ -1,108 +1,73 @@
|
||||
! GetSelectedOutputValue TYPES
|
||||
INTEGER :: TT_EMPTY
|
||||
PARAMETER (TT_EMPTY=0)
|
||||
!
|
||||
! GetSelectedOutputValue TYPES
|
||||
!
|
||||
INTEGER :: TT_EMPTY
|
||||
PARAMETER (TT_EMPTY=0)
|
||||
|
||||
INTEGER :: TT_ERROR
|
||||
PARAMETER (TT_ERROR=1)
|
||||
INTEGER :: TT_ERROR
|
||||
PARAMETER (TT_ERROR=1)
|
||||
|
||||
INTEGER :: TT_DOUBLE
|
||||
PARAMETER (TT_DOUBLE=3)
|
||||
INTEGER :: TT_DOUBLE
|
||||
PARAMETER (TT_DOUBLE=3)
|
||||
|
||||
INTEGER :: TT_STRING
|
||||
PARAMETER (TT_STRING=4)
|
||||
INTEGER :: TT_STRING
|
||||
PARAMETER (TT_STRING=4)
|
||||
|
||||
!
|
||||
! IPQ_RESULT TYPES
|
||||
!
|
||||
|
||||
! ERROR (TT_ERROR) TYPES
|
||||
INTEGER :: VR_OK
|
||||
PARAMETER (VR_OK=0)
|
||||
INTEGER :: IPQ_OK
|
||||
PARAMETER (IPQ_OK=0)
|
||||
|
||||
INTEGER :: VR_OUTOFMEMORY
|
||||
PARAMETER (VR_OUTOFMEMORY=1)
|
||||
INTEGER :: IPQ_OUTOFMEMORY
|
||||
PARAMETER (IPQ_OUTOFMEMORY=-1)
|
||||
|
||||
INTEGER :: IPQ_BADVARTYPE
|
||||
PARAMETER (IPQ_BADVARTYPE=-2)
|
||||
|
||||
INTEGER :: VR_BADVARTYPE
|
||||
PARAMETER (VR_BADVARTYPE=2)
|
||||
INTEGER :: IPQ_INVALIDARG
|
||||
PARAMETER (IPQ_INVALIDARG=-3)
|
||||
|
||||
INTEGER :: VR_INVALIDARG
|
||||
PARAMETER (VR_INVALIDARG=3)
|
||||
INTEGER :: IPQ_INVALIDROW
|
||||
PARAMETER (IPQ_INVALIDROW=-4)
|
||||
|
||||
INTEGER :: VR_INVALIDROW
|
||||
PARAMETER (VR_INVALIDROW=4)
|
||||
INTEGER :: IPQ_INVALIDCOL
|
||||
PARAMETER (IPQ_INVALIDCOL=-5)
|
||||
|
||||
INTEGER :: VR_INVALIDCOL
|
||||
PARAMETER (VR_INVALIDCOL=5)
|
||||
INTEGER :: IPQ_BADINSTANCE
|
||||
PARAMETER (IPQ_BADINSTANCE=-6)
|
||||
|
||||
!
|
||||
! function prototypes
|
||||
!
|
||||
|
||||
! function prototypes
|
||||
|
||||
INTEGER AccumulateLine
|
||||
INTEGER GetSelectedOutputColumnCount
|
||||
INTEGER GetSelectedOutputRowCount
|
||||
INTEGER GetSelectedOutputValue
|
||||
INTEGER LoadDatabase
|
||||
INTEGER RunAccumulated
|
||||
INTEGER RunFile !! (FILENAME,OUTPUT_ON,ERROR_ON,LOG_ON,SELECTED_ON)
|
||||
|
||||
|
||||
!!REM INTERFACE
|
||||
!!REM FUNCTION LoadDatabase(FILENAME)
|
||||
!!REM CHARACTER(LEN=*) :: FILENAME
|
||||
!!REM INTEGER(KIND=4) :: LoadDatabase
|
||||
!!REM END FUNCTION LoadDatabase
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM SUBROUTINE OutputLastError
|
||||
!!REM END SUBROUTINE OutputLastError
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM FUNCTION AccumulateLine(LINE)
|
||||
!!REM CHARACTER(LEN=*) :: LINE
|
||||
!!REM INTEGER(KIND=4) :: AccumulateLine
|
||||
!!REM END FUNCTION AccumulateLine
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM FUNCTION Run(OUTPUT_ON, ERROR_ON, LOG_ON, SELECTED_ON)
|
||||
!!REM LOGICAL(KIND=4) :: OUTPUT_ON
|
||||
!!REM LOGICAL(KIND=4) :: ERROR_ON
|
||||
!!REM LOGICAL(KIND=4) :: LOG_ON
|
||||
!!REM LOGICAL(KIND=4) :: SELECTED_ON
|
||||
!!REM INTEGER(KIND=4) :: Run
|
||||
!!REM END FUNCTION Run
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM SUBROUTINE OutputLines
|
||||
!!REM END SUBROUTINE OutputLines
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM FUNCTION GetSelectedOutputRowCount
|
||||
!!REM INTEGER(KIND=4) :: GetSelectedOutputRowCount
|
||||
!!REM END FUNCTION GetSelectedOutputRowCount
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM FUNCTION GetSelectedOutputColumnCount
|
||||
!!REM INTEGER(KIND=4) :: GetSelectedOutputColumnCount
|
||||
!!REM END FUNCTION GetSelectedOutputColumnCount
|
||||
!!REM END INTERFACE
|
||||
!!REM
|
||||
!!REM
|
||||
!!REM INTERFACE
|
||||
!!REM FUNCTION GetSelectedOutputValue(ROW,COL,VTYPE,DVALUE,SVALUE)
|
||||
!!REM INTEGER(KIND=4) :: ROW
|
||||
!!REM INTEGER(KIND=4) :: COL
|
||||
!!REM INTEGER(KIND=4) :: VTYPE
|
||||
!!REM REAL(KIND=8) :: DVALUE
|
||||
!!REM CHARACTER(LEN=*) :: SVALUE
|
||||
!!REM INTEGER(KIND=4) :: GetSelectedOutputValue
|
||||
!!REM END FUNCTION GetSelectedOutputValue
|
||||
!!REM END INTERFACE
|
||||
INTEGER AccumulateLine
|
||||
INTEGER CreateIPhreeqc
|
||||
INTEGER DestroyIPhreeqc
|
||||
INTEGER GetComponent
|
||||
INTEGER GetComponentCount
|
||||
INTEGER GetDumpLine
|
||||
INTEGER GetDumpLineCount
|
||||
INTEGER GetErrorLine
|
||||
INTEGER GetErrorLineCount
|
||||
INTEGER GetSelectedOutputColumnCount
|
||||
INTEGER GetSelectedOutputRowCount
|
||||
INTEGER GetSelectedOutputValue
|
||||
INTEGER GetWarningLine
|
||||
INTEGER GetWarningLineCount
|
||||
INTEGER LoadDatabase
|
||||
INTEGER LoadDatabaseString
|
||||
!! INTEGER OutputLastError
|
||||
INTEGER OutputLastWarning
|
||||
INTEGER OutputLines
|
||||
INTEGER RunAccumulated
|
||||
INTEGER RunFile
|
||||
INTEGER RunString
|
||||
INTEGER SetDumpOn
|
||||
INTEGER SetDumpStringOn
|
||||
INTEGER SetErrorOn
|
||||
INTEGER SetLogOn
|
||||
INTEGER SetOutputOn
|
||||
INTEGER SetSelectedOutputOn
|
||||
INTEGER UnLoadDatabase
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
INTEGER,PARAMETER :: IPQ_INVALIDARG = -3
|
||||
INTEGER,PARAMETER :: IPQ_INVALIDROW = -4
|
||||
INTEGER,PARAMETER :: IPQ_INVALIDCOL = -5
|
||||
INTEGER,PARAMETER :: IPQ_BADINSTANCE = -6
|
||||
|
||||
|
||||
INTERFACE
|
||||
@ -21,11 +22,19 @@
|
||||
END INTERFACE
|
||||
|
||||
|
||||
INTERFACE
|
||||
FUNCTION DestroyIPhreeqc(ID)
|
||||
INTEGER(KIND=4), INTENT(IN) :: ID
|
||||
INTEGER(KIND=4) :: DestroyIPhreeqc
|
||||
END FUNCTION DestroyIPhreeqc
|
||||
END INTERFACE
|
||||
|
||||
|
||||
INTERFACE
|
||||
FUNCTION LoadDatabase(ID,FILENAME)
|
||||
INTEGER(KIND=4) :: ID
|
||||
CHARACTER(LEN=*) :: FILENAME
|
||||
INTEGER(KIND=4) :: LoadDatabase
|
||||
INTEGER(KIND=4), INTENT(IN) :: ID
|
||||
CHARACTER(LEN=*), INTENT(IN) :: FILENAME
|
||||
INTEGER(KIND=4) :: LoadDatabase
|
||||
END FUNCTION LoadDatabase
|
||||
END INTERFACE
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
#define INC_IPHREEQC_H
|
||||
|
||||
#include <map>
|
||||
|
||||
#include "Var.h"
|
||||
|
||||
#if defined(_WINDLL)
|
||||
@ -14,13 +13,13 @@
|
||||
/*! \brief Enumeration used to return error codes.
|
||||
*/
|
||||
typedef enum {
|
||||
IPQ_OK = 0,
|
||||
IPQ_OUTOFMEMORY = -1,
|
||||
IPQ_BADVARTYPE = -2,
|
||||
IPQ_INVALIDARG = -3,
|
||||
IPQ_INVALIDROW = -4,
|
||||
IPQ_INVALIDCOL = -5,
|
||||
IPQ_BADINSTANCE = -6,
|
||||
IPQ_OK = 0, /*!< Success */
|
||||
IPQ_OUTOFMEMORY = -1, /*!< Failure, Out of memory */
|
||||
IPQ_BADVARTYPE = -2, /*!< Failure, Invalid VAR type */
|
||||
IPQ_INVALIDARG = -3, /*!< Failure, Invalid argument */
|
||||
IPQ_INVALIDROW = -4, /*!< Failure, Invalid row */
|
||||
IPQ_INVALIDCOL = -5, /*!< Failure, Invalid column */
|
||||
IPQ_BADINSTANCE = -6, /*!< Failure, Invalid instance id */
|
||||
} IPQ_RESULT;
|
||||
|
||||
|
||||
@ -37,12 +36,42 @@ extern "C" {
|
||||
*/
|
||||
DLL_EXPORT int AddError(int id, const char* error_msg);
|
||||
|
||||
/**
|
||||
* Create a new IPhreeqc instance.
|
||||
* @return A IPhreeqc instance id.
|
||||
* @par Fortran90 Interface:
|
||||
* @htmlonly
|
||||
* <CODE>
|
||||
* <PRE>
|
||||
* FUNCTION CreateIPhreeqc()
|
||||
* INTEGER(KIND=4) :: CreateIPhreeqc
|
||||
* END FUNCTION CreateIPhreeqc
|
||||
* </PRE>
|
||||
* </CODE>
|
||||
* @endhtmlonly
|
||||
*/
|
||||
DLL_EXPORT int CreateIPhreeqc(void);
|
||||
|
||||
/**
|
||||
* Release an IPhreeqc instance from memory.
|
||||
* @param id Id returned from CreateIPhreeqc
|
||||
* @par Fortran90 Interface:
|
||||
* @htmlonly
|
||||
* <CODE>
|
||||
* <PRE>
|
||||
* FUNCTION DestroyIPhreeqc(ID)
|
||||
* INTEGER(KIND=4) :: ID
|
||||
* INTEGER(KIND=4) :: DestroyIPhreeqc
|
||||
* END FUNCTION DestroyIPhreeqc
|
||||
* </PRE>
|
||||
* </CODE>
|
||||
* @endhtmlonly
|
||||
*/
|
||||
DLL_EXPORT IPQ_RESULT DestroyIPhreeqc(int id);
|
||||
|
||||
/**
|
||||
* Load the specified database file into phreeqc.
|
||||
* @param id Id returned from CreateIPhreeqc
|
||||
* @param filename The name of the phreeqc database to load.
|
||||
* The full path will be required if the file is not
|
||||
* in the current working directory.
|
||||
@ -336,7 +365,7 @@ extern "C" {
|
||||
* @remarks
|
||||
* Row 0 contains the column headings to the selected_ouput.
|
||||
* @par Examples:
|
||||
* The headings will include a suffix and/or prefix in order to differentiate the
|
||||
* The headings will include a suffix and/or prefix in order to differentiate the
|
||||
* columns.
|
||||
* @htmlonly
|
||||
<p>
|
||||
@ -522,7 +551,7 @@ Headings
|
||||
DLL_EXPORT const char* GetComponent(int id, int n);
|
||||
|
||||
/**
|
||||
* Send the accumulated input to stdout.
|
||||
* Send the accumulated input to stdout.
|
||||
* This is the input that will be used for the next call to RunAccumulated.
|
||||
* @par Fortran90 Interface:
|
||||
* @htmlonly
|
||||
|
||||
@ -246,11 +246,3 @@
|
||||
INTEGER :: GetWarningLineF
|
||||
GetWarningLine = GetWarningLineF(ID,N,LINE)
|
||||
END FUNCTION GetWarningLine
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! FUNCTION System(COMMAND)
|
||||
!! IMPLICIT NONE
|
||||
!! CHARACTER(LEN=*) :: COMMAND
|
||||
!! INTEGER :: System
|
||||
!! INTEGER :: SystemF
|
||||
!! System = SystemF(COMMAND)
|
||||
!! END FUNCTION System
|
||||
|
||||
297
src/Makefile.am
297
src/Makefile.am
@ -4,149 +4,158 @@ lib_LTLIBRARIES=libiphreeqc.la
|
||||
|
||||
# library sources
|
||||
libiphreeqc_la_SOURCES=\
|
||||
CVar.hxx\
|
||||
Debug.h\
|
||||
ErrorReporter.hxx\
|
||||
fwrap.cpp\
|
||||
fwrap.h\
|
||||
fwrap2.cpp\
|
||||
fwrap3.cpp\
|
||||
IPhreeqc.cpp\
|
||||
IPhreeqcF.F\
|
||||
IPhreeqcLib.cpp\
|
||||
SelectedOutput.cpp\
|
||||
SelectedOutput.hxx\
|
||||
Var.c\
|
||||
phreeqcpp/char_star.h\
|
||||
phreeqcpp/cxxKinetics.cxx\
|
||||
phreeqcpp/cxxKinetics.h\
|
||||
phreeqcpp/cxxMix.cxx\
|
||||
phreeqcpp/cxxMix.h\
|
||||
phreeqcpp/Dictionary.h\
|
||||
phreeqcpp/dumper.cpp\
|
||||
phreeqcpp/dumper.h\
|
||||
phreeqcpp/Exchange.cxx\
|
||||
phreeqcpp/Exchange.h\
|
||||
phreeqcpp/ExchComp.cxx\
|
||||
phreeqcpp/ExchComp.h\
|
||||
phreeqcpp/GasPhase.cxx\
|
||||
phreeqcpp/GasPhase.h\
|
||||
phreeqcpp/ISolution.cxx\
|
||||
phreeqcpp/ISolution.h\
|
||||
phreeqcpp/ISolutionComp.cxx\
|
||||
phreeqcpp/ISolutionComp.h\
|
||||
phreeqcpp/KineticsComp.cxx\
|
||||
phreeqcpp/KineticsComp.h\
|
||||
phreeqcpp/NameDouble.cxx\
|
||||
phreeqcpp/NameDouble.h\
|
||||
phreeqcpp/NumKeyword.cxx\
|
||||
phreeqcpp/NumKeyword.h\
|
||||
phreeqcpp/Parser.cxx\
|
||||
phreeqcpp/Parser.h\
|
||||
phreeqcpp/Phreeqc.cpp\
|
||||
phreeqcpp/Phreeqc.h\
|
||||
phreeqcpp/Phreeqc_class.h\
|
||||
phreeqcpp/PPassemblage.cxx\
|
||||
phreeqcpp/PPassemblage.h\
|
||||
phreeqcpp/PPassemblageComp.cxx\
|
||||
phreeqcpp/PPassemblageComp.h\
|
||||
phreeqcpp/Reaction.cxx\
|
||||
phreeqcpp/Reaction.h\
|
||||
phreeqcpp/ReadClass.cxx\
|
||||
phreeqcpp/runner.cpp\
|
||||
phreeqcpp/runner.h\
|
||||
phreeqcpp/SAXPhreeqc.h\
|
||||
phreeqcpp/SaxPhreeqcHandlers.h\
|
||||
phreeqcpp/Solution.cxx\
|
||||
phreeqcpp/Solution.h\
|
||||
phreeqcpp/SolutionIsotope.cxx\
|
||||
phreeqcpp/SolutionIsotope.h\
|
||||
phreeqcpp/SolutionIsotopeList.cxx\
|
||||
phreeqcpp/SolutionIsotopeList.h\
|
||||
phreeqcpp/SSassemblage.cxx\
|
||||
phreeqcpp/SSassemblage.h\
|
||||
phreeqcpp/SSassemblageSS.cxx\
|
||||
phreeqcpp/SSassemblageSS.h\
|
||||
phreeqcpp/StorageBin.cxx\
|
||||
phreeqcpp/StorageBin.h\
|
||||
phreeqcpp/StorageBinList.cpp\
|
||||
phreeqcpp/StorageBinList.h\
|
||||
phreeqcpp/Surface.cxx\
|
||||
phreeqcpp/Surface.h\
|
||||
phreeqcpp/SurfaceCharge.cxx\
|
||||
phreeqcpp/SurfaceCharge.h\
|
||||
phreeqcpp/SurfaceComp.cxx\
|
||||
phreeqcpp/SurfaceComp.h\
|
||||
phreeqcpp/System.cxx\
|
||||
phreeqcpp/System.h\
|
||||
phreeqcpp/Temperature.cxx\
|
||||
phreeqcpp/Temperature.h\
|
||||
phreeqcpp/Utils.cxx\
|
||||
phreeqcpp/Utils.h\
|
||||
phreeqcpp/cxx/advection.cxx\
|
||||
phreeqcpp/cxx/basic.cxx\
|
||||
phreeqcpp/cxx/basic.h\
|
||||
phreeqcpp/cxx/basicsubs.cxx\
|
||||
phreeqcpp/cxx/cl1.cxx\
|
||||
phreeqcpp/cxx/cvdense.cxx\
|
||||
phreeqcpp/cxx/cvdense.h\
|
||||
phreeqcpp/cxx/cvode.cxx\
|
||||
phreeqcpp/cxx/cvode.h\
|
||||
phreeqcpp/cxx/dense.cxx\
|
||||
phreeqcpp/cxx/dense.h\
|
||||
phreeqcpp/cxx/dw.cxx\
|
||||
phreeqcpp/cxx/global.h\
|
||||
phreeqcpp/cxx/global_structures.h\
|
||||
phreeqcpp/cxx/input.cxx\
|
||||
phreeqcpp/cxx/input.h\
|
||||
phreeqcpp/cxx/integrate.cxx\
|
||||
phreeqcpp/cxx/inverse.cxx\
|
||||
phreeqcpp/cxx/isotopes.cxx\
|
||||
phreeqcpp/cxx/kinetics.cxx\
|
||||
phreeqcpp/cxx/kinetics.h\
|
||||
phreeqcpp/cxx/mainsubs.cxx\
|
||||
phreeqcpp/cxx/model.cxx\
|
||||
phreeqcpp/cxx/nvector.cxx\
|
||||
phreeqcpp/cxx/nvector.h\
|
||||
phreeqcpp/cxx/nvector_serial.cxx\
|
||||
phreeqcpp/cxx/nvector_serial.h\
|
||||
phreeqcpp/cxx/output.cxx\
|
||||
phreeqcpp/cxx/output.h\
|
||||
phreeqcpp/cxx/p2c.h\
|
||||
phreeqcpp/cxx/p2clib.cxx\
|
||||
phreeqcpp/cxx/parse.cxx\
|
||||
phreeqcpp/cxx/phqalloc.cxx\
|
||||
phreeqcpp/cxx/phqalloc.h\
|
||||
phreeqcpp/cxx/phreeqc_files.cxx\
|
||||
phreeqcpp/cxx/phrqproto.h\
|
||||
phreeqcpp/cxx/phrqtype.h\
|
||||
phreeqcpp/cxx/pitzer.cxx\
|
||||
phreeqcpp/cxx/pitzer.h\
|
||||
phreeqcpp/cxx/pitzer_structures.cxx\
|
||||
phreeqcpp/cxx/pitzer_structures.h\
|
||||
phreeqcpp/cxx/prep.cxx\
|
||||
phreeqcpp/cxx/print.cxx\
|
||||
phreeqcpp/cxx/read.cxx\
|
||||
phreeqcpp/cxx/readtr.cxx\
|
||||
phreeqcpp/cxx/sit.cxx\
|
||||
phreeqcpp/cxx/smalldense.cxx\
|
||||
phreeqcpp/cxx/smalldense.h\
|
||||
phreeqcpp/cxx/spread.cxx\
|
||||
phreeqcpp/cxx/step.cxx\
|
||||
phreeqcpp/cxx/structures.cxx\
|
||||
phreeqcpp/cxx/sundialsmath.cxx\
|
||||
phreeqcpp/cxx/sundialsmath.h\
|
||||
phreeqcpp/cxx/sundialstypes.h\
|
||||
phreeqcpp/cxx/tally.cxx\
|
||||
phreeqcpp/cxx/tidy.cxx\
|
||||
phreeqcpp/cxx/transport.cxx\
|
||||
phreeqcpp/cxx/utilities.cxx
|
||||
CVar.hxx\
|
||||
Debug.h\
|
||||
ErrorReporter.hxx\
|
||||
IPhreeqc.cpp\
|
||||
IPhreeqcLib.cpp\
|
||||
SelectedOutput.cpp\
|
||||
SelectedOutput.hxx\
|
||||
Var.c\
|
||||
phreeqcpp/char_star.h\
|
||||
phreeqcpp/cxxKinetics.cxx\
|
||||
phreeqcpp/cxxKinetics.h\
|
||||
phreeqcpp/cxxMix.cxx\
|
||||
phreeqcpp/cxxMix.h\
|
||||
phreeqcpp/Dictionary.h\
|
||||
phreeqcpp/dumper.cpp\
|
||||
phreeqcpp/dumper.h\
|
||||
phreeqcpp/Exchange.cxx\
|
||||
phreeqcpp/Exchange.h\
|
||||
phreeqcpp/ExchComp.cxx\
|
||||
phreeqcpp/ExchComp.h\
|
||||
phreeqcpp/GasPhase.cxx\
|
||||
phreeqcpp/GasPhase.h\
|
||||
phreeqcpp/ISolution.cxx\
|
||||
phreeqcpp/ISolution.h\
|
||||
phreeqcpp/ISolutionComp.cxx\
|
||||
phreeqcpp/ISolutionComp.h\
|
||||
phreeqcpp/KineticsComp.cxx\
|
||||
phreeqcpp/KineticsComp.h\
|
||||
phreeqcpp/NameDouble.cxx\
|
||||
phreeqcpp/NameDouble.h\
|
||||
phreeqcpp/NumKeyword.cxx\
|
||||
phreeqcpp/NumKeyword.h\
|
||||
phreeqcpp/Parser.cxx\
|
||||
phreeqcpp/Parser.h\
|
||||
phreeqcpp/Phreeqc.cpp\
|
||||
phreeqcpp/Phreeqc.h\
|
||||
phreeqcpp/Phreeqc_class.h\
|
||||
phreeqcpp/PPassemblage.cxx\
|
||||
phreeqcpp/PPassemblage.h\
|
||||
phreeqcpp/PPassemblageComp.cxx\
|
||||
phreeqcpp/PPassemblageComp.h\
|
||||
phreeqcpp/Reaction.cxx\
|
||||
phreeqcpp/Reaction.h\
|
||||
phreeqcpp/ReadClass.cxx\
|
||||
phreeqcpp/runner.cpp\
|
||||
phreeqcpp/runner.h\
|
||||
phreeqcpp/SAXPhreeqc.h\
|
||||
phreeqcpp/SaxPhreeqcHandlers.h\
|
||||
phreeqcpp/Solution.cxx\
|
||||
phreeqcpp/Solution.h\
|
||||
phreeqcpp/SolutionIsotope.cxx\
|
||||
phreeqcpp/SolutionIsotope.h\
|
||||
phreeqcpp/SolutionIsotopeList.cxx\
|
||||
phreeqcpp/SolutionIsotopeList.h\
|
||||
phreeqcpp/SSassemblage.cxx\
|
||||
phreeqcpp/SSassemblage.h\
|
||||
phreeqcpp/SSassemblageSS.cxx\
|
||||
phreeqcpp/SSassemblageSS.h\
|
||||
phreeqcpp/StorageBin.cxx\
|
||||
phreeqcpp/StorageBin.h\
|
||||
phreeqcpp/StorageBinList.cpp\
|
||||
phreeqcpp/StorageBinList.h\
|
||||
phreeqcpp/Surface.cxx\
|
||||
phreeqcpp/Surface.h\
|
||||
phreeqcpp/SurfaceCharge.cxx\
|
||||
phreeqcpp/SurfaceCharge.h\
|
||||
phreeqcpp/SurfaceComp.cxx\
|
||||
phreeqcpp/SurfaceComp.h\
|
||||
phreeqcpp/System.cxx\
|
||||
phreeqcpp/System.h\
|
||||
phreeqcpp/Temperature.cxx\
|
||||
phreeqcpp/Temperature.h\
|
||||
phreeqcpp/Utils.cxx\
|
||||
phreeqcpp/Utils.h\
|
||||
phreeqcpp/cxx/advection.cxx\
|
||||
phreeqcpp/cxx/basic.cxx\
|
||||
phreeqcpp/cxx/basic.h\
|
||||
phreeqcpp/cxx/basicsubs.cxx\
|
||||
phreeqcpp/cxx/cl1.cxx\
|
||||
phreeqcpp/cxx/cvdense.cxx\
|
||||
phreeqcpp/cxx/cvdense.h\
|
||||
phreeqcpp/cxx/cvode.cxx\
|
||||
phreeqcpp/cxx/cvode.h\
|
||||
phreeqcpp/cxx/dense.cxx\
|
||||
phreeqcpp/cxx/dense.h\
|
||||
phreeqcpp/cxx/dw.cxx\
|
||||
phreeqcpp/cxx/global.h\
|
||||
phreeqcpp/cxx/global_structures.h\
|
||||
phreeqcpp/cxx/input.cxx\
|
||||
phreeqcpp/cxx/input.h\
|
||||
phreeqcpp/cxx/integrate.cxx\
|
||||
phreeqcpp/cxx/inverse.cxx\
|
||||
phreeqcpp/cxx/isotopes.cxx\
|
||||
phreeqcpp/cxx/kinetics.cxx\
|
||||
phreeqcpp/cxx/kinetics.h\
|
||||
phreeqcpp/cxx/mainsubs.cxx\
|
||||
phreeqcpp/cxx/model.cxx\
|
||||
phreeqcpp/cxx/nvector.cxx\
|
||||
phreeqcpp/cxx/nvector.h\
|
||||
phreeqcpp/cxx/nvector_serial.cxx\
|
||||
phreeqcpp/cxx/nvector_serial.h\
|
||||
phreeqcpp/cxx/output.cxx\
|
||||
phreeqcpp/cxx/output.h\
|
||||
phreeqcpp/cxx/p2c.h\
|
||||
phreeqcpp/cxx/p2clib.cxx\
|
||||
phreeqcpp/cxx/parse.cxx\
|
||||
phreeqcpp/cxx/phqalloc.cxx\
|
||||
phreeqcpp/cxx/phqalloc.h\
|
||||
phreeqcpp/cxx/phreeqc_files.cxx\
|
||||
phreeqcpp/cxx/phrqproto.h\
|
||||
phreeqcpp/cxx/phrqtype.h\
|
||||
phreeqcpp/cxx/pitzer.cxx\
|
||||
phreeqcpp/cxx/pitzer.h\
|
||||
phreeqcpp/cxx/pitzer_structures.cxx\
|
||||
phreeqcpp/cxx/pitzer_structures.h\
|
||||
phreeqcpp/cxx/prep.cxx\
|
||||
phreeqcpp/cxx/print.cxx\
|
||||
phreeqcpp/cxx/read.cxx\
|
||||
phreeqcpp/cxx/readtr.cxx\
|
||||
phreeqcpp/cxx/sit.cxx\
|
||||
phreeqcpp/cxx/smalldense.cxx\
|
||||
phreeqcpp/cxx/smalldense.h\
|
||||
phreeqcpp/cxx/spread.cxx\
|
||||
phreeqcpp/cxx/step.cxx\
|
||||
phreeqcpp/cxx/structures.cxx\
|
||||
phreeqcpp/cxx/sundialsmath.cxx\
|
||||
phreeqcpp/cxx/sundialsmath.h\
|
||||
phreeqcpp/cxx/sundialstypes.h\
|
||||
phreeqcpp/cxx/tally.cxx\
|
||||
phreeqcpp/cxx/tidy.cxx\
|
||||
phreeqcpp/cxx/transport.cxx\
|
||||
phreeqcpp/cxx/utilities.cxx
|
||||
|
||||
|
||||
include_HEADERS=\
|
||||
$(top_srcdir)/include/IPhreeqc.h\
|
||||
$(top_srcdir)/include/IPhreeqcCallbacks.h\
|
||||
$(top_srcdir)/include/IPhreeqc.f90.inc\
|
||||
$(top_srcdir)/include/IPhreeqc.f.inc\
|
||||
$(top_srcdir)/include/IPhreeqc.h\
|
||||
$(top_srcdir)/include/IPhreeqc.hpp\
|
||||
$(top_srcdir)/include/Var.h
|
||||
$(top_srcdir)/include/IPhreeqc.h\
|
||||
$(top_srcdir)/include/IPhreeqc.hpp\
|
||||
$(top_srcdir)/include/IPhreeqcCallbacks.h\
|
||||
$(top_srcdir)/include/Var.h
|
||||
|
||||
|
||||
if BUILD_FORTRAN
|
||||
|
||||
libiphreeqc_la_SOURCES+=\
|
||||
fwrap.cpp\
|
||||
fwrap.h\
|
||||
fwrap2.cpp\
|
||||
fwrap3.cpp\
|
||||
IPhreeqcF.F
|
||||
|
||||
include_HEADERS+=\
|
||||
$(top_srcdir)/include/IPhreeqc.f90.inc\
|
||||
$(top_srcdir)/include/IPhreeqc.f.inc
|
||||
|
||||
endif
|
||||
|
||||
17
test/kinn.f
17
test/kinn.f
@ -2,7 +2,7 @@
|
||||
PROGRAM DRIVER
|
||||
|
||||
IMPLICIT NONE
|
||||
INCLUDE 'IPhreeqc.f90.inc'
|
||||
INCLUDE 'IPhreeqc.f.inc'
|
||||
INTEGER iresult
|
||||
INTEGER i, j, k, rows, cols
|
||||
INTEGER vtype
|
||||
@ -34,11 +34,11 @@
|
||||
CALL EQUILIBRIUM_PHASES(id, 'calcite', 0.0, 0.010)
|
||||
CALL USER_PUNCH(id, 'Ca', 10)
|
||||
!!!! CALL OutputLines
|
||||
CALL SetOutputOn(id, .FALSE.)
|
||||
CALL SetErrorOn(id, .FALSE.)
|
||||
CALL SetLogOn(id, .FALSE.)
|
||||
CALL SetSelectedOutputOn(id, .TRUE.)
|
||||
CALL SetDumpOn(id, .FALSE.)
|
||||
iresult = SetOutputOn(id, .FALSE.)
|
||||
iresult = SetErrorOn(id, .FALSE.)
|
||||
iresult = SetLogOn(id, .FALSE.)
|
||||
iresult = SetSelectedOutputOn(id, .TRUE.)
|
||||
iresult = SetDumpOn(id, .FALSE.)
|
||||
iresult = RunAccumulated(id)
|
||||
IF (iresult.NE.0) THEN
|
||||
CALL OutputLastError(id)
|
||||
@ -95,10 +95,11 @@
|
||||
!! test ListComponents
|
||||
n = GetComponentCount(id)
|
||||
DO i = 1, n
|
||||
CALL GetComponent(id, i, comp)
|
||||
iresult = GetComponent(id, i, comp)
|
||||
WRITE (*, *) trim(comp)
|
||||
END DO
|
||||
|
||||
|
||||
n = DestroyIPhreeqc(id)
|
||||
|
||||
50 FORMAT(A15,A,$)
|
||||
60 FORMAT(1PG15.7E2,A,$)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user