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

replaced IPhreeqc.f90.inc to USE IPhreeqc

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9702 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-05-21 06:15:16 +00:00
parent 756abc03f6
commit a4ed1c9078
17 changed files with 66 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/examples/F90ClearAccumulatedLines.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
id = CreateIPhreeqc() id = CreateIPhreeqc()

2
doc/examples/F90CreateIPhreeqc.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
id = CreateIPhreeqc() id = CreateIPhreeqc()

2
doc/examples/F90DestroyIPhreeqc.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
id = CreateIPhreeqc() id = CreateIPhreeqc()

2
doc/examples/F90GetComponent.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
CHARACTER(LEN=40) :: comp CHARACTER(LEN=40) :: comp

2
doc/examples/F90GetDumpStringLine.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
CHARACTER(LEN=80) :: line CHARACTER(LEN=80) :: line

2
doc/examples/F90GetErrorStringLine.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
CHARACTER(LEN=80) :: line CHARACTER(LEN=80) :: line

2
doc/examples/F90GetLogStringLine.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
CHARACTER(LEN=80) :: line CHARACTER(LEN=80) :: line

2
doc/examples/F90GetOutputStringLine.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
CHARACTER(LEN=80) :: line CHARACTER(LEN=80) :: line

2
doc/examples/F90GetSelectedOutputStringLine.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
CHARACTER(LEN=400):: line CHARACTER(LEN=400):: line

2
doc/examples/F90GetSelectedOutputValue.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER(KIND=4) :: id INTEGER(KIND=4) :: id
INTEGER(KIND=4) :: i INTEGER(KIND=4) :: i
INTEGER(KIND=4) :: j INTEGER(KIND=4) :: j

2
doc/examples/F90GetVersionString.f90
View File

@ -1,5 +1,5 @@
PROGRAM example PROGRAM example
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
CHARACTER(LEN=80) :: version CHARACTER(LEN=80) :: version
WRITE(*,*) "Version:" WRITE(*,*) "Version:"

11
doc/examples/F90SetBasicFortranCallback.f90
View File

@ -6,6 +6,7 @@ MODULE Callback
CONTAINS CONTAINS
DOUBLE PRECISION FUNCTION MyCallback(x1, x2, str) DOUBLE PRECISION FUNCTION MyCallback(x1, x2, str)
USE MyData, ONLY : year USE MyData, ONLY : year
USE ISO_C_BINDING
! !
! Use of a callback is optional. ! Use of a callback is optional.
! !
@ -31,7 +32,7 @@ END MODULE Callback
PROGRAM Advect PROGRAM Advect
USE Callback USE Callback
USE MyData USE MyData
INCLUDE "IPhreeqc.f90.inc" USE IPhreeqc
INTEGER :: Id INTEGER :: Id
!Create module, load database, define initial conditions and selected output !Create module, load database, define initial conditions and selected output
@ -45,10 +46,10 @@ PROGRAM Advect
CALL OutputErrorString(Id) CALL OutputErrorString(Id)
STOP STOP
ENDIF ENDIF
IF (SetBasicFortranCallback(id, MyCallback) .NE. 0) THEN !???IF (SetBasicFortranCallback(id, MyCallback) .NE. 0) THEN
CALL OutputErrorString(Id) !??? CALL OutputErrorString(Id)
STOP !??? STOP
ENDIF !???ENDIF
IF (RunFile(Id, "ic") .NE. 0) THEN IF (RunFile(Id, "ic") .NE. 0) THEN
CALL OutputErrorString(Id) CALL OutputErrorString(Id)
STOP STOP

8
doc/examples/GetSelectedOutputValue.c
View File

