13 Commits

Author SHA1 Message Date
David L Parkhurst
2b76f04a8b Cleaned up header files to remove unnecessary includes of .h files. Moved includes to source code where possible.
Moved some methods for .h to source files to avoid need for includes.

Debug and Release compile. 

Still need to get class version working. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3868 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-07 19:49:38 +00:00
Scott R Charlton
07d5fa7413 merged 3750-3846 of plusify; system.cxx and system.h need to be formated
removed char * and used std::string's and std::map's

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3847 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-03 01:49:56 +00:00
David L Parkhurst
d37ed2c6ae indented header files.
removed ^M from System.h





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3169 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-10-31 15:32:53 +00:00
David L Parkhurst
37b1add946 Ifdef'd ORCHESTRA.
Added lines at end of files.

Ran test cases, a few had changes from format and Tony.





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2182 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-08-16 19:49:38 +00:00
David L Parkhurst
7ab1e21ce7 Works with reaction calculation of pure phase equilibrium.
Worked out relation between phreeqc components H,O,charge and Orchestra H+, e-, H2O.

It's a lot of code and still have not implemented SURFACE, EXCHANGE, GAS_PHASE,

much les KINETICS.

Convergence problem when including pyrite.

Also have REACTION (REQCTION_TEMP?);

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2181 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-08-16 18:51:35 +00:00
David L Parkhurst
c78dd87daf Have version working that formats an input file for Orchestra, runs Orchestra with a system call to a batch file, reads results from Orchestra, stores results in global phreeqc storage, and prints results.
Works only for initial solution calculation.

Still some problems with the solver. Ex1 fails.

Cleaned up organization a little. Ready to start on "reaction" calculation.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-08-07 15:04:13 +00:00
David L Parkhurst
0f2ef116f2 Have version working that formats an input file for Orchestra, runs Orchestra with a system call to a batch file, reads results from Orchestra, stores results in global phreeqc storage, and prints results.
Works only for initial solution calculation.

Still some problems with the solver. Ex1 fails.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2167 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-07-31 19:07:25 +00:00
David L Parkhurst
ea61d055f0 Can read a solution result from Orchestra.cxx
Now will write routines to put results into unknown structures so that results can be printed.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2166 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-07-30 15:07:20 +00:00
David L Parkhurst
7830f46d8d Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2057 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-05-30 23:43:59 +00:00
David L Parkhurst
888140c4a5 Updated with phreeqc files.
Main difference is the logic for rebuilding a model. Should
run faster now, but has slight differences in example files.

Imported changes from ph2orch.

Plan to make phreeqcpp a subdirectory of ph2orch/src.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1601 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-01-10 00:03:03 +00:00
David L Parkhurst
39494b0287 Renamed SolutionComp to ISolutionComp because it is not
used in cxxSolution.

Fixed Makefile to new names



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@792 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 19:52:52 +00:00
David L Parkhurst
75b28d81ca Moved Conc to SolutionComp
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@791 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 18:34:28 +00:00
David L Parkhurst
60a1544019 Copying new classes (cxx) and cpp files to src
Will remove cpp and header files and make phreeqc an external directory.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@785 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 00:21:39 +00:00