max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
167 Commits 6 Branches 4 Tags
Commit Graph

62 Commits

Author SHA1 Message Date
Darth Vader
402dc2ec9b Squashed 'phreeqc3-examples/' changes from 31517c71..1dbd65fc 
1dbd65fc Updated output for recent database changes

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1dbd65fc74fc452b40d37030c51cff2f9bccf894
 2025-03-14 18:23:20 +00:00
Darth Vader
777e6ee471 Squashed 'phreeqc3-examples/' changes from 4a6ad41a..48e4f323 
48e4f323 [phreeqc3] Updated outputs for 3.8.4
ae35abae fixed ex22 for graphing. Updated RELEASE.TXT
6dbd4864 Tony's changes to example 22

git-subtree-dir: phreeqc3-examples
git-subtree-split: 48e4f3231506cb50a96f0064e3ce6fb2e52565ea
 2024-11-14 01:37:20 +00:00
Darth Vader
5e09748847 Squashed 'phreeqc3-examples/' changes from c3e23100..4a6ad41a 
4a6ad41a [phreeqc3] Updated outputs for 3.8.3
91b76cb4 Tony's changes for viscosity and heat in transport. ex13_impl failed in Release.

git-subtree-dir: phreeqc3-examples
git-subtree-split: 4a6ad41ab22a95803c115b7464ae27664f1ba9db
 2024-10-22 01:03:15 +00:00
Darth Vader
6dc784c5e9 Squashed 'phreeqc3-examples/' changes from 4a0d366e..8d50b95a 
8d50b95a Updated output files for current version

git-subtree-dir: phreeqc3-examples
git-subtree-split: 8d50b95a9fe30f7fedc2d189b361c7849a68df01
 2024-09-24 22:03:36 +00:00
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
5ddc4bd307 checing in all test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12523 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-08 17:20:41 +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
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
a98befde82 new sc values 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10725 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-21 00:17:41 +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
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
40f52aceb8 latest test cases, minor changes except for .pat file, which were wrong 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9031 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-11-03 17:40:19 +00:00
David L Parkhurst
d5ef6baea5 after Valgrind fixes 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8848 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-15 22:39:56 +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
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
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
e0ccb49828 Using latest pitzer.dat. Some files replaced with Linux files 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7917 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 18:41:20 +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
73e845d629 latest test with change in Pitzer pressure, -pressure in SOLUTION_RAW, runs modify_test, has error 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7873 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-01 18:20:33 +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
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
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
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
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
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
d2ca92cc3f Some spec cond diffs. 
Some Linux/Dos diffs.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4911 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-10-26 22:48:33 +00:00