36 Commits

Author SHA1 Message Date
Darth Vader
a71e9dca90 Squashed 'phreeqc3-examples/' changes from ce693868..b3aa6834
b3aa6834 [phreeqc3] Updated ctest outputs

git-subtree-dir: phreeqc3-examples
git-subtree-split: b3aa6834f5840bcfd5df4e6b54207c79ed962f03
2024-05-27 19:32:10 +00:00
Darth Vader
9d0b5a7440 Squashed 'phreeqc3-examples/' changes from fbe17c9e..a9d1de8f
a9d1de8f Updated output files (from windows)
47ace2e0 Changed examples/ex21 encoding to UTF-8

git-subtree-dir: phreeqc3-examples
git-subtree-split: a9d1de8fa2842e839fabadc1f4a49fe3afb23ab1
2024-04-18 20:08:49 +00:00
Darth Vader
4b937c6116 Squashed 'phreeqc3-examples/' changes from 807a4444..d037d5dd
d037d5dd End of Run after

git-subtree-dir: phreeqc3-examples
git-subtree-split: d037d5dd5e9f686a236886814fccc9c7421b24d3
2023-05-28 19:59:00 +00: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
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
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
81a60b4b71 tony has new phreeqc.dat and Pabalan.dat coming
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7961 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-26 20:19:23 +00:00
David L Parkhurst
77b232942a latest test cases
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7757 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-06-03 23:36:10 +00:00
David L Parkhurst
f0c9564f15 latest examples
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7709 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-13 22:53:33 +00:00
David L Parkhurst
3c88e50ce0 source 7663
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7664 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-04-30 16:16:37 +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
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
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
d291777d9d Fixed fp exceptions
renamed ss_assemblage
Fixed selected-output volume.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6059 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-12 21:13:44 +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
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
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
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
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
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