mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Fixed Makefile on Linux to make class version.
Added eol and other changes for linux. Had statics in ReadClass.cxx, removed. Problems with .dmp files. May be because of statics. git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3879 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst
parent
3131740cfb
commit
65ff0a9456
@ -582,4 +582,4 @@ const cxxNameDouble &
|
||||
cxxExchange::get_totals() const
|
||||
{
|
||||
return totals;
|
||||
};
|
||||
}
|
||||
|
||||
458
Makefile
458
Makefile
@ -28,9 +28,14 @@ Release: release
|
||||
|
||||
Debug: debug
|
||||
|
||||
Class_debug: class_debug
|
||||
|
||||
Class_release: class_release
|
||||
|
||||
RELEASE_DIR = Release
|
||||
DEBUG_DIR = Debug
|
||||
CLASS_DEBUG_DIR = Class_debug
|
||||
CLASS_DIR = Class_release
|
||||
MAKEFILE = Makefile
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
@ -51,6 +56,16 @@ debug:
|
||||
mkdir -p $(DEBUG_DIR)
|
||||
cd $(DEBUG_DIR); $(MAKE) -r -f ../$(MAKEFILE) CFG=DEBUG $(PROGRAM)
|
||||
|
||||
.PHONY : Class_debug
|
||||
class_debug:
|
||||
mkdir -p $(CLASS_DEBUG_DIR)
|
||||
cd $(CLASS_DEBUG_DIR); $(MAKE) -r -f ../$(MAKEFILE) CFG=CLASS_DEBUG $(PROGRAM)
|
||||
|
||||
.PHONY : Class_release
|
||||
class_release:
|
||||
mkdir -p $(CLASS_DIR)
|
||||
cd $(CLASS_DIR); $(MAKE) -r -f ../$(MAKEFILE) CFG=CLASS_RELEASE $(PROGRAM)
|
||||
|
||||
# Recursive make begins here
|
||||
#
|
||||
# =============================================================================
|
||||
@ -105,7 +120,7 @@ ifeq ($(CFG), RELEASE)
|
||||
INCLUDES = -I../phreeqc
|
||||
CXX = g++
|
||||
CXXFLAGS = -Wall -pedantic -O3 $(DEFINES) $(INCLUDES)
|
||||
OBJECT_FILES = $(COMMON_COBJS) $(COMMON_CXXOBJS) $(CL1MP_OBJS)
|
||||
OBJECT_FILES = $(MAIN_FILE) $(COMMON_COBJS) $(COMMON_CXXOBJS) $(CL1MP_OBJS)
|
||||
LD_FLAGS = -lm ${CL1MP_LIB} ${HASH_STYLE}
|
||||
endif
|
||||
|
||||
@ -115,7 +130,27 @@ ifeq ($(CFG), DEBUG)
|
||||
INCLUDES = -I../phreeqc
|
||||
CXX = g++
|
||||
CXXFLAGS = -Wall -g $(DEFINES) $(INCLUDES)
|
||||
OBJECT_FILES = $(COMMON_COBJS) $(COMMON_CXXOBJS) $(CL1MP_OBJS)
|
||||
OBJECT_FILES = $(MAIN_FILE) $(COMMON_COBJS) $(COMMON_CXXOBJS) $(CL1MP_OBJS)
|
||||
LD_FLAGS = -lm ${CL1MP_LIB} ${HASH_STYLE}
|
||||
endif
|
||||
|
||||
ifeq ($(CFG), CLASS_DEBUG)
|
||||
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC -DPHREEQC_CLASS $(DEFINE_INVERSE_CL1MP)
|
||||
VPATH = ..:../phreeqc
|
||||
INCLUDES = -I../phreeqc -I..
|
||||
CXX = g++
|
||||
CXXFLAGS = -Wall -g $(DEFINES) $(INCLUDES)
|
||||
OBJECT_FILES = $(CLASS_FILES) $(COMMON_COBJS) $(COMMON_CXXOBJS) $(CL1MP_OBJS)
|
||||
LD_FLAGS = -lm ${CL1MP_LIB} ${HASH_STYLE}
|
||||
endif
|
||||
|
||||
ifeq ($(CFG), CLASS_RELEASE)
|
||||
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC -DPHREEQC_CLASS $(DEFINE_INVERSE_CL1MP)
|
||||
VPATH = ..:../phreeqc
|
||||
INCLUDES = -I../phreeqc -I..
|
||||
CXX = g++
|
||||
CXXFLAGS = -Wall -pedantic -O3 $(DEFINES) $(INCLUDES)
|
||||
OBJECT_FILES = $(CLASS_FILES) $(COMMON_COBJS) $(COMMON_CXXOBJS) $(CL1MP_OBJS)
|
||||
LD_FLAGS = -lm ${CL1MP_LIB} ${HASH_STYLE}
|
||||
endif
|
||||
|
||||
@ -136,7 +171,6 @@ COMMON_COBJS = \
|
||||
inverse.o \
|
||||
isotopes.o \
|
||||
kinetics.o \
|
||||
main.o \
|
||||
mainsubs.o \
|
||||
model.o \
|
||||
nvector.o \
|
||||
@ -163,6 +197,13 @@ COMMON_COBJS = \
|
||||
transport.o \
|
||||
utilities.o
|
||||
|
||||
MAIN_FILE = main.o
|
||||
|
||||
CLASS_FILES = \
|
||||
class_main.o \
|
||||
Phreeqc.o
|
||||
|
||||
|
||||
COMMON_CXXOBJS = \
|
||||
dumper.o \
|
||||
Exchange.o \
|
||||
@ -209,157 +250,188 @@ ${PROGRAM} : ${OBJECT_FILES}
|
||||
#
|
||||
# CXX files
|
||||
#
|
||||
cxxKinetics.o: ../cxxKinetics.cxx ../Utils.h ../char_star.h \
|
||||
../cxxKinetics.h ../NumKeyword.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../KineticsComp.h ../NameDouble.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
cxxMix.o: ../cxxMix.cxx ../Utils.h ../char_star.h ../cxxMix.h \
|
||||
../NumKeyword.h ../Parser.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
cxxKinetics.o: ../cxxKinetics.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../cxxKinetics.h \
|
||||
../NumKeyword.h ../KineticsComp.h ../NameDouble.h ../Phreeqc_class.h \
|
||||
../Parser.h ../cxxMix.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
cxxMix.o: ../cxxMix.cxx ../Utils.h ../Parser.h ../Phreeqc_class.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../cxxMix.h ../NumKeyword.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
Dictionary.o: ../Dictionary.cxx ../Dictionary.h ../Solution.h \
|
||||
../NumKeyword.h ../Parser.h ../char_star.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../NameDouble.h ../cxxMix.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../Phreeqc_class.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../Parser.h ../NameDouble.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
Exchange.o: ../Exchange.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../cxxMix.h \
|
||||
../Phreeqc_class.h ../NumKeyword.h ../Exchange.h ../ExchComp.h \
|
||||
../NameDouble.h ../Parser.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
ExchComp.o: ../ExchComp.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../ExchComp.h \
|
||||
../NameDouble.h ../Phreeqc_class.h ../Parser.h ../Dictionary.h \
|
||||
../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h
|
||||
Exchange.o: ../Exchange.cxx ../Utils.h ../char_star.h ../Exchange.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h ../ExchComp.h ../NameDouble.h \
|
||||
../Parser.h ../cxxMix.h ../NumKeyword.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
ExchComp.o: ../ExchComp.cxx ../Utils.h ../char_star.h ../ExchComp.h \
|
||||
../NameDouble.h ../Parser.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../Dictionary.h ../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../cxxMix.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
GasPhase.o: ../GasPhase.cxx ../Utils.h ../char_star.h ../GasPhase.h \
|
||||
../NumKeyword.h ../Parser.h ../NameDouble.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../cxxMix.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
ISolutionComp.o: ../ISolutionComp.cxx ../ISolutionComp.h ../Utils.h \
|
||||
../char_star.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../ISolution.h \
|
||||
../NumKeyword.h ../Parser.h ../Solution.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../NameDouble.h ../cxxMix.h ../phreeqc/output.h
|
||||
ISolution.o: ../ISolution.cxx ../ISolution.h ../ISolutionComp.h \
|
||||
../Utils.h ../char_star.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../NumKeyword.h \
|
||||
../Parser.h ../Solution.h ../SolutionIsotopeList.h ../SolutionIsotope.h \
|
||||
../NameDouble.h ../cxxMix.h ../phreeqc/output.h
|
||||
KineticsComp.o: ../KineticsComp.cxx ../Utils.h ../char_star.h \
|
||||
../KineticsComp.h ../NameDouble.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../Dictionary.h ../Solution.h ../NumKeyword.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
NameDouble.o: ../NameDouble.cxx ../Utils.h ../char_star.h ../NameDouble.h \
|
||||
../Parser.h ../Dictionary.h ../Solution.h ../NumKeyword.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../cxxMix.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h ../phreeqc/output.h \
|
||||
GasPhase.o: ../GasPhase.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../GasPhase.h \
|
||||
../NumKeyword.h ../NameDouble.h ../Phreeqc_class.h ../Parser.h \
|
||||
../cxxMix.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h
|
||||
ISolutionComp.o: ../ISolutionComp.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../ISolutionComp.h \
|
||||
../Phreeqc_class.h ../phreeqc/phrqproto.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h
|
||||
ISolution.o: ../ISolution.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../ISolution.h \
|
||||
../ISolutionComp.h ../Phreeqc_class.h ../NumKeyword.h ../Solution.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../Parser.h \
|
||||
../NameDouble.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h
|
||||
KineticsComp.o: ../KineticsComp.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../KineticsComp.h \
|
||||
../NameDouble.h ../Phreeqc_class.h ../Parser.h ../Dictionary.h \
|
||||
../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
NameDouble.o: ../NameDouble.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../NameDouble.h \
|
||||
../Phreeqc_class.h ../Parser.h ../Dictionary.h ../Solution.h \
|
||||
../NumKeyword.h ../SolutionIsotopeList.h ../SolutionIsotope.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
NumKeyword.o: ../NumKeyword.cxx ../NumKeyword.h ../Parser.h \
|
||||
../char_star.h
|
||||
Parser.o: ../Parser.cxx ../Parser.h ../char_star.h ../Utils.h \
|
||||
../Phreeqc_class.h
|
||||
Parser.o: ../Parser.cxx ../Utils.h ../Parser.h ../Phreeqc_class.h \
|
||||
../phreeqc/output.h
|
||||
PPassemblageComp.o: ../PPassemblageComp.cxx ../Utils.h ../char_star.h \
|
||||
../PPassemblageComp.h ../NameDouble.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../Dictionary.h ../Solution.h ../NumKeyword.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
PPassemblage.o: ../PPassemblage.cxx ../Utils.h ../char_star.h \
|
||||
../PPassemblage.h ../NumKeyword.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../PPassemblageComp.h ../NameDouble.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
Reaction.o: ../Reaction.cxx ../Utils.h ../char_star.h ../Reaction.h \
|
||||
../NumKeyword.h ../Parser.h ../NameDouble.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
ReadClass.o: ../ReadClass.cxx ../Parser.h ../char_star.h ../Solution.h \
|
||||
PPassemblageComp.o: ../PPassemblageComp.cxx ../Utils.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../PPassemblageComp.h ../NameDouble.h \
|
||||
../Phreeqc_class.h ../Parser.h ../Dictionary.h ../Solution.h \
|
||||
../NumKeyword.h ../SolutionIsotopeList.h ../SolutionIsotope.h \
|
||||
../NameDouble.h ../cxxMix.h ../Exchange.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../ExchComp.h ../Surface.h ../SurfaceComp.h \
|
||||
../phreeqc/phrqproto.h ../SurfaceCharge.h ../PPassemblage.h \
|
||||
../PPassemblageComp.h ../cxxKinetics.h ../KineticsComp.h \
|
||||
../SSassemblage.h ../SSassemblageSS.h ../GasPhase.h ../Reaction.h \
|
||||
../Temperature.h ../dumper.h ../StorageBinList.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h
|
||||
SAXPhreeqc.o: ../SAXPhreeqc.cxx ../SAXPhreeqc.h ../SaxPhreeqcHandlers.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h
|
||||
Solution.o: ../Solution.cxx ../Utils.h ../char_star.h ../Solution.h \
|
||||
../NumKeyword.h ../Parser.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../NameDouble.h ../cxxMix.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h ../ISolution.h ../ISolutionComp.h ../Exchange.h \
|
||||
../ExchComp.h ../Surface.h ../SurfaceComp.h ../SurfaceCharge.h \
|
||||
../PPassemblage.h ../PPassemblageComp.h ../cxxKinetics.h \
|
||||
../KineticsComp.h ../SSassemblage.h ../SSassemblageSS.h ../GasPhase.h \
|
||||
../Reaction.h ../Temperature.h ../StorageBin.h ../System.h
|
||||
SolutionIsotope.o: ../SolutionIsotope.cxx ../SolutionIsotope.h \
|
||||
../Parser.h ../char_star.h ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
SolutionIsotopeList.o: ../SolutionIsotopeList.cxx ../Utils.h \
|
||||
../char_star.h ../SolutionIsotopeList.h ../SolutionIsotope.h \
|
||||
../Parser.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
PPassemblage.o: ../PPassemblage.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../PPassemblage.h \
|
||||
../NumKeyword.h ../PPassemblageComp.h ../NameDouble.h \
|
||||
../Phreeqc_class.h ../Parser.h ../cxxMix.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h
|
||||
Reaction.o: ../Reaction.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../Reaction.h \
|
||||
../NumKeyword.h ../NameDouble.h ../Phreeqc_class.h ../Parser.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
SSassemblage.o: ../SSassemblage.cxx ../Utils.h ../char_star.h \
|
||||
../SSassemblage.h ../NumKeyword.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../SSassemblageSS.h ../NameDouble.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
SSassemblageSS.o: ../SSassemblageSS.cxx ../Utils.h ../char_star.h \
|
||||
../SSassemblageSS.h ../NameDouble.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../Dictionary.h ../Solution.h ../NumKeyword.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
StorageBin.o: ../StorageBin.cxx ../Utils.h ../char_star.h ../StorageBin.h \
|
||||
../Parser.h ../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../NameDouble.h ../cxxMix.h ../Exchange.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h ../ExchComp.h ../GasPhase.h \
|
||||
../cxxKinetics.h ../KineticsComp.h ../PPassemblage.h \
|
||||
../PPassemblageComp.h ../SSassemblage.h ../SSassemblageSS.h \
|
||||
../Surface.h ../SurfaceComp.h ../phreeqc/phrqproto.h ../SurfaceCharge.h \
|
||||
../System.h ../Reaction.h ../Temperature.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h
|
||||
SurfaceCharge.o: ../SurfaceCharge.cxx ../Utils.h ../char_star.h \
|
||||
../SurfaceCharge.h ../NameDouble.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../Dictionary.h ../Solution.h ../NumKeyword.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../cxxMix.h \
|
||||
../phreeqc/output.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
SurfaceComp.o: ../SurfaceComp.cxx ../Utils.h ../char_star.h \
|
||||
../SurfaceComp.h ../NameDouble.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phrqproto.h ../Dictionary.h \
|
||||
ReadClass.o: ../ReadClass.cxx ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../Phreeqc_class.h ../Parser.h \
|
||||
../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../cxxMix.h ../phreeqc/phqalloc.h \
|
||||
../SolutionIsotope.h ../NameDouble.h ../Exchange.h ../ExchComp.h \
|
||||
../Surface.h ../SurfaceComp.h ../SurfaceCharge.h ../PPassemblage.h \
|
||||
../PPassemblageComp.h ../cxxKinetics.h ../KineticsComp.h \
|
||||
../SSassemblage.h ../GasPhase.h ../Reaction.h ../cxxMix.h \
|
||||
../Temperature.h ../dumper.h ../StorageBinList.h ../runner.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
SAXPhreeqc.o: ../SAXPhreeqc.cxx ../SAXPhreeqc.h ../SaxPhreeqcHandlers.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h
|
||||
Solution.o: ../Solution.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../Solution.h \
|
||||
../Phreeqc_class.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../Parser.h ../NameDouble.h ../cxxMix.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
SolutionIsotope.o: ../SolutionIsotope.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../SolutionIsotope.h ../Parser.h ../Phreeqc_class.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
SolutionIsotopeList.o: ../SolutionIsotopeList.cxx ../Utils.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../Parser.h ../Phreeqc_class.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
SSassemblage.o: ../SSassemblage.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../SSassemblage.h \
|
||||
../Phreeqc_class.h ../NumKeyword.h ../NameDouble.h ../Parser.h \
|
||||
../SSassemblageSS.h ../cxxMix.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h
|
||||
SSassemblageSS.o: ../SSassemblageSS.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../SSassemblageSS.h ../NameDouble.h ../Phreeqc_class.h ../Parser.h \
|
||||
../Dictionary.h ../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
StorageBin.o: ../StorageBin.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../NameDouble.h \
|
||||
../Phreeqc_class.h ../Parser.h ../StorageBin.h ../System.h \
|
||||
../SSassemblage.h ../NumKeyword.h ../Solution.h \
|
||||
../SolutionIsotopeList.h ../SolutionIsotope.h ../Exchange.h \
|
||||
../ExchComp.h ../GasPhase.h ../cxxKinetics.h ../KineticsComp.h \
|
||||
../PPassemblage.h ../PPassemblageComp.h ../SSassemblageSS.h \
|
||||
../Surface.h ../SurfaceComp.h ../SurfaceCharge.h ../cxxMix.h \
|
||||
../Reaction.h ../Temperature.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/output.h
|
||||
SurfaceCharge.o: ../SurfaceCharge.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../SurfaceCharge.h \
|
||||
../NameDouble.h ../Phreeqc_class.h ../Parser.h ../Dictionary.h \
|
||||
../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h
|
||||
Surface.o: ../Surface.cxx ../Utils.h ../char_star.h ../Surface.h \
|
||||
../NumKeyword.h ../Parser.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../SurfaceComp.h ../NameDouble.h ../phreeqc/phrqproto.h \
|
||||
../SurfaceCharge.h ../cxxMix.h ../phreeqc/phqalloc.h
|
||||
System.o: ../System.cxx ../System.h ../Solution.h ../NumKeyword.h \
|
||||
../Parser.h ../char_star.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../NameDouble.h ../cxxMix.h ../Exchange.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h ../ExchComp.h ../GasPhase.h \
|
||||
../cxxKinetics.h ../KineticsComp.h ../PPassemblage.h \
|
||||
../PPassemblageComp.h ../SSassemblage.h ../SSassemblageSS.h \
|
||||
../Surface.h ../SurfaceComp.h ../phreeqc/phrqproto.h ../SurfaceCharge.h \
|
||||
../Reaction.h ../Temperature.h
|
||||
Temperature.o: ../Temperature.cxx ../Utils.h ../char_star.h \
|
||||
../Temperature.h ../NumKeyword.h ../Parser.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
Utils.o: ../Utils.cxx ../Utils.h ../char_star.h ../Parser.h \
|
||||
SurfaceComp.o: ../SurfaceComp.cxx ../Utils.h ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h ../SurfaceComp.h \
|
||||
../Phreeqc_class.h ../NameDouble.h ../Parser.h ../Dictionary.h \
|
||||
../Solution.h ../NumKeyword.h ../SolutionIsotopeList.h \
|
||||
../SolutionIsotope.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h
|
||||
dumper.o: ../dumper.cpp ../dumper.h ../Parser.h ../char_star.h \
|
||||
../StorageBinList.h
|
||||
Surface.o: ../Surface.cxx ../Phreeqc_class.h ../Utils.h \
|
||||
../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../Surface.h ../NumKeyword.h \
|
||||
../SurfaceComp.h ../NameDouble.h ../Parser.h ../SurfaceCharge.h \
|
||||
../cxxMix.h ../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
System.o: ../System.cxx ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../System.h ../NameDouble.h \
|
||||
../Phreeqc_class.h ../Parser.h ../SSassemblage.h ../NumKeyword.h \
|
||||
../Solution.h ../SolutionIsotopeList.h ../SolutionIsotope.h \
|
||||
../Exchange.h ../ExchComp.h ../GasPhase.h ../cxxKinetics.h \
|
||||
../KineticsComp.h ../PPassemblage.h ../PPassemblageComp.h \
|
||||
../SSassemblageSS.h ../Surface.h ../SurfaceComp.h ../SurfaceCharge.h \
|
||||
../cxxMix.h ../Reaction.h ../Temperature.h
|
||||
Temperature.o: ../Temperature.cxx ../Utils.h ../Parser.h \
|
||||
../Phreeqc_class.h ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../Temperature.h ../NumKeyword.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/phrqproto.h
|
||||
Utils.o: ../Utils.cxx ../Utils.h ../Parser.h ../Phreeqc_class.h \
|
||||
../phreeqc/output.h
|
||||
class_main.o: ../class_main.cpp ../Phreeqc.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/phrqtype.h ../phreeqc/nvector.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/cvdense.h ../phreeqc/cvode.h \
|
||||
../phreeqc/nvector.h ../phreeqc/dense.h ../phreeqc/smalldense.h \
|
||||
../phreeqc/nvector_serial.h ../phreeqc/dense.h ../phreeqc/p2c.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/pitzer_structures.h \
|
||||
../phreeqc/pitzer.h ../phreeqc/input.h ../phreeqc/output.h \
|
||||
../phreeqc/global.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phrqproto.h
|
||||
dumper.o: ../dumper.cpp ../dumper.h ../StorageBinList.h ../Parser.h \
|
||||
../Phreeqc_class.h
|
||||
Phreeqc.o: ../Phreeqc.cpp ../Phreeqc.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/phrqtype.h ../phreeqc/nvector.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/cvdense.h ../phreeqc/cvode.h \
|
||||
../phreeqc/nvector.h ../phreeqc/dense.h ../phreeqc/smalldense.h \
|
||||
../phreeqc/nvector_serial.h ../phreeqc/dense.h ../phreeqc/p2c.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/pitzer_structures.h \
|
||||
../phreeqc/pitzer.h ../phreeqc/input.h ../phreeqc/output.h \
|
||||
../phreeqc/global.h ../phreeqc/global_structures.h
|
||||
runner.o: ../runner.cpp ../runner.h ../StorageBinList.h ../Parser.h \
|
||||
../Phreeqc_class.h
|
||||
StorageBinList.o: ../StorageBinList.cpp ../StorageBinList.h ../Parser.h \
|
||||
../char_star.h
|
||||
../Phreeqc_class.h
|
||||
#
|
||||
# PHREEQC files
|
||||
#
|
||||
advection.o: ../phreeqc/advection.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
basic.o: ../phreeqc/basic.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/p2c.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h ../phreeqc/p2c.h \
|
||||
../phreeqc/basic.h
|
||||
basicsubs.o: ../phreeqc/basicsubs.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
cl1.o: ../phreeqc/cl1.c ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqtype.h
|
||||
cl1mp.o: ../phreeqc/cl1mp.c ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
@ -375,83 +447,105 @@ dense.o: ../phreeqc/dense.c ../phreeqc/sundialstypes.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/sundialsmath.h ../phreeqc/dense.h \
|
||||
../phreeqc/smalldense.h ../phreeqc/output.h ../phreeqc/phqalloc.h
|
||||
dw.o: ../phreeqc/dw.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/output.h ../phreeqc/pitzer.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/output.h ../phreeqc/pitzer.h
|
||||
input.o: ../phreeqc/input.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/input.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/phqalloc.h
|
||||
../phreeqc/global_structures.h ../phreeqc/input.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/phqalloc.h
|
||||
integrate.o: ../phreeqc/integrate.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
inverse.o: ../phreeqc/inverse.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
isotopes.o: ../phreeqc/isotopes.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
kinetics.o: ../phreeqc/kinetics.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/sundialstypes.h ../phreeqc/cvode.h \
|
||||
../phreeqc/nvector.h ../phreeqc/cvdense.h ../phreeqc/dense.h \
|
||||
../phreeqc/smalldense.h ../phreeqc/nvector_serial.h \
|
||||
../phreeqc/kinetics.h
|
||||
main.o: ../phreeqc/main.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h ../phreeqc/input.h
|
||||
mainsubs.o: ../phreeqc/mainsubs.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/input.h
|
||||
model.o: ../phreeqc/model.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
kinetics.o: ../phreeqc/kinetics.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/cvode.h ../phreeqc/nvector.h \
|
||||
../phreeqc/cvdense.h ../phreeqc/dense.h ../phreeqc/smalldense.h \
|
||||
../phreeqc/nvector_serial.h ../phreeqc/kinetics.h
|
||||
main.o: ../phreeqc/main.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/input.h
|
||||
mainsubs.o: ../phreeqc/mainsubs.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/input.h
|
||||
model.o: ../phreeqc/model.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
nvector.o: ../phreeqc/nvector.c ../phreeqc/nvector.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/phrqtype.h ../phreeqc/output.h
|
||||
nvector_serial.o: ../phreeqc/nvector_serial.c ../phreeqc/nvector_serial.h \
|
||||
../phreeqc/nvector.h ../phreeqc/sundialstypes.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/sundialsmath.h ../phreeqc/output.h ../phreeqc/phqalloc.h
|
||||
output.o: ../phreeqc/output.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h ../phreeqc/phqalloc.h
|
||||
../phreeqc/global_structures.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/phqalloc.h
|
||||
p2clib.o: ../phreeqc/p2clib.c ../phreeqc/p2c.h ../phreeqc/output.h
|
||||
parse.o: ../phreeqc/parse.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
phqalloc.o: ../phreeqc/phqalloc.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/output.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/output.h
|
||||
phreeqc_files.o: ../phreeqc/phreeqc_files.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/input.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/input.h
|
||||
pitzer.o: ../phreeqc/pitzer.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/pitzer.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/pitzer_structures.h ../phreeqc/pitzer.h
|
||||
pitzer_structures.o: ../phreeqc/pitzer_structures.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h ../phreeqc/pitzer.h
|
||||
prep.o: ../phreeqc/prep.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
print.o: ../phreeqc/print.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/pitzer.h
|
||||
../phreeqc/pitzer_structures.h ../phreeqc/pitzer.h
|
||||
prep.o: ../phreeqc/prep.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
print.o: ../phreeqc/print.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h ../phreeqc/pitzer.h
|
||||
read.o: ../phreeqc/read.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
readtr.o: ../phreeqc/readtr.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
sit.o: ../phreeqc/sit.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h \
|
||||
../phreeqc/pitzer_structures.h ../phreeqc/pitzer.h
|
||||
smalldense.o: ../phreeqc/smalldense.c ../phreeqc/smalldense.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/sundialsmath.h ../phreeqc/output.h ../phreeqc/phqalloc.h
|
||||
spread.o: ../phreeqc/spread.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
step.o: ../phreeqc/step.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
structures.o: ../phreeqc/structures.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
sundialsmath.o: ../phreeqc/sundialsmath.c ../phreeqc/sundialsmath.h \
|
||||
../phreeqc/sundialstypes.h ../phreeqc/phrqtype.h ../phreeqc/output.h
|
||||
tally.o: ../phreeqc/tally.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
tidy.o: ../phreeqc/tidy.c ../phreeqc/global.h ../phreeqc/phrqtype.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
../phreeqc/global_structures.h ../phreeqc/phqalloc.h \
|
||||
../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
transport.o: ../phreeqc/transport.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
utilities.o: ../phreeqc/utilities.c ../phreeqc/global.h \
|
||||
../phreeqc/phrqtype.h ../phreeqc/phqalloc.h ../phreeqc/output.h \
|
||||
../phreeqc/phrqproto.h
|
||||
../phreeqc/phrqtype.h ../phreeqc/global_structures.h \
|
||||
../phreeqc/phqalloc.h ../phreeqc/output.h ../phreeqc/phrqproto.h
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
clean:
|
||||
@ -459,7 +553,7 @@ clean:
|
||||
|
||||
dependencies:
|
||||
mkdir -p $(DEBUG_DIR)
|
||||
cd $(DEBUG_DIR); gcc -MM -I../phreeqc ../*.cxx ../*.cpp
|
||||
cd $(DEBUG_DIR); gcc -MM -I../phreeqc ../*.cxx ../*.cpp ../phreeqc/*.c
|
||||
|
||||
tester:
|
||||
cd ../mytest; make clean; make -k $(SPOOL) make.out $(SPOOL2); make zero; make diff $(SPOOL) diff.out $(SPOOL2)
|
||||
|
||||
@ -1331,4 +1331,4 @@ incr_input_error()
|
||||
{
|
||||
++ ERROR_MESSAGE_QUALIFIER input_error;
|
||||
return ++m_input_error;
|
||||
}
|
||||
}
|
||||
|
||||
@ -25,6 +25,9 @@
|
||||
/* NV_Ith_S, prototypes for N_VNew, N_VFree */
|
||||
#include "dense.h" /* definitions of type DenseMat, macro DENSE_ELEM */
|
||||
#include "nvector.h"
|
||||
#include "runner.h"
|
||||
#include "dumper.h"
|
||||
#include "StorageBinList.h"
|
||||
|
||||
#define STATIC
|
||||
#define EXTERNAL
|
||||
|
||||
@ -20,4 +20,4 @@
|
||||
#define PHREEQC_NAME_SPACE Phreeqc::
|
||||
#endif
|
||||
#endif /* _INC_PHREEQC_CLASS_H */
|
||||
//#include "Phreeqc_class.h"
|
||||
//#include "Phreeqc_class.h"
|
||||
@ -30,6 +30,8 @@
|
||||
#include "phrqproto.h"
|
||||
#include "output.h"
|
||||
|
||||
|
||||
#if !defined(PHREEQC_CLASS)
|
||||
static int streamify_to_next_keyword(std::istringstream & lines);
|
||||
extern int reading_database(void);
|
||||
extern int check_line(const char *string, int allow_empty, int allow_eof,
|
||||
@ -39,6 +41,7 @@ extern int copy_use(int i);
|
||||
dumper dump_info;
|
||||
StorageBinList delete_info;
|
||||
runner run_info;
|
||||
#endif
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
int CLASS_QUALIFIER
|
||||
|
||||
@ -340,37 +340,37 @@ const std::map < int, cxxSolution > &
|
||||
cxxStorageBin::getSolutions() const
|
||||
{
|
||||
return this->Solutions;
|
||||
};
|
||||
}
|
||||
const std::map < int, cxxExchange > &
|
||||
cxxStorageBin::getExchangers() const
|
||||
{
|
||||
return this->Exchangers;
|
||||
};
|
||||
}
|
||||
const std::map < int, cxxGasPhase > &
|
||||
cxxStorageBin::getGasPhases() const
|
||||
{
|
||||
return this->GasPhases;
|
||||
};
|
||||
}
|
||||
const std::map < int, cxxKinetics > &
|
||||
cxxStorageBin::getKinetics() const
|
||||
{
|
||||
return this->Kinetics;
|
||||
};
|
||||
}
|
||||
const std::map < int, cxxPPassemblage > &
|
||||
cxxStorageBin::getPPassemblages() const
|
||||
{
|
||||
return this->PPassemblages;
|
||||
};
|
||||
}
|
||||
const std::map < int, cxxSSassemblage > &
|
||||
cxxStorageBin::getSSassemblages() const
|
||||
{
|
||||
return this->SSassemblages;
|
||||
};
|
||||
}
|
||||
const std::map < int, cxxSurface > &
|
||||
cxxStorageBin::getSurfaces() const
|
||||
{
|
||||
return this->Surfaces;
|
||||
};
|
||||
}
|
||||
void
|
||||
cxxStorageBin::import_phreeqc(PHREEQC_PTR_ARG)
|
||||
//
|
||||
|
||||
@ -715,13 +715,13 @@ const cxxNameDouble &
|
||||
cxxSurfaceComp::get_totals() const
|
||||
{
|
||||
return (this->totals);
|
||||
};
|
||||
}
|
||||
std::string
|
||||
cxxSurfaceComp::charge_name(PHREEQC_PTR_ARG)
|
||||
{
|
||||
char * str = P_INSTANCE_POINTER string_hsave(this->formula.c_str());
|
||||
return (get_charge_name(P_INSTANCE_COMMA str));
|
||||
};
|
||||
}
|
||||
std::string
|
||||
cxxSurfaceComp::get_charge_name(PHREEQC_PTR_ARG_COMMA char *token)
|
||||
{
|
||||
@ -735,4 +735,4 @@ cxxSurfaceComp::get_charge_name(PHREEQC_PTR_ARG_COMMA char *token)
|
||||
ptr1[0] = '\0';
|
||||
}
|
||||
return (std::string(name));
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#include "input.h"
|
||||
|
||||
|
||||
|
||||
/* ----------------------------------------------------------------------
|
||||
* MAIN
|
||||
* ---------------------------------------------------------------------- */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user