max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

updates for renaming SelectedOutput to CSelectedOutput

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7926 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-13 21:41:54 +00:00
parent 7e04e4cc14
commit cdfb2a9937
5 changed files with 179 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

324
IPhreeqc.2005.vcproj
View File

@ -1005,6 +1005,10 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
>
<File
RelativePath=".\src\CSelectedOutput.cpp"
>
</File>
<File
RelativePath=".\src\fwrap.cpp"
>
@ -1101,10 +1105,6 @@
RelativePath=".\src\IPhreeqcLib.cpp"
>
</File>
<File
RelativePath=".\src\SelectedOutput.cpp"
>
</File>
<File
RelativePath=".\src\Var.c"
>
@ -1176,6 +1176,38 @@
<Filter
Name="phreeqcpp"
>
<File
RelativePath=".\src\phreeqcpp\advection.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\basicsubs.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\ChartHandler.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\ChartObject.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cl1.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\CurveObject.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cvdense.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cvode.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cxxKinetics.cxx"
>
@ -1184,10 +1216,18 @@
RelativePath=".\src\phreeqcpp\cxxMix.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\dense.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\dumper.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\dw.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Exchange.cxx"
>
@ -1200,10 +1240,26 @@
RelativePath=".\src\phreeqcpp\GasComp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\gases.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\GasPhase.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\input.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\integrate.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\inverse.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\ISolution.cxx"
>
@ -1212,14 +1268,30 @@
RelativePath=".\src\phreeqcpp\ISolutionComp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\isotopes.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Keywords.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\kinetics.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\KineticsComp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\mainsubs.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\model.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\NameDouble.cxx"
>
@ -1228,6 +1300,18 @@
RelativePath=".\src\phreeqcpp\NumKeyword.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\nvector.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\nvector_serial.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\parse.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Parser.cxx"
>
@ -1236,6 +1320,10 @@
RelativePath=".\src\phreeqcpp\PBasic.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\phqalloc.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Phreeqc.cpp"
>
@ -1248,6 +1336,18 @@
RelativePath=".\src\phreeqcpp\PHRQ_io.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\PHRQ_io_output.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\pitzer.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\pitzer_structures.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\PPassemblage.cxx"
>
@ -1256,18 +1356,34 @@
RelativePath=".\src\phreeqcpp\PPassemblageComp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\prep.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Pressure.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\print.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Reaction.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\read.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\ReadClass.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\readtr.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\runner.cpp"
>
@ -1384,6 +1500,14 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\phreeqcpp\sit.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\smalldense.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Solution.cxx"
>
@ -1392,6 +1516,10 @@
RelativePath=".\src\phreeqcpp\SolutionIsotope.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\spread.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\SS.cxx"
>
@ -1404,6 +1532,10 @@
RelativePath=".\src\phreeqcpp\SScomp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\step.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\StorageBin.cxx"
>
@ -1412,6 +1544,14 @@
RelativePath=".\src\phreeqcpp\StorageBinList.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\structures.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\sundialsmath.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Surface.cxx"
>
@ -1428,165 +1568,14 @@
RelativePath=".\src\phreeqcpp\System.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Temperature.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Use.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Utils.cxx"
>
</File>
<Filter
Name="phreeqc"
>
<File
RelativePath=".\src\phreeqcpp\advection.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\basicsubs.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\ChartHandler.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\ChartObject.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cl1.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\CurveObject.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cvdense.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\cvode.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\dense.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\dw.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\gases.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\input.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\integrate.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\inverse.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\isotopes.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\kinetics.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\mainsubs.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\model.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\nvector.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\nvector_serial.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\parse.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\phqalloc.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\PHRQ_io_output.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\pitzer.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\pitzer_structures.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\prep.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\print.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\read.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\readtr.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\sit.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\smalldense.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\spread.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\step.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\structures.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\sundialsmath.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\tally.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Temperature.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\tidy.cpp"
>
@ -1595,11 +1584,22 @@
RelativePath=".\src\phreeqcpp\transport.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\Use.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\UserPunch.cpp"
>
</File>
<File
RelativePath=".\src\phreeqcpp\utilities.cpp"
>
</File>
</Filter>
<File
RelativePath=".\src\phreeqcpp\Utils.cxx"
>
</File>
</Filter>
</Filter>
<Filter
@ -1614,6 +1614,10 @@
RelativePath=".\src\phreeqcpp\ChartObject.h"
>
</File>
<File
RelativePath=".\src\CSelectedOutput.hxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\CurveObject.h"
>

2
src/CSelectedOutput.cpp
View File

@ -13,7 +13,7 @@
#include <stdio.h>
#include "Debug.h" // ASSERT
#include "SelectedOutput.hxx" // CSelectedOutput
#include "CSelectedOutput.hxx" // CSelectedOutput
const size_t RESERVE_ROWS = 80;
const size_t RESERVE_COLS = 80;

2
src/IPhreeqc.cpp
View File

@ -8,7 +8,7 @@
#include "Debug.h" // ASSERT
#include "ErrorReporter.hxx" // CErrorReporter
#include "SelectedOutput.hxx" // CSelectedOutput
#include "CSelectedOutput.hxx" // CSelectedOutput
#include "phreeqcpp/SelectedOutput.h" // SelectedOutput
#include "dumper.h" // dumper

2
unit/TestSelectedOutput.h
View File

@ -5,7 +5,7 @@
#pragma warning(disable : 4786) // disable truncation warning
#endif
#include "../src/SelectedOutput.hxx"
#include "../src/CSelectedOutput.hxx"
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h>

16
unit/unit.vcproj
View File

@ -445,6 +445,10 @@
<Filter
Name="src"
>
<File
RelativePath="..\src\CSelectedOutput.cpp"
>
</File>
<File
RelativePath="..\src\IPhreeqc.cpp"
>
@ -453,10 +457,6 @@
RelativePath="..\src\IPhreeqcLib.cpp"
>
</File>
<File
RelativePath="..\src\SelectedOutput.cpp"
>
</File>
<File
RelativePath="..\src\Var.c"
>
@ -938,6 +938,10 @@
<Filter
Name="src"
>
<File
RelativePath="..\src\CSelectedOutput.hxx"
>
</File>
<File
RelativePath="..\src\CVar.hxx"
>
@ -966,10 +970,6 @@
RelativePath="..\src\IPhreeqcCallbacks.h"
>
</File>
<File
RelativePath="..\src\SelectedOutput.hxx"
>
</File>
<File
RelativePath="..\src\thread.h"
>