58 Commits

Author SHA1 Message Date
Charlton, Scott R
48e4f32315 [phreeqc3] Updated outputs for 3.8.4 2024-11-13 18:19:41 -07:00
Charlton, Scott R
8d50b95a9f Updated output files for current version 2024-09-20 14:36:02 -06:00
Charlton, Scott R
b3aa6834f5 [phreeqc3] Updated ctest outputs 2024-05-24 20:20:57 -06:00
Charlton, Scott R
a9d1de8fa2 Updated output files (from windows) 2024-04-18 13:41:57 -06:00
Charlton, Scott R
d037d5dd5e End of Run after 2023-05-27 20:37:53 -06:00
David L Parkhurst
7125f9e7a5 Commented out check for null. Not sure how it works for Clogging, will investigate on Linux.
Checking in new SC values!


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12447 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-17 19:45:26 +00:00
David L Parkhurst
43ec712688 Merged revision(s) 10984-12389 from phreeqc3/trunk/examples:
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12390 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-09 20:46:56 +00:00
David L Parkhurst
37580c45e5 reran test cases. Diffs caused by CO2 changes in database
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10233 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-09-10 22:10:13 +00:00
David L Parkhurst
8d69f1b539 rerun of test cases, added missing to Makefile
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10042 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-08-05 21:31:30 +00:00
David L Parkhurst
559b6272ed Change in ETHETAS calculation
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9801 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-09 13:38:49 +00:00
David L Parkhurst
5d0110a8d2 9627 output files
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9630 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-09 18:34:15 +00:00
David L Parkhurst
abc4a9fb23 slight changes with last run
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8852 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-16 14:46:13 +00:00
David L Parkhurst
e2f503b829 no negative dump, fix for sit redefinition
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8628 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-08 15:30:47 +00:00
David L Parkhurst
870b63952a latest version 31Jan2014
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8417 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-31 17:48:00 +00:00
David L Parkhurst
bad57324f8 Tony changes for special symbols
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8370 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-14 16:38:08 +00:00
David L Parkhurst
dcba67604c Tony's vm revisions, phreeqc.dat gfw for N redox states
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8204 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-18 20:58:12 +00:00
David L Parkhurst
33a975b539 20131017, latest output, revised mgcl2so4_pz for convergence
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8095 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-10-17 18:42:49 +00:00
David L Parkhurst
99785bdb26 running with F1 and F2 Pitzer, changed fugacity statement
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7972 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-27 18:50:43 +00:00
David L Parkhurst
f47adf21f2 added explanation for SI**, many changes.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7915 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-12 17:42:09 +00:00
David L Parkhurst
2c9cad2010 Tony changes for pr_in
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7742 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-29 20:21:11 +00:00
David L Parkhurst
047a07398a test cases at version 7728. Trunk is good, optimize model to be tested.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7729 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-17 16:03:22 +00:00
David L Parkhurst
4cd1f689f1 7643 code
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7645 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-04-25 17:52:53 +00:00
David L Parkhurst
63df8a4ba6 svn 7400 code base, latest mytest and examples
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7401 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-29 22:36:11 +00:00
David L Parkhurst
5b76ea1d21 at svn 7264. Getting ready for distribution
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7265 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-12-31 20:27:14 +00:00
David L Parkhurst
234f998f06 Linux 64-bit on lobo02
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7234 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-12-19 01:08:56 +00:00
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
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
b9e5edbdc7 memory initialization for cvode
Latest test cases without kinetics struct



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6089 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-20 18:45:13 +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
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
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
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