mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
added common directory for Parser/PHRQ_base/PHRQ_io/phrqtype/Utils
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10056 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
5ecc9e5b5b
commit
fb33ab1e95
144
CMakeLists.txt
144
CMakeLists.txt
@ -48,7 +48,6 @@ add_definitions(-DSWIG_SHARED_OBJ)
|
||||
add_definitions(-DUSE_PHRQ_ALLOC)
|
||||
|
||||
SET(IPhreeqc_SOURCES
|
||||
src/thread.h
|
||||
src/CSelectedOutput.cpp
|
||||
src/CSelectedOutput.hxx
|
||||
src/CVar.hxx
|
||||
@ -60,12 +59,24 @@ src/IPhreeqc.hpp
|
||||
src/IPhreeqc_interface_F.cpp
|
||||
src/IPhreeqcCallbacks.h
|
||||
src/IPhreeqcLib.cpp
|
||||
src/Var.c
|
||||
src/Var.h
|
||||
src/Version.h
|
||||
src/phreeqcpp/advection.cpp
|
||||
src/phreeqcpp/basicsubs.cpp
|
||||
src/phreeqcpp/ChartHandler.cpp
|
||||
src/phreeqcpp/ChartHandler.h
|
||||
src/phreeqcpp/ChartObject.cpp
|
||||
src/phreeqcpp/ChartObject.h
|
||||
src/phreeqcpp/cl1.cpp
|
||||
src/phreeqcpp/common/Parser.cxx
|
||||
src/phreeqcpp/common/Parser.h
|
||||
src/phreeqcpp/common/PHRQ_base.cxx
|
||||
src/phreeqcpp/common/PHRQ_base.h
|
||||
src/phreeqcpp/common/PHRQ_io.cpp
|
||||
src/phreeqcpp/common/PHRQ_io.h
|
||||
src/phreeqcpp/common/phrqtype.h
|
||||
src/phreeqcpp/common/Utils.cxx
|
||||
src/phreeqcpp/common/Utils.h
|
||||
src/phreeqcpp/CurveObject.cpp
|
||||
src/phreeqcpp/CurveObject.h
|
||||
src/phreeqcpp/cvdense.cpp
|
||||
src/phreeqcpp/cvdense.h
|
||||
src/phreeqcpp/cvode.cpp
|
||||
@ -78,108 +89,90 @@ src/phreeqcpp/dense.cpp
|
||||
src/phreeqcpp/dense.h
|
||||
src/phreeqcpp/dumper.cpp
|
||||
src/phreeqcpp/dumper.h
|
||||
#src/phreeqcpp/dw.cpp
|
||||
src/phreeqcpp/Exchange.cxx
|
||||
src/phreeqcpp/Exchange.h
|
||||
src/phreeqcpp/ExchComp.cxx
|
||||
src/phreeqcpp/ExchComp.h
|
||||
src/phreeqcpp/GasComp.cxx
|
||||
src/phreeqcpp/GasComp.h
|
||||
src/phreeqcpp/gases.cpp
|
||||
src/phreeqcpp/GasPhase.cxx
|
||||
src/phreeqcpp/GasPhase.h
|
||||
src/phreeqcpp/global_structures.h
|
||||
src/phreeqcpp/input.cpp
|
||||
src/phreeqcpp/integrate.cpp
|
||||
src/phreeqcpp/inverse.cpp
|
||||
src/phreeqcpp/isotopes.cpp
|
||||
src/phreeqcpp/kinetics.cpp
|
||||
src/phreeqcpp/mainsubs.cpp
|
||||
src/phreeqcpp/model.cpp
|
||||
src/phreeqcpp/nvector.cpp
|
||||
src/phreeqcpp/nvector.h
|
||||
src/phreeqcpp/nvector_serial.cpp
|
||||
src/phreeqcpp/nvector_serial.h
|
||||
src/phreeqcpp/parse.cpp
|
||||
src/phreeqcpp/phqalloc.cpp
|
||||
src/phreeqcpp/phqalloc.h
|
||||
src/phreeqcpp/phrqtype.h
|
||||
src/phreeqcpp/pitzer.cpp
|
||||
src/phreeqcpp/pitzer_structures.cpp
|
||||
src/phreeqcpp/prep.cpp
|
||||
src/phreeqcpp/print.cpp
|
||||
src/phreeqcpp/read.cpp
|
||||
src/phreeqcpp/readtr.cpp
|
||||
src/phreeqcpp/runner.cpp
|
||||
src/phreeqcpp/runner.h
|
||||
src/phreeqcpp/sit.cpp
|
||||
src/phreeqcpp/smalldense.cpp
|
||||
src/phreeqcpp/smalldense.h
|
||||
src/phreeqcpp/spread.cpp
|
||||
src/phreeqcpp/step.cpp
|
||||
src/phreeqcpp/structures.cpp
|
||||
src/phreeqcpp/sundialsmath.cpp
|
||||
src/phreeqcpp/sundialsmath.h
|
||||
src/phreeqcpp/sundialstypes.h
|
||||
src/phreeqcpp/tally.cpp
|
||||
src/phreeqcpp/tidy.cpp
|
||||
src/phreeqcpp/transport.cpp
|
||||
src/phreeqcpp/utilities.cpp
|
||||
src/phreeqcpp/ChartHandler.cpp
|
||||
src/phreeqcpp/ChartHandler.h
|
||||
src/phreeqcpp/ChartObject.cpp
|
||||
src/phreeqcpp/ChartObject.h
|
||||
src/phreeqcpp/CurveObject.cpp
|
||||
src/phreeqcpp/CurveObject.h
|
||||
src/phreeqcpp/ExchComp.cxx
|
||||
src/phreeqcpp/ExchComp.h
|
||||
src/phreeqcpp/Exchange.cxx
|
||||
src/phreeqcpp/Exchange.h
|
||||
src/phreeqcpp/GasComp.cxx
|
||||
src/phreeqcpp/GasComp.h
|
||||
src/phreeqcpp/GasPhase.cxx
|
||||
src/phreeqcpp/GasPhase.h
|
||||
src/phreeqcpp/ISolution.cxx
|
||||
src/phreeqcpp/ISolution.h
|
||||
src/phreeqcpp/ISolutionComp.cxx
|
||||
src/phreeqcpp/ISolutionComp.h
|
||||
src/phreeqcpp/isotopes.cpp
|
||||
src/phreeqcpp/kinetics.cpp
|
||||
src/phreeqcpp/KineticsComp.cxx
|
||||
src/phreeqcpp/KineticsComp.h
|
||||
src/phreeqcpp/mainsubs.cpp
|
||||
src/phreeqcpp/model.cpp
|
||||
src/phreeqcpp/NA.h
|
||||
src/phreeqcpp/NameDouble.cxx
|
||||
src/phreeqcpp/NameDouble.h
|
||||
src/phreeqcpp/NumKeyword.cxx
|
||||
src/phreeqcpp/NumKeyword.h
|
||||
src/phreeqcpp/nvector.cpp
|
||||
src/phreeqcpp/nvector.h
|
||||
src/phreeqcpp/nvector_serial.cpp
|
||||
src/phreeqcpp/nvector_serial.h
|
||||
src/phreeqcpp/parse.cpp
|
||||
src/phreeqcpp/PBasic.cpp
|
||||
src/phreeqcpp/PBasic.h
|
||||
src/phreeqcpp/PHRQ_base.cxx
|
||||
src/phreeqcpp/PHRQ_base.h
|
||||
src/phreeqcpp/PHRQ_io.cpp
|
||||
src/phreeqcpp/PHRQ_io.h
|
||||
src/phreeqcpp/PHRQ_io_output.cpp
|
||||
src/phreeqcpp/PPassemblage.cxx
|
||||
src/phreeqcpp/PPassemblage.h
|
||||
src/phreeqcpp/PPassemblageComp.cxx
|
||||
src/phreeqcpp/PPassemblageComp.h
|
||||
src/phreeqcpp/Parser.cxx
|
||||
src/phreeqcpp/Parser.h
|
||||
src/phreeqcpp/phqalloc.cpp
|
||||
src/phreeqcpp/phqalloc.h
|
||||
src/phreeqcpp/Phreeqc.cpp
|
||||
src/phreeqcpp/Phreeqc.h
|
||||
src/phreeqcpp/PhreeqcKeywords/Keywords.cpp
|
||||
src/phreeqcpp/PhreeqcKeywords/Keywords.h
|
||||
src/phreeqcpp/PHRQ_io_output.cpp
|
||||
src/phreeqcpp/pitzer.cpp
|
||||
src/phreeqcpp/pitzer_structures.cpp
|
||||
src/phreeqcpp/PPassemblage.cxx
|
||||
src/phreeqcpp/PPassemblage.h
|
||||
src/phreeqcpp/PPassemblageComp.cxx
|
||||
src/phreeqcpp/PPassemblageComp.h
|
||||
src/phreeqcpp/prep.cpp
|
||||
src/phreeqcpp/Pressure.cxx
|
||||
src/phreeqcpp/Pressure.h
|
||||
src/phreeqcpp/print.cpp
|
||||
src/phreeqcpp/Reaction.cxx
|
||||
src/phreeqcpp/Reaction.h
|
||||
src/phreeqcpp/read.cpp
|
||||
src/phreeqcpp/ReadClass.cxx
|
||||
src/phreeqcpp/readtr.cpp
|
||||
src/phreeqcpp/runner.cpp
|
||||
src/phreeqcpp/runner.h
|
||||
src/phreeqcpp/SelectedOutput.cpp
|
||||
src/phreeqcpp/SelectedOutput.h
|
||||
src/phreeqcpp/sit.cpp
|
||||
src/phreeqcpp/smalldense.cpp
|
||||
src/phreeqcpp/smalldense.h
|
||||
src/phreeqcpp/Solution.cxx
|
||||
src/phreeqcpp/Solution.h
|
||||
src/phreeqcpp/SolutionIsotope.cxx
|
||||
src/phreeqcpp/SolutionIsotope.h
|
||||
src/phreeqcpp/spread.cpp
|
||||
src/phreeqcpp/SS.cxx
|
||||
src/phreeqcpp/SS.h
|
||||
src/phreeqcpp/SSassemblage.cxx
|
||||
src/phreeqcpp/SSassemblage.h
|
||||
src/phreeqcpp/SScomp.cxx
|
||||
src/phreeqcpp/SScomp.h
|
||||
src/phreeqcpp/SelectedOutput.cpp
|
||||
src/phreeqcpp/SelectedOutput.h
|
||||
src/phreeqcpp/Solution.cxx
|
||||
src/phreeqcpp/Solution.h
|
||||
src/phreeqcpp/SolutionIsotope.cxx
|
||||
src/phreeqcpp/SolutionIsotope.h
|
||||
src/phreeqcpp/step.cpp
|
||||
src/phreeqcpp/StorageBin.cxx
|
||||
src/phreeqcpp/StorageBin.h
|
||||
src/phreeqcpp/StorageBinList.cpp
|
||||
src/phreeqcpp/StorageBinList.h
|
||||
src/phreeqcpp/structures.cpp
|
||||
src/phreeqcpp/sundialsmath.cpp
|
||||
src/phreeqcpp/sundialsmath.h
|
||||
src/phreeqcpp/sundialstypes.h
|
||||
src/phreeqcpp/Surface.cxx
|
||||
src/phreeqcpp/Surface.h
|
||||
src/phreeqcpp/SurfaceCharge.cxx
|
||||
@ -188,14 +181,20 @@ src/phreeqcpp/SurfaceComp.cxx
|
||||
src/phreeqcpp/SurfaceComp.h
|
||||
src/phreeqcpp/System.cxx
|
||||
src/phreeqcpp/System.h
|
||||
src/phreeqcpp/tally.cpp
|
||||
src/phreeqcpp/Temperature.cxx
|
||||
src/phreeqcpp/Temperature.h
|
||||
src/phreeqcpp/tidy.cpp
|
||||
src/phreeqcpp/transport.cpp
|
||||
src/phreeqcpp/Use.cpp
|
||||
src/phreeqcpp/Use.h
|
||||
src/phreeqcpp/UserPunch.cpp
|
||||
src/phreeqcpp/UserPunch.h
|
||||
src/phreeqcpp/Utils.cxx
|
||||
src/phreeqcpp/Utils.h
|
||||
src/phreeqcpp/utilities.cpp
|
||||
src/thread.h
|
||||
src/Var.c
|
||||
src/Var.h
|
||||
src/Version.h
|
||||
)
|
||||
|
||||
# compile Var.c as c++
|
||||
@ -223,6 +222,7 @@ endif()
|
||||
include_directories("${PROJECT_SOURCE_DIR}")
|
||||
include_directories("${PROJECT_SOURCE_DIR}/src")
|
||||
include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp")
|
||||
include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp/common")
|
||||
include_directories("${PROJECT_SOURCE_DIR}/src/phreeqcpp/PhreeqcKeywords")
|
||||
|
||||
|
||||
@ -249,7 +249,7 @@ ${PROJECT_SOURCE_DIR}/src/IPhreeqc.h
|
||||
${PROJECT_SOURCE_DIR}/src/IPhreeqc.hpp
|
||||
${PROJECT_SOURCE_DIR}/src/IPhreeqcCallbacks.h
|
||||
${PROJECT_SOURCE_DIR}/src/phreeqcpp/PhreeqcKeywords/Keywords.h
|
||||
${PROJECT_SOURCE_DIR}/src/phreeqcpp/PHRQ_io.h
|
||||
${PROJECT_SOURCE_DIR}/src/phreeqcpp/common/PHRQ_io.h
|
||||
${PROJECT_SOURCE_DIR}/src/Var.h
|
||||
)
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ EXTRA_DIST=\
|
||||
phreeqcpp/Form1.resX\
|
||||
phreeqcpp/ZedGraph.dll
|
||||
|
||||
AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords
|
||||
AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/common -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords
|
||||
|
||||
AM_LDFLAGS=-release 3.0.0
|
||||
|
||||
@ -44,6 +44,15 @@ libiphreeqc_la_SOURCES=\
|
||||
phreeqcpp/advection.cpp\
|
||||
phreeqcpp/basicsubs.cpp\
|
||||
phreeqcpp/cl1.cpp\
|
||||
phreeqcpp/commmon/Parser.cxx\
|
||||
phreeqcpp/commmon/Parser.h\
|
||||
phreeqcpp/commmon/PHRQ_base.cxx\
|
||||
phreeqcpp/commmon/PHRQ_base.h\
|
||||
phreeqcpp/commmon/PHRQ_io.cpp\
|
||||
phreeqcpp/commmon/PHRQ_io.h\
|
||||
phreeqcpp/commmon/phrqtype.h\
|
||||
phreeqcpp/commmon/Utils.cxx\
|
||||
phreeqcpp/commmon/Utils.h\
|
||||
phreeqcpp/cvdense.cpp\
|
||||
phreeqcpp/cvdense.h\
|
||||
phreeqcpp/cvode.cpp\
|
||||
@ -90,8 +99,6 @@ libiphreeqc_la_SOURCES=\
|
||||
phreeqcpp/nvector_serial.cpp\
|
||||
phreeqcpp/nvector_serial.h\
|
||||
phreeqcpp/parse.cpp\
|
||||
phreeqcpp/Parser.cxx\
|
||||
phreeqcpp/Parser.h\
|
||||
phreeqcpp/PBasic.cpp\
|
||||
phreeqcpp/PBasic.h\
|
||||
phreeqcpp/phqalloc.cpp\
|
||||
@ -100,12 +107,7 @@ libiphreeqc_la_SOURCES=\
|
||||
phreeqcpp/Phreeqc.h\
|
||||
phreeqcpp/PhreeqcKeywords/Keywords.cpp\
|
||||
phreeqcpp/PhreeqcKeywords/Keywords.h\
|
||||
phreeqcpp/PHRQ_base.cxx\
|
||||
phreeqcpp/PHRQ_base.h\
|
||||
phreeqcpp/PHRQ_io.cpp\
|
||||
phreeqcpp/PHRQ_io.h\
|
||||
phreeqcpp/PHRQ_io_output.cpp\
|
||||
phreeqcpp/phrqtype.h\
|
||||
phreeqcpp/pitzer.cpp\
|
||||
phreeqcpp/pitzer_structures.cpp\
|
||||
phreeqcpp/PPassemblage.cxx\
|
||||
@ -166,8 +168,6 @@ libiphreeqc_la_SOURCES=\
|
||||
phreeqcpp/UserPunch.cpp\
|
||||
phreeqcpp/UserPunch.h\
|
||||
phreeqcpp/utilities.cpp\
|
||||
phreeqcpp/Utils.cxx\
|
||||
phreeqcpp/Utils.h\
|
||||
thread.h\
|
||||
Var.c\
|
||||
Version.h
|
||||
@ -177,7 +177,7 @@ include_HEADERS=\
|
||||
$(top_srcdir)/src/IPhreeqc.hpp\
|
||||
$(top_srcdir)/src/IPhreeqcCallbacks.h\
|
||||
$(top_srcdir)/src/Var.h\
|
||||
$(top_srcdir)/src/phreeqcpp/PHRQ_io.h\
|
||||
$(top_srcdir)/src/phreeqcpp/common/PHRQ_io.h\
|
||||
$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords/Keywords.h
|
||||
|
||||
sourcedir=$(docdir)/src
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user