mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
updated for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4166 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
3384e61308
commit
f616ceefab
169
GNUmakefile
169
GNUmakefile
@ -190,171 +190,6 @@ R:
|
||||
|
||||
# phreeqc (POBJS)
|
||||
|
||||
##advection.o: src/phreeqcpp/phreeqc/advection.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##basic.o: src/phreeqcpp/phreeqc/basic.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h \
|
||||
## src/phreeqcpp/phreeqc/p2c.h
|
||||
##
|
||||
##basicsubs.o: src/phreeqcpp/phreeqc/basicsubs.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##cl1.o: src/phreeqcpp/phreeqc/cl1.c src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h
|
||||
##
|
||||
##cvdense.o: src/phreeqcpp/phreeqc/cvdense.c src/phreeqcpp/phreeqc/cvdense.h \
|
||||
## src/phreeqcpp/phreeqc/cvode.h src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/nvector.h src/phreeqcpp/phreeqc/dense.h src/phreeqcpp/phreeqc/smalldense.h \
|
||||
## src/phreeqcpp/phreeqc/sundialsmath.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phqalloc.h
|
||||
##
|
||||
##cvode.o: src/phreeqcpp/phreeqc/cvode.c src/phreeqcpp/phreeqc/cvode.h \
|
||||
## src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/nvector.h src/phreeqcpp/phreeqc/sundialsmath.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/kinetics.h src/phreeqcpp/phreeqc/phqalloc.h
|
||||
##
|
||||
##dense.o: src/phreeqcpp/phreeqc/dense.c src/phreeqcpp/phreeqc/sundialstypes.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/sundialsmath.h src/phreeqcpp/phreeqc/dense.h \
|
||||
## src/phreeqcpp/phreeqc/smalldense.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phqalloc.h
|
||||
##
|
||||
##dw.o: src/phreeqcpp/phreeqc/dw.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/pitzer.h
|
||||
##
|
||||
##input.o: src/phreeqcpp/phreeqc/input.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/input.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h
|
||||
##
|
||||
##integrate.o: src/phreeqcpp/phreeqc/integrate.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##inverse.o: src/phreeqcpp/phreeqc/inverse.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##isotopes.o: src/phreeqcpp/phreeqc/isotopes.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##kinetics.o: src/phreeqcpp/phreeqc/kinetics.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/cvode.h \
|
||||
## src/phreeqcpp/phreeqc/nvector.h src/phreeqcpp/phreeqc/cvdense.h src/phreeqcpp/phreeqc/dense.h \
|
||||
## src/phreeqcpp/phreeqc/smalldense.h src/phreeqcpp/phreeqc/nvector_serial.h \
|
||||
## src/phreeqcpp/phreeqc/kinetics.h
|
||||
##
|
||||
##mainsubs.o: src/phreeqcpp/phreeqc/mainsubs.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h src/phreeqcpp/phreeqc/input.h
|
||||
##
|
||||
##model.o: src/phreeqcpp/phreeqc/model.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##nvector.o: src/phreeqcpp/phreeqc/nvector.c src/phreeqcpp/phreeqc/nvector.h \
|
||||
## src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/output.h
|
||||
##
|
||||
##nvector_serial.o: src/phreeqcpp/phreeqc/nvector_serial.c \
|
||||
## src/phreeqcpp/phreeqc/nvector_serial.h src/phreeqcpp/phreeqc/nvector.h \
|
||||
## src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/sundialsmath.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phqalloc.h
|
||||
##
|
||||
##p2clib.o: src/phreeqcpp/phreeqc/p2clib.c src/phreeqcpp/phreeqc/p2c.h src/phreeqcpp/phreeqc/output.h
|
||||
##
|
||||
##parse.o: src/phreeqcpp/phreeqc/parse.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##phqalloc.o: src/phreeqcpp/phreeqc/phqalloc.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/output.h
|
||||
##
|
||||
##pitzer.o: src/phreeqcpp/phreeqc/pitzer.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h src/phreeqcpp/phreeqc/pitzer.h
|
||||
##
|
||||
##pitzer_structures.o: src/phreeqcpp/phreeqc/pitzer_structures.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h src/phreeqcpp/phreeqc/pitzer.h
|
||||
##
|
||||
##prep.o: src/phreeqcpp/phreeqc/prep.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##print.o: src/phreeqcpp/phreeqc/print.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h \
|
||||
## src/phreeqcpp/phreeqc/pitzer.h
|
||||
##
|
||||
##read.o: src/phreeqcpp/phreeqc/read.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##readtr.o: src/phreeqcpp/phreeqc/readtr.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##smalldense.o: src/phreeqcpp/phreeqc/smalldense.c src/phreeqcpp/phreeqc/smalldense.h \
|
||||
## src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/sundialsmath.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phqalloc.h
|
||||
##
|
||||
##spread.o: src/phreeqcpp/phreeqc/spread.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##step.o: src/phreeqcpp/phreeqc/step.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##structures.o: src/phreeqcpp/phreeqc/structures.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##sundialsmath.o: src/phreeqcpp/phreeqc/sundialsmath.c src/phreeqcpp/phreeqc/sundialsmath.h \
|
||||
## src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/output.h
|
||||
##
|
||||
##tally.o: src/phreeqcpp/phreeqc/tally.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##tidy.o: src/phreeqcpp/phreeqc/tidy.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##transport.o: src/phreeqcpp/phreeqc/transport.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##utilities.o: src/phreeqcpp/phreeqc/utilities.c src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h \
|
||||
## src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##IPhreeqc.o: src/IPhreeqc.cpp src/phreeqcns.hxx src/phreeqcpp/phreeqc/global.h \
|
||||
## src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/input.h \
|
||||
## src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h \
|
||||
## src/ErrorReporter.hxx src/SelectedOutput.hxx src/CVar.hxx src/Debug.h \
|
||||
## src/../include/Var.h src/../include/IPhreeqc.h src/../include/Var.h \
|
||||
## src/module_files.h
|
||||
##
|
||||
### iphreeqc (SOBJS)
|
||||
##
|
||||
##IPhreeqcF.o: src/IPhreeqcF.F
|
||||
##
|
||||
##Phreeqc.o: src/Phreeqc.cxx
|
||||
##
|
||||
##SelectedOutput.o: src/SelectedOutput.cpp src/SelectedOutput.hxx \
|
||||
## src/CVar.hxx src/Debug.h src/../include/Var.h src/phreeqcns.hxx \
|
||||
## src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/phqalloc.h \
|
||||
## src/phreeqcpp/phreeqc/input.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h
|
||||
##
|
||||
##Var.o: src/Var.c src/../include/Var.h
|
||||
##
|
||||
##fwrap.o: src/fwrap.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/../include/IPhreeqc.h src/../include/Var.h
|
||||
##
|
||||
##module_files.o: src/module_files.c src/module_files.h \
|
||||
## src/phreeqcpp/phreeqc/phreeqc_files.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/phqalloc.h src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h \
|
||||
## src/phreeqcpp/phreeqc/input.h
|
||||
##
|
||||
##module_output.o: src/module_output.c src/module_files.h \
|
||||
## src/phreeqcpp/phreeqc/output.c src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
## src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h src/phreeqcpp/phreeqc/phqalloc.h
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
@ -1457,7 +1292,7 @@ IPhreeqc.o: src/IPhreeqc.cpp include/IPhreeqc.h \
|
||||
src/phreeqcpp/phreeqc/input.h src/phreeqcpp/phreeqc/output.h \
|
||||
src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/global_structures.h \
|
||||
include/IPhreeqcCallbacks.h src/SelectedOutput.hxx src/CVar.hxx \
|
||||
src/ErrorReporter.hxx src/phreeqcns.hxx
|
||||
src/ErrorReporter.hxx
|
||||
fwrap2.o: src/fwrap2.c include/Var.h src/fwrap.h
|
||||
fwrap3.o: src/fwrap3.c include/Var.h src/fwrap.h
|
||||
module_output.o: src/module_output.c src/module_files.h src/IPhreeqc.hpp \
|
||||
@ -1510,7 +1345,7 @@ SelectedOutput.o: src/SelectedOutput.cpp src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
src/phreeqcpp/phreeqc/pitzer.h src/phreeqcpp/phreeqc/input.h \
|
||||
src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/global.h \
|
||||
src/phreeqcpp/phreeqc/global_structures.h src/SelectedOutput.hxx \
|
||||
src/CVar.hxx src/Debug.h include/Var.h src/phreeqcns.hxx
|
||||
src/CVar.hxx src/Debug.h include/Var.h
|
||||
pp_sys.o: src/pp_sys.c
|
||||
fwrap.o: src/fwrap.c src/phreeqcpp/phreeqc/phrqtype.h include/IPhreeqc.h \
|
||||
include/IPhreeqcCallbacks.h src/CVar.hxx src/Debug.h include/Var.h \
|
||||
|
||||
@ -134,16 +134,15 @@ TestCVar.o: TestCVar.cpp TestCVar.h ../src/CVar.hxx ../src/Debug.h \
|
||||
../src/../include/Var.h
|
||||
TestInterface.o: TestInterface.cpp TestInterface.h ../include/IPhreeqc.h \
|
||||
../include/Var.h ../src/CVar.hxx ../src/Debug.h ../src/../include/Var.h \
|
||||
../src/phreeqcns.hxx ../src/phreeqcpp/phreeqc/global.h \
|
||||
../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/phqalloc.h \
|
||||
../src/phreeqcpp/phreeqc/input.h ../src/phreeqcpp/phreeqc/output.h \
|
||||
../src/phreeqcpp/phreeqc/phrqproto.h
|
||||
TestSelectedOutput.o: TestSelectedOutput.cpp TestSelectedOutput.h \
|
||||
../src/SelectedOutput.hxx ../src/CVar.hxx ../src/Debug.h \
|
||||
../src/../include/Var.h ../src/phreeqcns.hxx \
|
||||
../src/phreeqcpp/phreeqc/global.h ../src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
../src/phreeqcpp/phreeqc/phqalloc.h ../src/phreeqcpp/phreeqc/input.h \
|
||||
../src/phreeqcpp/phreeqc/output.h ../src/phreeqcpp/phreeqc/phrqproto.h
|
||||
TestSelectedOutput.o: TestSelectedOutput.cpp TestSelectedOutput.h \
|
||||
../src/SelectedOutput.hxx ../src/CVar.hxx ../src/Debug.h \
|
||||
../src/../include/Var.h ../src/phreeqcpp/phreeqc/global.h \
|
||||
../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/phqalloc.h \
|
||||
../src/phreeqcpp/phreeqc/input.h ../src/phreeqcpp/phreeqc/output.h \
|
||||
../src/phreeqcpp/phreeqc/phrqproto.h
|
||||
TestVar.o: TestVar.cpp TestVar.h ../include/Var.h
|
||||
unit.o: unit.cpp TestVar.h ../include/Var.h TestCVar.h ../src/CVar.hxx \
|
||||
../src/Debug.h ../src/../include/Var.h TestSelectedOutput.h \
|
||||
@ -303,20 +302,30 @@ utilities.o: ../src/phreeqcpp/phreeqc/utilities.c \
|
||||
../src/phreeqcpp/phreeqc/phrqproto.h
|
||||
|
||||
# SOBJS
|
||||
IPhreeqc.o: ../src/IPhreeqc.cpp ../src/phreeqcns.hxx \
|
||||
../src/phreeqcpp/phreeqc/global.h ../src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
../src/phreeqcpp/phreeqc/phqalloc.h ../src/phreeqcpp/phreeqc/input.h \
|
||||
../src/phreeqcpp/phreeqc/output.h ../src/phreeqcpp/phreeqc/phrqproto.h \
|
||||
../src/ErrorReporter.hxx ../src/SelectedOutput.hxx \
|
||||
../src/CVar.hxx ../src/Debug.h ../src/../include/Var.h \
|
||||
../src/../include/IPhreeqc.h ../src/../include/Var.h \
|
||||
../src/module_files.h
|
||||
IPhreeqc.o: ../src/IPhreeqc.cpp ../include/IPhreeqc.h \
|
||||
../include/IPhreeqcCallbacks.h ../include/Var.h ../src/IPhreeqc.hpp \
|
||||
../src/phreeqcpp/Phreeqc.h ../src/phreeqcpp/phreeqc/phrqtype.h \
|
||||
../src/phreeqcpp/phreeqc/sundialstypes.h \
|
||||
../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/nvector.h \
|
||||
../src/phreeqcpp/phreeqc/sundialstypes.h \
|
||||
../src/phreeqcpp/phreeqc/cvdense.h ../src/phreeqcpp/phreeqc/cvode.h \
|
||||
../src/phreeqcpp/phreeqc/nvector.h ../src/phreeqcpp/phreeqc/dense.h \
|
||||
../src/phreeqcpp/phreeqc/smalldense.h \
|
||||
../src/phreeqcpp/phreeqc/nvector_serial.h \
|
||||
../src/phreeqcpp/phreeqc/dense.h ../src/phreeqcpp/runner.h \
|
||||
../src/phreeqcpp/StorageBinList.h ../src/phreeqcpp/dumper.h \
|
||||
../src/phreeqcpp/phreeqc/p2c.h \
|
||||
../src/phreeqcpp/phreeqc/global_structures.h \
|
||||
../src/phreeqcpp/phreeqc/basic.h \
|
||||
../src/phreeqcpp/phreeqc/pitzer_structures.h \
|
||||
../src/phreeqcpp/phreeqc/pitzer.h ../src/phreeqcpp/phreeqc/input.h \
|
||||
../src/phreeqcpp/phreeqc/output.h ../src/phreeqcpp/phreeqc/global.h \
|
||||
../src/phreeqcpp/phreeqc/global_structures.h \
|
||||
../include/IPhreeqcCallbacks.h ../include/Var.h \
|
||||
../src/SelectedOutput.hxx ../src/CVar.hxx ../src/Debug.h \
|
||||
../src/ErrorReporter.hxx
|
||||
SelectedOutput.o: ../src/SelectedOutput.cpp ../src/SelectedOutput.hxx \
|
||||
../src/CVar.hxx ../src/Debug.h ../src/../include/Var.h \
|
||||
../src/phreeqcns.hxx ../src/phreeqcpp/phreeqc/global.h \
|
||||
../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/phqalloc.h \
|
||||
../src/phreeqcpp/phreeqc/input.h ../src/phreeqcpp/phreeqc/output.h \
|
||||
../src/phreeqcpp/phreeqc/phrqproto.h
|
||||
../src/CVar.hxx ../src/Debug.h ../include/Var.h
|
||||
Var.o: ../src/Var.c ../src/../include/Var.h
|
||||
fwrap.o: ../src/fwrap.c ../src/phreeqcpp/phreeqc/global.h \
|
||||
../src/phreeqcpp/phreeqc/phrqtype.h ../src/../include/IPhreeqc.h \
|
||||
|
||||
@ -1481,7 +1481,7 @@ TestInterface::TestDatabaseKeyword()
|
||||
::SetOutputOn(0);
|
||||
::SetErrorOn(0);
|
||||
::SetLogOn(0);
|
||||
::SetSelectedOutputOn(0);
|
||||
::SetSelectedOutputOn(0);
|
||||
::SetDumpOn(0);
|
||||
CPPUNIT_ASSERT_EQUAL(1, ::RunFile("dump"));
|
||||
|
||||
@ -1509,12 +1509,13 @@ TestInterface::TestDumpString()
|
||||
::SetOutputOn(0);
|
||||
::SetErrorOn(0);
|
||||
::SetLogOn(0);
|
||||
::SetSelectedOutputOn(0);
|
||||
::SetSelectedOutputOn(0);
|
||||
::SetDumpOn(0);
|
||||
::SetDumpStringOn(1);
|
||||
CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
|
||||
|
||||
const char *expected =
|
||||
#if defined(_MSC_VER)
|
||||
"SOLUTION_RAW 1 \n"
|
||||
" -temp 25\n"
|
||||
" -total_h 111.0132593403\n"
|
||||
@ -1541,6 +1542,35 @@ TestInterface::TestDumpString()
|
||||
" Na -3.0255625287599\n"
|
||||
" O(0) -42.080044167952\n"
|
||||
" -gammas\n";
|
||||
#endif
|
||||
#if defined(__GNUC__)
|
||||
"SOLUTION_RAW 1 \n"
|
||||
" -temp 25\n"
|
||||
" -total_h 111.0132593403\n"
|
||||
" -total_o 55.509043478605\n"
|
||||
" -cb 0.0021723831003928\n"
|
||||
" -totals\n"
|
||||
" C(4) 0.0010000000000376\n"
|
||||
" Ca 0.001000000004331\n"
|
||||
" H(0) 1.4149476909313e-25\n"
|
||||
" Na 0.001\n"
|
||||
" -Isotopes\n"
|
||||
" -pH 7\n"
|
||||
" -pe 4\n"
|
||||
" -mu 0.0028961089894362\n"
|
||||
" -ah2o 0.99994915105857\n"
|
||||
" -mass_water 1\n"
|
||||
" -total_alkalinity 0.00082761690826912\n"
|
||||
" -activities\n"
|
||||
" C(-4) -67.370522674574\n"
|
||||
" C(4) -6.4415889265024\n"
|
||||
" Ca -3.1040445240857\n"
|
||||
" E -4\n"
|
||||
" H(0) -25.15\n"
|
||||
" Na -3.0255625287599\n"
|
||||
" O(0) -42.080044167952\n"
|
||||
" -gammas\n";
|
||||
#endif
|
||||
|
||||
const char* dump_str = ::GetDumpString();
|
||||
CPPUNIT_ASSERT_EQUAL(std::string(expected), std::string(dump_str));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user