23 Commits

Author SHA1 Message Date
David L Parkhurst
f2a25dacfa copy/paste error for surface in totalize system.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8904 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-08-04 14:44:08 +00:00
David L Parkhurst
3d2e4ae4be Removed Phreeqc_class.h.
Replaced all PHREEQC_PTR, P_INSTANCE, p_instance1.

Now uses Phreeqc * phreeqc_ptr for Phreeqc cookies.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6509 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-19 18:35:14 +00:00
David L Parkhurst
91f650a5e9 Merged ErrorHandling 6119-6268 changes.
All reactant structs have been removed.
Tony's pressure uses mu in pressure term of log_k.
Test cases run, discriminant check at 1e-8.

Still want to optimize out some k_temp calls and checks for same T, P, mu.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6269 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-03-06 23:42:49 +00:00
David L Parkhurst
cbd736da15 Renaming SSassemblageSS to SS and cxxSS
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6019 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 19:14:07 +00:00
David L Parkhurst
4a7158c44b Getting there with adding REACTION_PRESSURE capabilities.
Still need to look at copy, dump, and maybe others.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5844 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-01 22:08:35 +00:00
David L Parkhurst
7e26eec197 Last checkin svn deleted obsolete files output.h, output.cpp, phreeqc_files, main.cpp.
removed all PHREEQC_CLASS ifdefs

Need to remove old_io ifdefs

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-20 21:14:33 +00:00
David L Parkhurst
9fe532eaaf Cleaned up Get_ and Set_ except for parser.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5661 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-29 18:51:39 +00:00
David L Parkhurst
b18bda26b4 Working on StorageBin. Moved 3 routines to structures to eliminate P_INSTANCEs.
Runs mytest OK.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5659 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-29 17:03:44 +00:00
David L Parkhurst
6acf05a1a0 Removed ORCHESTRA
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5658 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-28 22:30:46 +00:00
David L Parkhurst
9efcd6ecb8 Finished all but loose ends with P_INSTANCEs.
Did Surface, charge and comp.

Now can clean up some more.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5656 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-28 17:05:01 +00:00
David L Parkhurst
9561576af7 Finished SSassemblage.cxx
Cleaned up other files some.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5655 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 23:36:52 +00:00
David L Parkhurst
02ab5c208c Finished PPassemblage and Reaction P_INSTANCE removal.
Removed some commented PHREEQC_PTR_ARG from headers.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5652 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 19:59:49 +00:00
David L Parkhurst
7eeeab4569 all classes inherit from PHRQ_base, except
NameDouble, StorageBinListItem.

NumKeyword inherits from PHRQ_base, others inherit NumKeyword.

ChartHandler and ChartObject inherit from PHRQ_base.

CurveObject does not inherit from PHRQ_base.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5637 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-20 20:05:43 +00:00
David L Parkhurst
9f4eefd214 Made all the changes to add phreeqc pointer as argument to
Phreeqcpp class methods.

Still compiles on Debug and Release, but problem with
phrq_malloc in cvdense and cvode.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3876 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-08 18:09:39 +00:00
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
David L Parkhurst
b33830cc5c Moving class_main, phreeqc.cpp and phreeqc.h into phreeqcpp.sln
Making a new configuration for compilation.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3850 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-03 19:24:14 +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
51183867e4 eol
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3844 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-03 01:06:34 +00:00
David L Parkhurst
a4bac119db eol for system.cxx
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3841 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-03 00:54:28 +00:00
David L Parkhurst
3313c814a9 Ran indent program on phreeqcpp
indent -bli0 -i4 -ts4 -npcs -nbc *.cxx




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3168 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-10-31 15:19:39 +00:00
David L Parkhurst
25666df97c Used new gcc on srv2rcolkr.
Cleaned up all the const errors when using constant string in 
arguments to functions.

removed ex1.

Modified makefile to include/exclude cl1mp.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-02-19 22:05:11 +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