37 Commits

Author SHA1 Message Date
David L Parkhurst
bbe1a44b39 new def removed for raw Gas Phase and Surface.
Latest examples run on Parkplace




git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7084 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-11-15 17:13:43 +00:00
David L Parkhurst
9f3afe9851 Checking in examples. All examples run,
however, mytest mu, sys_gas, and DanPhuong need to be fixed.

DanPhuong runs on Windows? 

sys_gas is problem with ah2o=0/1.

not sure about mu.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7074 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-11-09 23:41:10 +00:00
David L Parkhurst
2671345a70 Latest example output.
Latest Tony databases.

Removed statics.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6773 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-12 17:47:49 +00:00
David L Parkhurst
b7ab869a13 Tony changed the properties of water, I think in utilities.cpp
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6632 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-06 00:14:27 +00:00
David L Parkhurst
436985c42a 2012-05-17, latest code, databases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6570 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-18 17:03:03 +00:00
David L Parkhurst
56c4b8cade Latest examples and mytest
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6548 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-01 19:30:57 +00:00
David L Parkhurst
a68adf2525 Latest examples
header file for Linux PHRQ_io.cpp


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6546 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-01 15:22:41 +00:00
Scott R Charlton
16342e4815 merged in http://internalbrr.cr.usgs.gov/svn_GW/phreeqcpp/branches/ErrorHandling 6269-6445
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6446 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-11 02:21:16 +00:00
David L Parkhurst
0642749631 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
46db385b2f Latest test cases after removing solid solution structures.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6080 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-18 16:14:53 +00:00
David L Parkhurst
aa5d869671 Has bug with volume in selected output file.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6031 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 16:15:18 +00:00
David L Parkhurst
ed0de50524 Results after removing pp_assemblage structures.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6000 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-09 23:25:38 +00:00
David L Parkhurst
593dd3d8a9 Tony with Kappa and vreeqc.dat, but
removed extra delta_v prints for saturation indices.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5989 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-05 22:29:11 +00:00
David L Parkhurst
bdccf21a99 More Delta_V in printout
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5935 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-21 18:00:45 +00:00
David L Parkhurst
f6b4bcdb92 Going back to original activity of water, and then
to attenuated version with tanh, if it is similar.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5917 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 15:35:56 +00:00
David L Parkhurst
b2c7cbd733 With extra printout for delta_v for minerals.
Thinks REVISE_GASES is working properly.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5909 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-19 20:41:48 +00:00
David L Parkhurst
a6e74f7680 Think fixed volume P-R gases are working correctly with
numerical derivatives.

There is a problem with CO2_conc_PR_EQ related to gas.dat.

Am going to remove -reset false from some of the gas
problems so that testing is better.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5902 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-16 01:04:53 +00:00
David L Parkhurst
470bf54cd9 Changed activity of water function.
Not using slack unknown.





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5888 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-12 23:49:45 +00:00
David L Parkhurst
5e04484bdb Linux version of all examples for version 3.
Linux version of mytest with new gas.dat from Tony.

Updated Makefile for compiling on Linux.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5861 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-05 20:07:54 +00:00
David L Parkhurst
384ebda905 Updated to latest examples.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5853 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-02 23:37:33 +00:00
David L Parkhurst
ab922cc5e5 Latest examples. PR nearly done.
Extra prints for gases, temperature format changed slightly.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5815 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-23 18:19:23 +00:00
David L Parkhurst
8188d11748 printing out pressure in examples.
Linux changes for gases.

Note: examples from previous version are being checked in..



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5798 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-21 19:32:51 +00:00
David L Parkhurst
cc18945a47 Latest version (5757) with fixed up PBasic (std::map).
Checking in examples and mytest.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5758 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-09 20:39:29 +00:00
David L Parkhurst
c144420ba5 Has PR calculations.
PBasic not used here. Will compare to this.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5748 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-08 20:11:46 +00:00
David L Parkhurst
6ab3634f51 Recheckin test cases for 2.17.3.
Used debug versions previously.
These versions are Class_release for mytest,
Release for examples.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4734 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-08-11 21:48:53 +00:00
David L Parkhurst
837392116a Runs all test cases.
Checking in for version 2.17.3.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4733 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-08-11 20:10:30 +00:00
David L Parkhurst
c4ba8b0946 output for version 4267.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4269 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-19 23:39:34 +00:00
David L Parkhurst
d4c7e440ab Removing zero editing.
Adding all files from phreeqc using ../database




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4039 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-02-10 22:47:02 +00:00
David L Parkhurst
eff36e06f4 PHREEQC runs as class.
Have fixed bugs with dump_cpp.

Checking in Release results for test cases.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3884 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-09 16:28:52 +00:00
David L Parkhurst
a6b6c7756a Updated phreeqcpp to have examples from phreeqc.
equilibrium_phases_read_raw has duplicate lines.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3724 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-10-27 20:29:04 +00:00
David L Parkhurst
062f9967aa phreeqcpp with new compiler version. Same as phreeqc results.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2763 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-03-20 22:57:25 +00:00
David L Parkhurst
93683e57ef No memory leak check in output files.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2205 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-08-30 16:36:35 +00:00
David L Parkhurst
8b99971aca New compiler, lots of diffs in test cases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2042 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-05-09 21:26:19 +00:00
David L Parkhurst
9eb4ac7a7d 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
753bbfc50e Now using zero.sed.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1393 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-26 16:05:52 +00:00
David L Parkhurst
a286af2263 ran zero.sed on all files.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-26 15:59:40 +00:00
David L Parkhurst
faed814e2f New project phreeqcpp
has test files only now.

Will copy cpp branch here as src

Phreeqc src will be subdirectory of src, like phast




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@784 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 00:19:14 +00:00