mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
updated projects for phreeqc directory removal
data base => database git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7345 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
8464c92ac9
commit
f9c9d8e6c2
@ -47,7 +47,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@ -120,7 +120,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@ -191,7 +191,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -265,7 +265,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -339,7 +339,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -422,7 +422,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -503,7 +503,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -587,7 +587,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -672,7 +672,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MULTICHART"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="0"
|
||||
@ -758,7 +758,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MULTICHART"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="0"
|
||||
@ -845,7 +845,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MULTICHART"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -929,7 +929,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MULTICHART"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -984,7 +984,7 @@
|
||||
</Configurations>
|
||||
<References>
|
||||
<AssemblyReference
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\ZedGraph.dll"
|
||||
RelativePath=".\src\phreeqcpp\ZedGraph.dll"
|
||||
AssemblyName="ZedGraph, Version=5.1.5.28844, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL"
|
||||
/>
|
||||
<AssemblyReference
|
||||
@ -1328,11 +1328,11 @@
|
||||
Name="phreeqc"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\advection.cpp"
|
||||
RelativePath=".\src\phreeqcpp\advection.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\basicsubs.cpp"
|
||||
RelativePath=".\src\phreeqcpp\basicsubs.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1344,7 +1344,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cl1.cpp"
|
||||
RelativePath=".\src\phreeqcpp\cl1.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1352,135 +1352,135 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvdense.cpp"
|
||||
RelativePath=".\src\phreeqcpp\cvdense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvode.cpp"
|
||||
RelativePath=".\src\phreeqcpp\cvode.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\dense.cpp"
|
||||
RelativePath=".\src\phreeqcpp\dense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\dw.cpp"
|
||||
RelativePath=".\src\phreeqcpp\dw.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\gases.cpp"
|
||||
RelativePath=".\src\phreeqcpp\gases.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\input.cpp"
|
||||
RelativePath=".\src\phreeqcpp\input.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\integrate.cpp"
|
||||
RelativePath=".\src\phreeqcpp\integrate.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\inverse.cpp"
|
||||
RelativePath=".\src\phreeqcpp\inverse.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\isotopes.cpp"
|
||||
RelativePath=".\src\phreeqcpp\isotopes.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\kinetics.cpp"
|
||||
RelativePath=".\src\phreeqcpp\kinetics.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\mainsubs.cpp"
|
||||
RelativePath=".\src\phreeqcpp\mainsubs.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\model.cpp"
|
||||
RelativePath=".\src\phreeqcpp\model.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector.cpp"
|
||||
RelativePath=".\src\phreeqcpp\nvector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector_serial.cpp"
|
||||
RelativePath=".\src\phreeqcpp\nvector_serial.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\parse.cpp"
|
||||
RelativePath=".\src\phreeqcpp\parse.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\phqalloc.cpp"
|
||||
RelativePath=".\src\phreeqcpp\phqalloc.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp"
|
||||
RelativePath=".\src\phreeqcpp\PHRQ_io_output.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer.cpp"
|
||||
RelativePath=".\src\phreeqcpp\pitzer.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer_structures.cpp"
|
||||
RelativePath=".\src\phreeqcpp\pitzer_structures.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\prep.cpp"
|
||||
RelativePath=".\src\phreeqcpp\prep.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\print.cpp"
|
||||
RelativePath=".\src\phreeqcpp\print.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\read.cpp"
|
||||
RelativePath=".\src\phreeqcpp\read.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\readtr.cpp"
|
||||
RelativePath=".\src\phreeqcpp\readtr.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sit.cpp"
|
||||
RelativePath=".\src\phreeqcpp\sit.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\smalldense.cpp"
|
||||
RelativePath=".\src\phreeqcpp\smalldense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\spread.cpp"
|
||||
RelativePath=".\src\phreeqcpp\spread.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\step.cpp"
|
||||
RelativePath=".\src\phreeqcpp\step.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\structures.cpp"
|
||||
RelativePath=".\src\phreeqcpp\structures.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sundialsmath.cpp"
|
||||
RelativePath=".\src\phreeqcpp\sundialsmath.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\tally.cpp"
|
||||
RelativePath=".\src\phreeqcpp\tally.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\tidy.cpp"
|
||||
RelativePath=".\src\phreeqcpp\tidy.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\transport.cpp"
|
||||
RelativePath=".\src\phreeqcpp\transport.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\utilities.cpp"
|
||||
RelativePath=".\src\phreeqcpp\utilities.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
@ -1495,11 +1495,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvdense.h"
|
||||
RelativePath=".\src\phreeqcpp\cvdense.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvode.h"
|
||||
RelativePath=".\src\phreeqcpp\cvode.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1511,7 +1511,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\dense.h"
|
||||
RelativePath=".\src\phreeqcpp\dense.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1535,7 +1535,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\Form1.h"
|
||||
RelativePath=".\src\phreeqcpp\Form1.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1547,15 +1547,15 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\global.h"
|
||||
RelativePath=".\src\phreeqcpp\global.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\global_structures.h"
|
||||
RelativePath=".\src\phreeqcpp\global_structures.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\input.h"
|
||||
RelativePath=".\src\phreeqcpp\input.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1571,7 +1571,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\kinetics.h"
|
||||
RelativePath=".\src\phreeqcpp\kinetics.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1587,19 +1587,19 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector.h"
|
||||
RelativePath=".\src\phreeqcpp\nvector.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector_serial.h"
|
||||
RelativePath=".\src\phreeqcpp\nvector_serial.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\output.h"
|
||||
RelativePath=".\src\phreeqcpp\output.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\p2c.h"
|
||||
RelativePath=".\src\phreeqcpp\p2c.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1611,7 +1611,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\phqalloc.h"
|
||||
RelativePath=".\src\phreeqcpp\phqalloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1631,15 +1631,15 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\phrqtype.h"
|
||||
RelativePath=".\src\phreeqcpp\phrqtype.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer.h"
|
||||
RelativePath=".\src\phreeqcpp\pitzer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer_structures.h"
|
||||
RelativePath=".\src\phreeqcpp\pitzer_structures.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1667,7 +1667,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\smalldense.h"
|
||||
RelativePath=".\src\phreeqcpp\smalldense.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1703,11 +1703,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sundialsmath.h"
|
||||
RelativePath=".\src\phreeqcpp\sundialsmath.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sundialstypes.h"
|
||||
RelativePath=".\src\phreeqcpp\sundialstypes.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
||||
@ -922,147 +922,147 @@
|
||||
Name="phreeqc"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\advection.cpp"
|
||||
RelativePath=".\src\phreeqcpp\advection.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\basicsubs.cpp"
|
||||
RelativePath=".\src\phreeqcpp\basicsubs.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cl1.cpp"
|
||||
RelativePath=".\src\phreeqcpp\cl1.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvdense.cpp"
|
||||
RelativePath=".\src\phreeqcpp\cvdense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvode.cpp"
|
||||
RelativePath=".\src\phreeqcpp\cvode.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\dense.cpp"
|
||||
RelativePath=".\src\phreeqcpp\dense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\dw.cpp"
|
||||
RelativePath=".\src\phreeqcpp\dw.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\gases.cpp"
|
||||
RelativePath=".\src\phreeqcpp\gases.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\input.cpp"
|
||||
RelativePath=".\src\phreeqcpp\input.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\integrate.cpp"
|
||||
RelativePath=".\src\phreeqcpp\integrate.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\inverse.cpp"
|
||||
RelativePath=".\src\phreeqcpp\inverse.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\isotopes.cpp"
|
||||
RelativePath=".\src\phreeqcpp\isotopes.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\kinetics.cpp"
|
||||
RelativePath=".\src\phreeqcpp\kinetics.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\mainsubs.cpp"
|
||||
RelativePath=".\src\phreeqcpp\mainsubs.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\model.cpp"
|
||||
RelativePath=".\src\phreeqcpp\model.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector.cpp"
|
||||
RelativePath=".\src\phreeqcpp\nvector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector_serial.cpp"
|
||||
RelativePath=".\src\phreeqcpp\nvector_serial.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\parse.cpp"
|
||||
RelativePath=".\src\phreeqcpp\parse.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\phqalloc.cpp"
|
||||
RelativePath=".\src\phreeqcpp\phqalloc.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp"
|
||||
RelativePath=".\src\phreeqcpp\PHRQ_io_output.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer.cpp"
|
||||
RelativePath=".\src\phreeqcpp\pitzer.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer_structures.cpp"
|
||||
RelativePath=".\src\phreeqcpp\pitzer_structures.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\prep.cpp"
|
||||
RelativePath=".\src\phreeqcpp\prep.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\print.cpp"
|
||||
RelativePath=".\src\phreeqcpp\print.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\read.cpp"
|
||||
RelativePath=".\src\phreeqcpp\read.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\readtr.cpp"
|
||||
RelativePath=".\src\phreeqcpp\readtr.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sit.cpp"
|
||||
RelativePath=".\src\phreeqcpp\sit.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\smalldense.cpp"
|
||||
RelativePath=".\src\phreeqcpp\smalldense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\spread.cpp"
|
||||
RelativePath=".\src\phreeqcpp\spread.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\step.cpp"
|
||||
RelativePath=".\src\phreeqcpp\step.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\structures.cpp"
|
||||
RelativePath=".\src\phreeqcpp\structures.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sundialsmath.cpp"
|
||||
RelativePath=".\src\phreeqcpp\sundialsmath.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\tally.cpp"
|
||||
RelativePath=".\src\phreeqcpp\tally.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\tidy.cpp"
|
||||
RelativePath=".\src\phreeqcpp\tidy.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\transport.cpp"
|
||||
RelativePath=".\src\phreeqcpp\transport.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\utilities.cpp"
|
||||
RelativePath=".\src\phreeqcpp\utilities.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
@ -1077,11 +1077,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvdense.h"
|
||||
RelativePath=".\src\phreeqcpp\cvdense.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\cvode.h"
|
||||
RelativePath=".\src\phreeqcpp\cvode.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1093,7 +1093,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\dense.h"
|
||||
RelativePath=".\src\phreeqcpp\dense.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1125,15 +1125,15 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\global.h"
|
||||
RelativePath=".\src\phreeqcpp\global.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\global_structures.h"
|
||||
RelativePath=".\src\phreeqcpp\global_structures.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\input.h"
|
||||
RelativePath=".\src\phreeqcpp\input.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1149,7 +1149,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\kinetics.h"
|
||||
RelativePath=".\src\phreeqcpp\kinetics.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1165,19 +1165,19 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector.h"
|
||||
RelativePath=".\src\phreeqcpp\nvector.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\nvector_serial.h"
|
||||
RelativePath=".\src\phreeqcpp\nvector_serial.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\output.h"
|
||||
RelativePath=".\src\phreeqcpp\output.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\p2c.h"
|
||||
RelativePath=".\src\phreeqcpp\p2c.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1189,7 +1189,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\phqalloc.h"
|
||||
RelativePath=".\src\phreeqcpp\phqalloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1209,15 +1209,15 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\phrqtype.h"
|
||||
RelativePath=".\src\phreeqcpp\phrqtype.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer.h"
|
||||
RelativePath=".\src\phreeqcpp\pitzer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\pitzer_structures.h"
|
||||
RelativePath=".\src\phreeqcpp\pitzer_structures.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1245,7 +1245,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\smalldense.h"
|
||||
RelativePath=".\src\phreeqcpp\smalldense.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -1281,11 +1281,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sundialsmath.h"
|
||||
RelativePath=".\src\phreeqcpp\sundialsmath.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\phreeqc\sundialstypes.h"
|
||||
RelativePath=".\src\phreeqcpp\sundialstypes.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
||||
110
IPhreeqc.vcxproj
110
IPhreeqc.vcxproj
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="DebugDll|Win32">
|
||||
@ -491,42 +491,42 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
|
||||
<ClCompile Include="src\phreeqcpp\Temperature.cxx" />
|
||||
<ClCompile Include="src\phreeqcpp\Use.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\Utils.cxx" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\advection.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\basicsubs.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\cl1.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\cvdense.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\cvode.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\dense.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\dw.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\gases.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\input.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\integrate.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\inverse.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\isotopes.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\kinetics.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\mainsubs.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\model.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\nvector.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\nvector_serial.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\parse.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\phqalloc.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\PHRQ_io_output.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\pitzer.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\pitzer_structures.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\prep.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\print.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\read.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\readtr.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\sit.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\smalldense.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\spread.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\step.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\structures.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\sundialsmath.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\tally.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\tidy.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\transport.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\utilities.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\advection.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\basicsubs.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\cl1.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\cvdense.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\cvode.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\dense.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\dw.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\gases.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\input.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\integrate.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\inverse.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\isotopes.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\kinetics.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\mainsubs.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\model.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\nvector.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\nvector_serial.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\parse.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\phqalloc.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\PHRQ_io_output.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\pitzer.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\pitzer_structures.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\prep.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\print.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\read.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\readtr.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\sit.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\smalldense.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\spread.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\step.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\structures.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\sundialsmath.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\tally.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\tidy.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\transport.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\utilities.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuildStep Include="src\IPhreeqcF.f">
|
||||
@ -539,11 +539,11 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\CVar.hxx" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\cvdense.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\cvode.h" />
|
||||
<ClInclude Include="src\phreeqcpp\cvdense.h" />
|
||||
<ClInclude Include="src\phreeqcpp\cvode.h" />
|
||||
<ClInclude Include="src\phreeqcpp\cxxKinetics.h" />
|
||||
<ClInclude Include="src\phreeqcpp\cxxMix.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\dense.h" />
|
||||
<ClInclude Include="src\phreeqcpp\dense.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Dictionary.h" />
|
||||
<ClInclude Include="src\phreeqcpp\dumper.h" />
|
||||
<ClInclude Include="src\ErrorReporter.hxx" />
|
||||
@ -551,37 +551,37 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
|
||||
<ClInclude Include="src\phreeqcpp\ExchComp.h" />
|
||||
<ClInclude Include="src\fwrap.h" />
|
||||
<ClInclude Include="src\phreeqcpp\GasPhase.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\global.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\global_structures.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\input.h" />
|
||||
<ClInclude Include="src\phreeqcpp\global.h" />
|
||||
<ClInclude Include="src\phreeqcpp\global_structures.h" />
|
||||
<ClInclude Include="src\phreeqcpp\input.h" />
|
||||
<ClInclude Include="src\phreeqcpp\ISolution.h" />
|
||||
<ClInclude Include="src\phreeqcpp\ISolutionComp.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Keywords.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\kinetics.h" />
|
||||
<ClInclude Include="src\phreeqcpp\kinetics.h" />
|
||||
<ClInclude Include="src\phreeqcpp\KineticsComp.h" />
|
||||
<ClInclude Include="src\phreeqcpp\NameDouble.h" />
|
||||
<ClInclude Include="src\phreeqcpp\NumKeyword.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\nvector.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\nvector_serial.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\output.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\p2c.h" />
|
||||
<ClInclude Include="src\phreeqcpp\nvector.h" />
|
||||
<ClInclude Include="src\phreeqcpp\nvector_serial.h" />
|
||||
<ClInclude Include="src\phreeqcpp\output.h" />
|
||||
<ClInclude Include="src\phreeqcpp\p2c.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Parser.h" />
|
||||
<ClInclude Include="src\phreeqcpp\PBasic.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\phqalloc.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phqalloc.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Phreeqc.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Phreeqc_class.h" />
|
||||
<ClInclude Include="src\phreeqcpp\PHRQ_base.h" />
|
||||
<ClInclude Include="src\phreeqcpp\PHRQ_io.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\phrqtype.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\pitzer.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\pitzer_structures.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phrqtype.h" />
|
||||
<ClInclude Include="src\phreeqcpp\pitzer.h" />
|
||||
<ClInclude Include="src\phreeqcpp\pitzer_structures.h" />
|
||||
<ClInclude Include="src\phreeqcpp\PPassemblage.h" />
|
||||
<ClInclude Include="src\phreeqcpp\PPassemblageComp.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Pressure.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Reaction.h" />
|
||||
<ClInclude Include="src\phreeqcpp\runner.h" />
|
||||
<ClInclude Include="src\SelectedOutput.hxx" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\smalldense.h" />
|
||||
<ClInclude Include="src\phreeqcpp\smalldense.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Solution.h" />
|
||||
<ClInclude Include="src\phreeqcpp\SolutionIsotope.h" />
|
||||
<ClInclude Include="src\phreeqcpp\SS.h" />
|
||||
@ -589,8 +589,8 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
|
||||
<ClInclude Include="src\phreeqcpp\SScomp.h" />
|
||||
<ClInclude Include="src\phreeqcpp\StorageBin.h" />
|
||||
<ClInclude Include="src\phreeqcpp\StorageBinList.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\sundialsmath.h" />
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\sundialstypes.h" />
|
||||
<ClInclude Include="src\phreeqcpp\sundialsmath.h" />
|
||||
<ClInclude Include="src\phreeqcpp\sundialstypes.h" />
|
||||
<ClInclude Include="src\phreeqcpp\Surface.h" />
|
||||
<ClInclude Include="src\phreeqcpp\SurfaceCharge.h" />
|
||||
<ClInclude Include="src\phreeqcpp\SurfaceComp.h" />
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
@ -152,112 +152,112 @@
|
||||
<ClCompile Include="src\phreeqcpp\Utils.cxx">
|
||||
<Filter>Source Files\phreeqcpp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\advection.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\advection.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\basicsubs.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\basicsubs.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\cl1.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\cl1.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\cvdense.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\cvdense.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\cvode.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\cvode.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\dense.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\dense.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\dw.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\dw.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\gases.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\gases.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\input.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\input.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\integrate.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\integrate.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\inverse.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\inverse.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\isotopes.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\isotopes.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\kinetics.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\kinetics.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\mainsubs.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\mainsubs.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\model.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\model.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\nvector.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\nvector.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\nvector_serial.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\nvector_serial.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\parse.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\parse.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\phqalloc.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\phqalloc.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\PHRQ_io_output.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\PHRQ_io_output.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\pitzer.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\pitzer.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\pitzer_structures.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\pitzer_structures.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\prep.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\prep.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\print.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\print.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\read.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\read.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\readtr.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\readtr.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\sit.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\sit.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\smalldense.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\smalldense.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\spread.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\spread.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\step.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\step.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\structures.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\structures.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\sundialsmath.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\sundialsmath.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\tally.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\tally.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\tidy.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\tidy.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\transport.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\transport.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\phreeqc\utilities.cpp">
|
||||
<ClCompile Include="src\phreeqcpp\utilities.cpp">
|
||||
<Filter>Source Files\phreeqcpp\phreeqc</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\fwrap4.cpp">
|
||||
@ -280,10 +280,10 @@
|
||||
<ClInclude Include="src\CVar.hxx">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\cvdense.h">
|
||||
<ClInclude Include="src\phreeqcpp\cvdense.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\cvode.h">
|
||||
<ClInclude Include="src\phreeqcpp\cvode.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\cxxKinetics.h">
|
||||
@ -292,7 +292,7 @@
|
||||
<ClInclude Include="src\phreeqcpp\cxxMix.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\dense.h">
|
||||
<ClInclude Include="src\phreeqcpp\dense.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\Dictionary.h">
|
||||
@ -316,13 +316,13 @@
|
||||
<ClInclude Include="src\phreeqcpp\GasPhase.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\global.h">
|
||||
<ClInclude Include="src\phreeqcpp\global.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\global_structures.h">
|
||||
<ClInclude Include="src\phreeqcpp\global_structures.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\input.h">
|
||||
<ClInclude Include="src\phreeqcpp\input.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\ISolution.h">
|
||||
@ -334,7 +334,7 @@
|
||||
<ClInclude Include="src\phreeqcpp\Keywords.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\kinetics.h">
|
||||
<ClInclude Include="src\phreeqcpp\kinetics.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\KineticsComp.h">
|
||||
@ -346,16 +346,16 @@
|
||||
<ClInclude Include="src\phreeqcpp\NumKeyword.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\nvector.h">
|
||||
<ClInclude Include="src\phreeqcpp\nvector.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\nvector_serial.h">
|
||||
<ClInclude Include="src\phreeqcpp\nvector_serial.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\output.h">
|
||||
<ClInclude Include="src\phreeqcpp\output.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\p2c.h">
|
||||
<ClInclude Include="src\phreeqcpp\p2c.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\Parser.h">
|
||||
@ -364,7 +364,7 @@
|
||||
<ClInclude Include="src\phreeqcpp\PBasic.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\phqalloc.h">
|
||||
<ClInclude Include="src\phreeqcpp\phqalloc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\Phreeqc.h">
|
||||
@ -379,13 +379,13 @@
|
||||
<ClInclude Include="src\phreeqcpp\PHRQ_io.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\phrqtype.h">
|
||||
<ClInclude Include="src\phreeqcpp\phrqtype.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\pitzer.h">
|
||||
<ClInclude Include="src\phreeqcpp\pitzer.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\pitzer_structures.h">
|
||||
<ClInclude Include="src\phreeqcpp\pitzer_structures.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\PPassemblage.h">
|
||||
@ -406,7 +406,7 @@
|
||||
<ClInclude Include="src\SelectedOutput.hxx">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\smalldense.h">
|
||||
<ClInclude Include="src\phreeqcpp\smalldense.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\Solution.h">
|
||||
@ -430,10 +430,10 @@
|
||||
<ClInclude Include="src\phreeqcpp\StorageBinList.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\sundialsmath.h">
|
||||
<ClInclude Include="src\phreeqcpp\sundialsmath.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\phreeqc\sundialstypes.h">
|
||||
<ClInclude Include="src\phreeqcpp\sundialstypes.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="src\phreeqcpp\Surface.h">
|
||||
|
||||
@ -1591,7 +1591,7 @@ void TestIPhreeqc::TestDatabaseKeyword()
|
||||
CPPUNIT_ASSERT_EQUAL(1, obj.RunFile("dump"));
|
||||
|
||||
const char *expected =
|
||||
"ERROR: Gas not found in PHASES data base, Amm(g).\n"
|
||||
"ERROR: Gas not found in PHASES database, Amm(g).\n"
|
||||
"ERROR: Calculations terminating due to input errors.\n";
|
||||
|
||||
const char* err = obj.GetErrorString();
|
||||
|
||||
@ -1703,7 +1703,7 @@ void TestIPhreeqcLib::TestDatabaseKeyword()
|
||||
CPPUNIT_ASSERT_EQUAL( 1, ::RunFile(n, "dump"));
|
||||
|
||||
const char *exp_errs =
|
||||
"ERROR: Gas not found in PHASES data base, Amm(g).\n"
|
||||
"ERROR: Gas not found in PHASES database, Amm(g).\n"
|
||||
"ERROR: Calculations terminating due to input errors.\n";
|
||||
|
||||
const char* err = ::GetErrorString(n);
|
||||
@ -2050,7 +2050,7 @@ void TestIPhreeqcLib::TestGetErrorStringLine(void)
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 100."), std::string(::GetErrorStringLine(n, line++)) );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: No dispersivities were read; disp = 0 assumed."), std::string(::GetErrorStringLine(n, line++)) );
|
||||
#endif
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES data base, Amm(g)."), std::string(::GetErrorStringLine(n, line++)) );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES database, Amm(g)."), std::string(::GetErrorStringLine(n, line++)) );
|
||||
#if 0
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Could not find element in database, Amm."), std::string(::GetErrorStringLine(n, line++)) );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("\tConcentration is set to zero."), std::string(::GetErrorStringLine(n, line++)) );
|
||||
@ -2102,7 +2102,7 @@ void TestIPhreeqcLib::TestErrorFileOn(void)
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: DATABASE keyword is ignored by IPhreeqc."), lines[0] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 100."), lines[1] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: No dispersivities were read; disp = 0 assumed."), lines[2] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES data base, Amm(g)."), lines[3] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES database, Amm(g)."), lines[3] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Could not find element in database, Amm."), lines[4] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("\tConcentration is set to zero."), lines[5] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Calculations terminating due to input errors."), lines[6] );
|
||||
@ -2152,7 +2152,7 @@ void TestIPhreeqcLib::TestLogFileOn(void)
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 100."), lines[0] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: No dispersivities were read; disp = 0 assumed."), lines[1] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES data base, Amm(g)."), lines[2] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES database, Amm(g)."), lines[2] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Could not find element in database, Amm."), lines[3] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("\tConcentration is set to zero."), lines[4] );
|
||||
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Calculations terminating due to input errors."), lines[5] );
|
||||
@ -3882,29 +3882,29 @@ void TestIPhreeqcLib::TestBasicSURF(void)
|
||||
|
||||
void TestIPhreeqcLib::TestIEEE(void)
|
||||
{
|
||||
int n = ::CreateIPhreeqc();
|
||||
CPPUNIT_ASSERT(n >= 0);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "wateq4f.dat") );
|
||||
//CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "cdmusic_hiemstra.dat") );
|
||||
//::LoadDatabase(n, "cdmusic_hiemstra.dat");
|
||||
//const char* errdb = ::GetErrorString(n);
|
||||
//fprintf(stderr, "%s\n", errdb);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputFileOn(n, 0) );
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputStringOn(n, 0) );
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetErrorFileOn(n, 0) );
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetLogFileOn(n, 0) );
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetSelectedOutputFileOn(n, 0) );
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 0) );
|
||||
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) );
|
||||
|
||||
::RunFile(n, "IEEE");
|
||||
const char* err = ::GetErrorString(n);
|
||||
fprintf(stderr, "%s\n", err);
|
||||
|
||||
if (n >= 0)
|
||||
{
|
||||
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::DestroyIPhreeqc(n));
|
||||
}
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} int n = ::CreateIPhreeqc();
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT(n >= 0);
|
||||
// COMMENT: {1/18/2013 6:34:57 PM}
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "wateq4f.dat") );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} //CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "cdmusic_hiemstra.dat") );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} //::LoadDatabase(n, "cdmusic_hiemstra.dat");
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} //const char* errdb = ::GetErrorString(n);
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} //fprintf(stderr, "%s\n", errdb);
|
||||
// COMMENT: {1/18/2013 6:34:57 PM}
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputFileOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputStringOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetErrorFileOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetLogFileOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetSelectedOutputFileOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) );
|
||||
// COMMENT: {1/18/2013 6:34:57 PM}
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} ::RunFile(n, "IEEE");
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} const char* err = ::GetErrorString(n);
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} fprintf(stderr, "%s\n", err);
|
||||
// COMMENT: {1/18/2013 6:34:57 PM}
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} if (n >= 0)
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} {
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::DestroyIPhreeqc(n));
|
||||
// COMMENT: {1/18/2013 6:34:57 PM} }
|
||||
}
|
||||
|
||||
@ -7,68 +7,68 @@
|
||||
class TestIPhreeqcLib : public CppUnit::TestFixture
|
||||
{
|
||||
CPPUNIT_TEST_SUITE( TestIPhreeqcLib );
|
||||
//CPPUNIT_TEST( TestCreateIPhreeqc );
|
||||
//CPPUNIT_TEST( TestDestroyIPhreeqc );
|
||||
//CPPUNIT_TEST( TestLoadDatabase );
|
||||
//CPPUNIT_TEST( TestLoadDatabaseString );
|
||||
//CPPUNIT_TEST( TestLoadDatabaseMissingFile );
|
||||
//CPPUNIT_TEST( TestLoadDatabaseWithErrors );
|
||||
//CPPUNIT_TEST( TestRunAccumulated );
|
||||
//CPPUNIT_TEST( TestRunWithErrors );
|
||||
//CPPUNIT_TEST( TestRunFile );
|
||||
//CPPUNIT_TEST( TestRunString );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputRowCount );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputValue );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputColumnCount );
|
||||
//CPPUNIT_TEST( TestAddError );
|
||||
//CPPUNIT_TEST( TestAccumulateLine );
|
||||
//CPPUNIT_TEST( TestOutputErrorString );
|
||||
//CPPUNIT_TEST( TestRunWithCallback );
|
||||
//CPPUNIT_TEST( TestRunNoDatabaseLoaded );
|
||||
//CPPUNIT_TEST( TestCase1 );
|
||||
//CPPUNIT_TEST( TestCase2 );
|
||||
//CPPUNIT_TEST( TestPrintSelectedOutputFalse );
|
||||
//CPPUNIT_TEST( TestOutputFileOnOff );
|
||||
//CPPUNIT_TEST( TestErrorFileOnOff );
|
||||
//CPPUNIT_TEST( TestLogFileOnOff );
|
||||
//CPPUNIT_TEST( TestDumpFileOnOff );
|
||||
//CPPUNIT_TEST( TestSelOutFileOnOff );
|
||||
//CPPUNIT_TEST( TestLongHeadings );
|
||||
//CPPUNIT_TEST( TestDatabaseKeyword );
|
||||
//CPPUNIT_TEST( TestDumpString );
|
||||
//CPPUNIT_TEST( TestGetDumpStringLineCount );
|
||||
//CPPUNIT_TEST( TestGetDumpStringLine );
|
||||
//CPPUNIT_TEST( TestGetComponentCount );
|
||||
//CPPUNIT_TEST( TestGetComponent );
|
||||
//CPPUNIT_TEST( TestGetErrorStringLine );
|
||||
//CPPUNIT_TEST( TestErrorFileOn );
|
||||
//CPPUNIT_TEST( TestLogFileOn );
|
||||
//CPPUNIT_TEST( TestGetWarningStringLine );
|
||||
//CPPUNIT_TEST( TestPitzer );
|
||||
//CPPUNIT_TEST( TestClearAccumulatedLines );
|
||||
//CPPUNIT_TEST( TestSetDumpFileName );
|
||||
//CPPUNIT_TEST( TestSetOutputFileName );
|
||||
//CPPUNIT_TEST( TestOutputStringOnOff );
|
||||
//CPPUNIT_TEST( TestGetOutputString );
|
||||
//CPPUNIT_TEST( TestGetOutputStringLineCount );
|
||||
//CPPUNIT_TEST( TestGetOutputStringLine );
|
||||
//CPPUNIT_TEST( TestSetLogFileName );
|
||||
//CPPUNIT_TEST( TestLogStringOnOff );
|
||||
//CPPUNIT_TEST( TestGetLogString );
|
||||
//CPPUNIT_TEST( TestGetLogStringLineCount );
|
||||
//CPPUNIT_TEST( TestGetLogStringLine );
|
||||
//CPPUNIT_TEST( TestSetErrorFileName );
|
||||
//CPPUNIT_TEST( TestErrorStringOnOff );
|
||||
//CPPUNIT_TEST( TestGetErrorString );
|
||||
//CPPUNIT_TEST( TestGetErrorStringLineCount );
|
||||
//CPPUNIT_TEST( TestSetSelectedOutputFileName );
|
||||
//CPPUNIT_TEST( TestSelectedOutputStringOnOff );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputString );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputStringLineCount );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputStringLine );
|
||||
//CPPUNIT_TEST( TestGetSelectedOutputStringLineNotEnoughHeadings );
|
||||
//CPPUNIT_TEST( TestLongUser_Punch );
|
||||
//CPPUNIT_TEST( TestBasicSURF );
|
||||
CPPUNIT_TEST( TestCreateIPhreeqc );
|
||||
CPPUNIT_TEST( TestDestroyIPhreeqc );
|
||||
CPPUNIT_TEST( TestLoadDatabase );
|
||||
CPPUNIT_TEST( TestLoadDatabaseString );
|
||||
CPPUNIT_TEST( TestLoadDatabaseMissingFile );
|
||||
CPPUNIT_TEST( TestLoadDatabaseWithErrors );
|
||||
CPPUNIT_TEST( TestRunAccumulated );
|
||||
CPPUNIT_TEST( TestRunWithErrors );
|
||||
CPPUNIT_TEST( TestRunFile );
|
||||
CPPUNIT_TEST( TestRunString );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputRowCount );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputValue );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputColumnCount );
|
||||
CPPUNIT_TEST( TestAddError );
|
||||
CPPUNIT_TEST( TestAccumulateLine );
|
||||
CPPUNIT_TEST( TestOutputErrorString );
|
||||
CPPUNIT_TEST( TestRunWithCallback );
|
||||
CPPUNIT_TEST( TestRunNoDatabaseLoaded );
|
||||
CPPUNIT_TEST( TestCase1 );
|
||||
CPPUNIT_TEST( TestCase2 );
|
||||
CPPUNIT_TEST( TestPrintSelectedOutputFalse );
|
||||
CPPUNIT_TEST( TestOutputFileOnOff );
|
||||
CPPUNIT_TEST( TestErrorFileOnOff );
|
||||
CPPUNIT_TEST( TestLogFileOnOff );
|
||||
CPPUNIT_TEST( TestDumpFileOnOff );
|
||||
CPPUNIT_TEST( TestSelOutFileOnOff );
|
||||
CPPUNIT_TEST( TestLongHeadings );
|
||||
CPPUNIT_TEST( TestDatabaseKeyword );
|
||||
CPPUNIT_TEST( TestDumpString );
|
||||
CPPUNIT_TEST( TestGetDumpStringLineCount );
|
||||
CPPUNIT_TEST( TestGetDumpStringLine );
|
||||
CPPUNIT_TEST( TestGetComponentCount );
|
||||
CPPUNIT_TEST( TestGetComponent );
|
||||
CPPUNIT_TEST( TestGetErrorStringLine );
|
||||
CPPUNIT_TEST( TestErrorFileOn );
|
||||
CPPUNIT_TEST( TestLogFileOn );
|
||||
CPPUNIT_TEST( TestGetWarningStringLine );
|
||||
CPPUNIT_TEST( TestPitzer );
|
||||
CPPUNIT_TEST( TestClearAccumulatedLines );
|
||||
CPPUNIT_TEST( TestSetDumpFileName );
|
||||
CPPUNIT_TEST( TestSetOutputFileName );
|
||||
CPPUNIT_TEST( TestOutputStringOnOff );
|
||||
CPPUNIT_TEST( TestGetOutputString );
|
||||
CPPUNIT_TEST( TestGetOutputStringLineCount );
|
||||
CPPUNIT_TEST( TestGetOutputStringLine );
|
||||
CPPUNIT_TEST( TestSetLogFileName );
|
||||
CPPUNIT_TEST( TestLogStringOnOff );
|
||||
CPPUNIT_TEST( TestGetLogString );
|
||||
CPPUNIT_TEST( TestGetLogStringLineCount );
|
||||
CPPUNIT_TEST( TestGetLogStringLine );
|
||||
CPPUNIT_TEST( TestSetErrorFileName );
|
||||
CPPUNIT_TEST( TestErrorStringOnOff );
|
||||
CPPUNIT_TEST( TestGetErrorString );
|
||||
CPPUNIT_TEST( TestGetErrorStringLineCount );
|
||||
CPPUNIT_TEST( TestSetSelectedOutputFileName );
|
||||
CPPUNIT_TEST( TestSelectedOutputStringOnOff );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputString );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputStringLineCount );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputStringLine );
|
||||
CPPUNIT_TEST( TestGetSelectedOutputStringLineNotEnoughHeadings );
|
||||
CPPUNIT_TEST( TestLongUser_Punch );
|
||||
CPPUNIT_TEST( TestBasicSURF );
|
||||
CPPUNIT_TEST( TestIEEE );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
|
||||
@ -75,10 +75,10 @@ int main(int argc, char **argv)
|
||||
s.startTimer();
|
||||
#endif
|
||||
|
||||
//runner.addTest(TestVar::suite());
|
||||
//runner.addTest(TestCVar::suite());
|
||||
//runner.addTest(TestSelectedOutput::suite());
|
||||
//runner.addTest(TestIPhreeqc::suite());
|
||||
runner.addTest(TestVar::suite());
|
||||
runner.addTest(TestCVar::suite());
|
||||
runner.addTest(TestSelectedOutput::suite());
|
||||
runner.addTest(TestIPhreeqc::suite());
|
||||
runner.addTest(TestIPhreeqcLib::suite());
|
||||
|
||||
runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cout));
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp"
|
||||
PreprocessorDefinitions="CPPUNIT;WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -133,7 +133,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp"
|
||||
PreprocessorDefinitions="CPPUNIT;WIN32;_DEBUG;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -212,7 +212,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp"
|
||||
PreprocessorDefinitions="CPPUNIT;WIN32;NDEBUG;_CONSOLE"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -295,7 +295,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc"
|
||||
AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp"
|
||||
PreprocessorDefinitions="CPPUNIT;WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
/>
|
||||
@ -748,19 +748,19 @@
|
||||
Name="phreeqc"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\advection.cpp"
|
||||
RelativePath="..\src\phreeqcpp\advection.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\basicsubs.cpp"
|
||||
RelativePath="..\src\phreeqcpp\basicsubs.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\cl1.cpp"
|
||||
RelativePath="..\src\phreeqcpp\cl1.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\cl1mp.cpp"
|
||||
RelativePath="..\src\phreeqcpp\cl1mp.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
@ -796,135 +796,135 @@
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\cvdense.cpp"
|
||||
RelativePath="..\src\phreeqcpp\cvdense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\cvode.cpp"
|
||||
RelativePath="..\src\phreeqcpp\cvode.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\dense.cpp"
|
||||
RelativePath="..\src\phreeqcpp\dense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\dw.cpp"
|
||||
RelativePath="..\src\phreeqcpp\dw.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\gases.cpp"
|
||||
RelativePath="..\src\phreeqcpp\gases.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\input.cpp"
|
||||
RelativePath="..\src\phreeqcpp\input.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\integrate.cpp"
|
||||
RelativePath="..\src\phreeqcpp\integrate.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\inverse.cpp"
|
||||
RelativePath="..\src\phreeqcpp\inverse.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\isotopes.cpp"
|
||||
RelativePath="..\src\phreeqcpp\isotopes.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\kinetics.cpp"
|
||||
RelativePath="..\src\phreeqcpp\kinetics.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\mainsubs.cpp"
|
||||
RelativePath="..\src\phreeqcpp\mainsubs.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\model.cpp"
|
||||
RelativePath="..\src\phreeqcpp\model.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\nvector.cpp"
|
||||
RelativePath="..\src\phreeqcpp\nvector.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\nvector_serial.cpp"
|
||||
RelativePath="..\src\phreeqcpp\nvector_serial.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\parse.cpp"
|
||||
RelativePath="..\src\phreeqcpp\parse.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\phqalloc.cpp"
|
||||
RelativePath="..\src\phreeqcpp\phqalloc.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp"
|
||||
RelativePath="..\src\phreeqcpp\PHRQ_io_output.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\pitzer.cpp"
|
||||
RelativePath="..\src\phreeqcpp\pitzer.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\pitzer_structures.cpp"
|
||||
RelativePath="..\src\phreeqcpp\pitzer_structures.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\prep.cpp"
|
||||
RelativePath="..\src\phreeqcpp\prep.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\print.cpp"
|
||||
RelativePath="..\src\phreeqcpp\print.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\read.cpp"
|
||||
RelativePath="..\src\phreeqcpp\read.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\readtr.cpp"
|
||||
RelativePath="..\src\phreeqcpp\readtr.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\sit.cpp"
|
||||
RelativePath="..\src\phreeqcpp\sit.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\smalldense.cpp"
|
||||
RelativePath="..\src\phreeqcpp\smalldense.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\spread.cpp"
|
||||
RelativePath="..\src\phreeqcpp\spread.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\step.cpp"
|
||||
RelativePath="..\src\phreeqcpp\step.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\structures.cpp"
|
||||
RelativePath="..\src\phreeqcpp\structures.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\sundialsmath.cpp"
|
||||
RelativePath="..\src\phreeqcpp\sundialsmath.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\tally.cpp"
|
||||
RelativePath="..\src\phreeqcpp\tally.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\tidy.cpp"
|
||||
RelativePath="..\src\phreeqcpp\tidy.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\transport.cpp"
|
||||
RelativePath="..\src\phreeqcpp\transport.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\phreeqcpp\phreeqc\utilities.cpp"
|
||||
RelativePath="..\src\phreeqcpp\utilities.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user