@ -27,7 +27,7 @@ int main(void)
printf("selected-output:\n"); printf("selected-output:\n");
for (i = 0; i < GetSelectedOutputRowCount(id); ++i) { for (i = 0; i < GetSelectedOutputRowCount(id); ++i) {
for (j = 0; j < GetSelectedOutputColumnCount(id); ++j) { for (j = 0; j < GetSelectedOutputColumnCount(id); ++j) {
if (GetSelectedOutputValue(id, i, j, &v) == VR_OK) { if (GetSelectedOutputValue(id, i, j, &v) == IPQ_OK) {
switch (v.type) { switch (v.type) {
case TT_LONG: case TT_LONG:
printf("%ld ", v.lVal); printf("%ld ", v.lVal);
@ -38,6 +38,12 @@ int main(void)
case TT_STRING: case TT_STRING:
printf("%s ", v.sVal); printf("%s ", v.sVal);
break; break;
case TT_EMPTY:
printf("<empty> ");
break;
case TT_ERROR:
printf("<error> ");
break;
} }
} }
VarClear(&v); VarClear(&v);

5
doc/examples/GetSelectedOutputValue2.c
View File

@ -28,7 +28,7 @@ int main(void)
printf("selected-output:\n"); printf("selected-output:\n");
for (i = 0; i < GetSelectedOutputRowCount(id); ++i) { for (i = 0; i < GetSelectedOutputRowCount(id); ++i) {
for (j = 0; j < GetSelectedOutputColumnCount(id); ++j) { for (j = 0; j < GetSelectedOutputColumnCount(id); ++j) {
if (GetSelectedOutputValue2(id, i, j, &vtype, &dvalue, svalue, SVALUE_LENGTH) == VR_OK) { if (GetSelectedOutputValue2(id, i, j, &vtype, &dvalue, svalue, SVALUE_LENGTH) == IPQ_OK) {
switch (vtype) { switch (vtype) {
case TT_LONG: case TT_LONG:
printf("%ld ", (long)dvalue); printf("%ld ", (long)dvalue);
@ -39,6 +39,9 @@ int main(void)
case TT_STRING: case TT_STRING:
printf("%s ", svalue); printf("%s ", svalue);
break; break;
case TT_EMPTY:
printf("<empty> ");
break;
} }
} }
} }

6
doc/examples/IPhreeqc.cpp
View File

@ -49,6 +49,12 @@ int main(void)
case TT_STRING: case TT_STRING:
std::cout << v.sVal << " "; std::cout << v.sVal << " ";
break; break;
case TT_EMPTY:
std::cout << "<empty> ";
break;
case TT_ERROR:
std::cout << "<error> ";
break;
} }
} }
::VarClear(&v); ::VarClear(&v);

48
doc/examples/Makefile
View File

@ -1,13 +1,15 @@
CC = gcc CC = gcc
CPPFLAGS = -I../../src -I../../src/phreeqcpp CPPFLAGS = -I../../src -I../../src/phreeqcpp -I../../src/phreeqcpp/PhreeqcKeywords
CXX = g++ CXX = g++
DEFS = -DNDEBUG=1 -DFC_FUNC\(name,NAME\)=name\ \#\#\ _ -DFC_FUNC_\(name,NAME\)=name\ \#\#\ _ -DFC_MAIN=MAIN__ DEFS = -DNDEBUG=1 -DFC_FUNC\(name,NAME\)=name\ \#\#\ _ -DFC_FUNC_\(name,NAME\)=name\ \#\#\ _ -DFC_MAIN=MAIN__
F77 = gfortran F77 = gfortran
FC = gfortran FC = gfortran
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
FFLAGS = -I../../src -g -O2 -Wall FFLAGS = -I../../src -g -O2 -Wall
FCLIBS = -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1 -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1/../../.. -lgfortranbegin -lgfortran -lm #FCLIBS = -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1 -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1/../../.. -lgfortranbegin -lgfortran -lm
LIBTOOL = /bin/sh ../../_build/libtool FCLIBS = -L/usr/lib/gcc/x86_64-linux-gnu/4.8 -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../.. -lgfortran -lm -lquadmath
#LIBTOOL = /bin/sh ../../_build/libtool
LIBTOOL = /usr/bin/libtool
LDFLAGS = LDFLAGS =
IPHREEQC_LA = ../../_build/src/libiphreeqc.la IPHREEQC_LA = ../../_build/src/libiphreeqc.la
@ -92,40 +94,40 @@ IPhreeqc: IPhreeqc.lo $(IPHREEQC_LA)
F90AccumulateLine: F90AccumulateLine.lo $(IPHREEQC_LA) F90AccumulateLine: F90AccumulateLine.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90CreateIPhreeqc: F90CreateIPhreeqc.lo $(IPHREEQC_LA) F90CreateIPhreeqc: F90CreateIPhreeqc.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetComponent: F90GetComponent.lo $(IPHREEQC_LA) F90GetComponent: F90GetComponent.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetDumpStringLine: F90GetDumpStringLine.lo $(IPHREEQC_LA) F90GetDumpStringLine: F90GetDumpStringLine.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetErrorStringLine: F90GetErrorStringLine.lo $(IPHREEQC_LA) F90GetErrorStringLine: F90GetErrorStringLine.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetLogStringLine: F90GetLogStringLine.lo $(IPHREEQC_LA) F90GetLogStringLine: F90GetLogStringLine.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetOutputStringLine: F90GetOutputStringLine.lo $(IPHREEQC_LA) F90GetOutputStringLine: F90GetOutputStringLine.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90ClearAccumulatedLines: F90ClearAccumulatedLines.lo $(IPHREEQC_LA) F90ClearAccumulatedLines: F90ClearAccumulatedLines.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetSelectedOutputStringLine: F90GetSelectedOutputStringLine.lo $(IPHREEQC_LA) F90GetSelectedOutputStringLine: F90GetSelectedOutputStringLine.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetSelectedOutputValue: F90GetSelectedOutputValue.lo $(IPHREEQC_LA) F90GetSelectedOutputValue: F90GetSelectedOutputValue.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90GetVersionString: F90GetVersionString.lo $(IPHREEQC_LA) F90GetVersionString: F90GetVersionString.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA) F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA)
$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS)
.SUFFIXES: .c .cxx .f .f90 .lo .SUFFIXES: .c .cxx .f .f90 .lo
@ -145,6 +147,13 @@ F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA)
.f90.lo: .f90.lo:
$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $< $(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<
F90CreateIPhreeqc.lo: IPhreeqc_interface.lo
IPhreeqc_interface.lo: ../../src/IPhreeqc_interface.F90
$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<
LO_FILES = \ LO_FILES = \
AccumulateLine.lo \ AccumulateLine.lo \
CreateIPhreeqc.lo \ CreateIPhreeqc.lo \
@ -158,6 +167,7 @@ LO_FILES = \
GetSelectedOutputValue.lo \ GetSelectedOutputValue.lo \
GetSelectedOutputValue2.lo \ GetSelectedOutputValue2.lo \
GetVersionString.lo \ GetVersionString.lo \
IPhreeqc_interface.lo \
Multi.lo \ Multi.lo \
SetBasicCallback.lo \ SetBasicCallback.lo \
SetCurrentSelectedOutputUserNumber.lo \ SetCurrentSelectedOutputUserNumber.lo \
@ -179,6 +189,10 @@ F90_LO_FILES = \
F90GetVersionString.lo \ F90GetVersionString.lo \
F90SetBasicFortranCallback.lo F90SetBasicFortranCallback.lo
MOD_FILES = \
callback.mod \
iphreeqc.mod \
mydata.mod
clean: clean:
$(LIBTOOL) --mode=clean rm -f *~ $(TARGETS) $(F90_TARGETS) $(LO_FILES) $(F90_LO_FILES) $(LIBTOOL) --mode=clean rm -f *~ $(TARGETS) $(F90_TARGETS) $(LO_FILES) $(F90_LO_FILES) $(MOD_FILES)

2
doc/examples/SetCurrentSelectedOutputUserNumber.c
View File

@ -37,7 +37,7 @@ int main(void)
for (c = 0; c < GetSelectedOutputColumnCount(id); ++c) { for (c = 0; c < GetSelectedOutputColumnCount(id); ++c) {
if (GetSelectedOutputValue(id, r, c, &v) == VR_OK) { if (GetSelectedOutputValue(id, r, c, &v) == IPQ_OK) {
switch (v.type) { switch (v.type) {
case TT_LONG: case TT_LONG: