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
63 Commits 6 Branches 4 Tags
Commit Graph

63 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David L Parkhurst
2f9ce71c78 Update from phreeqc3 trunk thru 12477 
Added ColdChem.dat and antarcticite test case.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12478 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-02 21:42:32 +00:00
David L Parkhurst
a6c8b1cda0 Minor updates to databases. 
Tony fixed potential null pointer.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12461 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-23 18:17:22 +00:00
David L Parkhurst
58bb72074a Tony's from 2/10/17 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12400 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-10 17:04:35 +00:00
David L Parkhurst
a01c63bfd2 Tony's latest database merged with Amm.dat and phreeqc.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12389 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-09 20:38:02 +00:00
David L Parkhurst
447131a17e Updated to PHREEQC3 12386 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12387 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-09 16:41:47 +00:00
David L Parkhurst
be9da22c5c Updated Vm for minerals from SVN 18982 of trunk for 
Amm.dat and
phreeqc.dat.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10894 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-04 18:24:03 +00:00
David L Parkhurst
3e2b2baace Did not change Amm correctly. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10801 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 16:45:44 +00:00
David L Parkhurst
51cb6ad2f3 Fixed some errors in comments. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10797 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 16:18:38 +00:00
David L Parkhurst
a1959e126b Updated phreeqc.dat 
Added Vm back for Fe+2 and Mn+2

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10796 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 16:14:51 +00:00
David L Parkhurst
e568a08539 Updated Amm.dat and pitzer.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10795 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 15:57:14 +00:00
David L Parkhurst
f03796ee6b Tony fixed the memory problem. 
Will rerun Valgrind one more time.

Revised Amm.dat

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10736 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-25 17:40:40 +00:00
David L Parkhurst
5eb4c464a0 Errors in comments of RATE definitions for K-spar and Albite. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10537 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-30 17:22:29 +00:00
David L Parkhurst
ebe582ad89 Updates for CO2 and CH4 in phreeqc.dat and CH4 in pitzer.dat. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-27 15:20:57 +00:00
David L Parkhurst
e4bc7b8eb9 MINTEQ version 4 has wrong sign for delta H of NH3. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10038 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-03 13:41:50 +00:00
David L Parkhurst
a245bdbf84 Tony's latest CO2. 
looks like Hebach has multiple roots, and
ternary looks off.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9988 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-13 20:17:56 +00:00
Scott R Charlton
0072ba834b added frezchem.dat to databases for automake 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9660 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-15 04:48:06 +00:00
Scott R Charlton
46ebca108d added frezchem.dat to databases 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9650 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-13 21:32:43 +00:00
David L Parkhurst
28056e8da6 Latest from Amphos. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9639 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-12 16:00:41 +00:00
David L Parkhurst
d9970213ab Hg2(+2) changed to Hg(+1) 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9631 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-09 18:46:46 +00:00
David L Parkhurst
8203b7008b Version 9a 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9617 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 19:10:28 +00:00
Scott R Charlton
de35816f89 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9542 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-20 22:13:45 +00:00
Scott R Charlton
0b4148b355 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9540 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-17 22:21:17 +00:00
David L Parkhurst
c940f08cd1 Updated Quartz 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9462 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-02 22:01:19 +00:00
David L Parkhurst
cc015bdffc With Tony's revisions. 
Still need to fix quartz in phreeqc.dat and Amm.dat.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9461 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-02 21:46:29 +00:00
David L Parkhurst
3599733d46 Revised all RATES 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9413 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-27 00:16:29 +00:00
David L Parkhurst
0585bb68dc Replaced HCO3-2 with HCO3- in one PSI definition. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9397 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-25 20:09:52 +00:00
David L Parkhurst
cdf40ef546 CO2 was missing from the ZETA definitions 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9391 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-24 20:27:08 +00:00
David L Parkhurst
d32ba32450 From Jonathon Toner (jonathantoner@gmail.com) March 23, 2015. 
Need to run current Pitzer test cases with this database.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9386 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-23 17:46:15 +00:00
David L Parkhurst
c12325b54a Tony reworked calcite and other Pitzer parameters. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9250 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-02-06 15:43:23 +00:00
David L Parkhurst
ea51a66bb8 Minor changes from Tony. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9240 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-02-04 17:56:58 +00:00
David L Parkhurst
664fe7c57c Tony's revised Pitzer.dat with Si and revised analytical expressions. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9229 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-02-02 20:14:21 +00:00
Scott R Charlton
1c762e8c38 added CMakeLists.txt to dist 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/cmake@9180 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-14 21:51:20 +00:00
Scott R Charlton
21b949a4a9 updated install locations 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/cmake@9177 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-13 23:01:21 +00:00
Scott R Charlton
cb9f181982 install targets 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/cmake@9172 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-09 06:30:47 +00:00
David L Parkhurst
f1f79b56f5 acentric factor for Hdg and H2(g). 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-08-14 16:32:03 +00:00
David L Parkhurst
d5b545d350 Removed yellow for graphing. 
Changed Li molar volume in Pitzer, Amm, phreeqc.dat
Added test case Vm_LiCl_sol

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8378 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-01-16 15:54:30 +00:00
David L Parkhurst
f19fe4443d Nitrogen species as N. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8201 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-18 20:35:15 +00:00
David L Parkhurst
68e2623733 Hdg, Oxg, and Ntg should be di-atomic. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8200 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-18 18:11:35 +00:00
David L Parkhurst
d0f46aac0a Gas dimers should have element atomic wt to convert to moles of element. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8199 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-18 17:56:24 +00:00
David L Parkhurst
0aa9f68d2a Missed Alkalinity in N(-3). 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8192 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-15 23:08:31 +00:00
David L Parkhurst
1f47040125 Tony's updates as of Nov 15, 2013. 
Most recently, PO4.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8191 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-15 22:14:04 +00:00
David L Parkhurst
a75c17093a Consistent with GCA paper. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8031 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 21:03:19 +00:00
David L Parkhurst
cc960c73fa Corrected fits to use a_0 = 6.0 for Fe+2 
Updating RELEASE.TXT

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8027 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-12 15:00:35 +00:00
David L Parkhurst
690518be8e Tony's latest changes, including F1 and F2. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7962 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-26 20:20:16 +00:00
David L Parkhurst
b4c18486ff Tony's new Pitzer.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7916 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 17:42:51 +00:00
David L Parkhurst
d45828122c Fixed gammas for BaX2 and AlOHX2 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7826 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-07-16 15:01:30 +00:00
David L Parkhurst
f542086e31 Revised to be consistent with Amm.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7663 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-04-30 15:13:17 +00:00
David L Parkhurst
b5f48075ae Fix print of PR gases in saturation_indices. 
more replacing '.

Amm.dat and pitzer.dat updated to GCA paper.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7656 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-04-29 16:05:21 +00:00
David L Parkhurst
d9d2245034 Tony's latest Amm.dat, no real change. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7219 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-18 16:40:31 +00:00
Scott R Charlton
ff18d72573 working on configure 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7112 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-27 06:28:39 +00:00