From a4ed1c9078ff70bcab73b2cb0811914e466ea17b Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 21 May 2015 06:15:16 +0000 Subject: [PATCH] replaced IPhreeqc.f90.inc to USE IPhreeqc git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9702 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- doc/examples/F90ClearAccumulatedLines.f90 | 2 +- doc/examples/F90CreateIPhreeqc.f90 | 2 +- doc/examples/F90DestroyIPhreeqc.f90 | 2 +- doc/examples/F90GetComponent.f90 | 2 +- doc/examples/F90GetDumpStringLine.f90 | 2 +- doc/examples/F90GetErrorStringLine.f90 | 2 +- doc/examples/F90GetLogStringLine.f90 | 2 +- doc/examples/F90GetOutputStringLine.f90 | 2 +- .../F90GetSelectedOutputStringLine.f90 | 2 +- doc/examples/F90GetSelectedOutputValue.f90 | 2 +- doc/examples/F90GetVersionString.f90 | 2 +- doc/examples/F90SetBasicFortranCallback.f90 | 11 +++-- doc/examples/GetSelectedOutputValue.c | 8 +++- doc/examples/GetSelectedOutputValue2.c | 5 +- doc/examples/IPhreeqc.cpp | 6 +++ doc/examples/Makefile | 48 ++++++++++++------- .../SetCurrentSelectedOutputUserNumber.c | 2 +- 17 files changed, 66 insertions(+), 36 deletions(-) diff --git a/doc/examples/F90ClearAccumulatedLines.f90 b/doc/examples/F90ClearAccumulatedLines.f90 index bc8f6cd2..a6877c96 100644 --- a/doc/examples/F90ClearAccumulatedLines.f90 +++ b/doc/examples/F90ClearAccumulatedLines.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id id = CreateIPhreeqc() diff --git a/doc/examples/F90CreateIPhreeqc.f90 b/doc/examples/F90CreateIPhreeqc.f90 index 5d4b23de..8757f982 100644 --- a/doc/examples/F90CreateIPhreeqc.f90 +++ b/doc/examples/F90CreateIPhreeqc.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id id = CreateIPhreeqc() diff --git a/doc/examples/F90DestroyIPhreeqc.f90 b/doc/examples/F90DestroyIPhreeqc.f90 index 057fb333..2fd40174 100644 --- a/doc/examples/F90DestroyIPhreeqc.f90 +++ b/doc/examples/F90DestroyIPhreeqc.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id id = CreateIPhreeqc() diff --git a/doc/examples/F90GetComponent.f90 b/doc/examples/F90GetComponent.f90 index 50227cab..04ad49cd 100644 --- a/doc/examples/F90GetComponent.f90 +++ b/doc/examples/F90GetComponent.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i CHARACTER(LEN=40) :: comp diff --git a/doc/examples/F90GetDumpStringLine.f90 b/doc/examples/F90GetDumpStringLine.f90 index a6922e8f..302927bc 100644 --- a/doc/examples/F90GetDumpStringLine.f90 +++ b/doc/examples/F90GetDumpStringLine.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i CHARACTER(LEN=80) :: line diff --git a/doc/examples/F90GetErrorStringLine.f90 b/doc/examples/F90GetErrorStringLine.f90 index d15b8a1b..dbad29cc 100644 --- a/doc/examples/F90GetErrorStringLine.f90 +++ b/doc/examples/F90GetErrorStringLine.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i CHARACTER(LEN=80) :: line diff --git a/doc/examples/F90GetLogStringLine.f90 b/doc/examples/F90GetLogStringLine.f90 index 2a74e3da..6906b672 100644 --- a/doc/examples/F90GetLogStringLine.f90 +++ b/doc/examples/F90GetLogStringLine.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i CHARACTER(LEN=80) :: line diff --git a/doc/examples/F90GetOutputStringLine.f90 b/doc/examples/F90GetOutputStringLine.f90 index 7e110e7a..a2811ca5 100644 --- a/doc/examples/F90GetOutputStringLine.f90 +++ b/doc/examples/F90GetOutputStringLine.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i CHARACTER(LEN=80) :: line diff --git a/doc/examples/F90GetSelectedOutputStringLine.f90 b/doc/examples/F90GetSelectedOutputStringLine.f90 index d22a976c..39cefd7e 100644 --- a/doc/examples/F90GetSelectedOutputStringLine.f90 +++ b/doc/examples/F90GetSelectedOutputStringLine.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i CHARACTER(LEN=400):: line diff --git a/doc/examples/F90GetSelectedOutputValue.f90 b/doc/examples/F90GetSelectedOutputValue.f90 index 804d942a..82db3f78 100644 --- a/doc/examples/F90GetSelectedOutputValue.f90 +++ b/doc/examples/F90GetSelectedOutputValue.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER(KIND=4) :: id INTEGER(KIND=4) :: i INTEGER(KIND=4) :: j diff --git a/doc/examples/F90GetVersionString.f90 b/doc/examples/F90GetVersionString.f90 index 035b681b..0bece1c2 100644 --- a/doc/examples/F90GetVersionString.f90 +++ b/doc/examples/F90GetVersionString.f90 @@ -1,5 +1,5 @@ PROGRAM example - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc CHARACTER(LEN=80) :: version WRITE(*,*) "Version:" diff --git a/doc/examples/F90SetBasicFortranCallback.f90 b/doc/examples/F90SetBasicFortranCallback.f90 index 57f34005..dbb760a2 100644 --- a/doc/examples/F90SetBasicFortranCallback.f90 +++ b/doc/examples/F90SetBasicFortranCallback.f90 @@ -6,6 +6,7 @@ MODULE Callback CONTAINS DOUBLE PRECISION FUNCTION MyCallback(x1, x2, str) USE MyData, ONLY : year + USE ISO_C_BINDING ! ! Use of a callback is optional. ! @@ -31,7 +32,7 @@ END MODULE Callback PROGRAM Advect USE Callback USE MyData - INCLUDE "IPhreeqc.f90.inc" + USE IPhreeqc INTEGER :: Id !Create module, load database, define initial conditions and selected output @@ -45,10 +46,10 @@ PROGRAM Advect CALL OutputErrorString(Id) STOP ENDIF - IF (SetBasicFortranCallback(id, MyCallback) .NE. 0) THEN - CALL OutputErrorString(Id) - STOP - ENDIF + !???IF (SetBasicFortranCallback(id, MyCallback) .NE. 0) THEN + !??? CALL OutputErrorString(Id) + !??? STOP + !???ENDIF IF (RunFile(Id, "ic") .NE. 0) THEN CALL OutputErrorString(Id) STOP diff --git a/doc/examples/GetSelectedOutputValue.c b/doc/examples/GetSelectedOutputValue.c index 0d9cb689..f686cd53 100644 --- a/doc/examples/GetSelectedOutputValue.c +++ b/doc/examples/GetSelectedOutputValue.c @@ -27,7 +27,7 @@ int main(void) printf("selected-output:\n"); for (i = 0; i < GetSelectedOutputRowCount(id); ++i) { 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) { case TT_LONG: printf("%ld ", v.lVal); @@ -38,6 +38,12 @@ int main(void) case TT_STRING: printf("%s ", v.sVal); break; + case TT_EMPTY: + printf(" "); + break; + case TT_ERROR: + printf(" "); + break; } } VarClear(&v); diff --git a/doc/examples/GetSelectedOutputValue2.c b/doc/examples/GetSelectedOutputValue2.c index 27dd4863..6b1e1513 100644 --- a/doc/examples/GetSelectedOutputValue2.c +++ b/doc/examples/GetSelectedOutputValue2.c @@ -28,7 +28,7 @@ int main(void) printf("selected-output:\n"); for (i = 0; i < GetSelectedOutputRowCount(id); ++i) { 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) { case TT_LONG: printf("%ld ", (long)dvalue); @@ -39,6 +39,9 @@ int main(void) case TT_STRING: printf("%s ", svalue); break; + case TT_EMPTY: + printf(" "); + break; } } } diff --git a/doc/examples/IPhreeqc.cpp b/doc/examples/IPhreeqc.cpp index f5edf497..6cda7b43 100644 --- a/doc/examples/IPhreeqc.cpp +++ b/doc/examples/IPhreeqc.cpp @@ -49,6 +49,12 @@ int main(void) case TT_STRING: std::cout << v.sVal << " "; break; + case TT_EMPTY: + std::cout << " "; + break; + case TT_ERROR: + std::cout << " "; + break; } } ::VarClear(&v); diff --git a/doc/examples/Makefile b/doc/examples/Makefile index f3353146..532ab295 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -1,13 +1,15 @@ CC = gcc -CPPFLAGS = -I../../src -I../../src/phreeqcpp +CPPFLAGS = -I../../src -I../../src/phreeqcpp -I../../src/phreeqcpp/PhreeqcKeywords CXX = g++ DEFS = -DNDEBUG=1 -DFC_FUNC\(name,NAME\)=name\ \#\#\ _ -DFC_FUNC_\(name,NAME\)=name\ \#\#\ _ -DFC_MAIN=MAIN__ F77 = gfortran FC = gfortran CFLAGS = -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 -LIBTOOL = /bin/sh ../../_build/libtool +#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/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 = IPHREEQC_LA = ../../_build/src/libiphreeqc.la @@ -92,40 +94,40 @@ IPhreeqc: IPhreeqc.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) - $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< $(IPHREEQC_LA) $(FCLIBS) +F90CreateIPhreeqc: F90CreateIPhreeqc.lo $(IPHREEQC_LA) + $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA) $(FCLIBS) 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) - $(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) - $(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) - $(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) - $(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) - $(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) - $(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) - $(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) - $(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) - $(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 @@ -145,6 +147,13 @@ F90SetBasicFortranCallback: F90SetBasicFortranCallback.lo $(IPHREEQC_LA) .f90.lo: $(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 = \ AccumulateLine.lo \ CreateIPhreeqc.lo \ @@ -158,6 +167,7 @@ LO_FILES = \ GetSelectedOutputValue.lo \ GetSelectedOutputValue2.lo \ GetVersionString.lo \ + IPhreeqc_interface.lo \ Multi.lo \ SetBasicCallback.lo \ SetCurrentSelectedOutputUserNumber.lo \ @@ -179,6 +189,10 @@ F90_LO_FILES = \ F90GetVersionString.lo \ F90SetBasicFortranCallback.lo +MOD_FILES = \ + callback.mod \ + iphreeqc.mod \ + mydata.mod 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) diff --git a/doc/examples/SetCurrentSelectedOutputUserNumber.c b/doc/examples/SetCurrentSelectedOutputUserNumber.c index 44be4cc3..b7f82bcf 100644 --- a/doc/examples/SetCurrentSelectedOutputUserNumber.c +++ b/doc/examples/SetCurrentSelectedOutputUserNumber.c @@ -37,7 +37,7 @@ int main(void) 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) { case TT_LONG: