16 Commits

Author SHA1 Message Date
David L Parkhurst
9bf1411f42 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
4405e60e4e Merged source up to phreeqc3-trunk SVN 10892
copied files from trunk and merged changes manually.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10893 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 18:13:43 +00:00
David L Parkhurst
95133f2b54 Tony's changes.
Added porosities.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10737 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-26 21:39:37 +00:00
David L Parkhurst
24dd5ede7a Working on valgrind uninitialized variables.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10730 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-22 00:07:22 +00:00
David L Parkhurst
174c739d26 Updated concrete source from concrete_parallel source (not using parallel).
Now going to run test cases on Linux.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10719 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-20 18:12:15 +00:00
David L Parkhurst
fb18be24e2 Tony's implementation of electric current.
Test case current1.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10550 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-08 16:54:38 +00:00
David L Parkhurst
ab43d75b5f Had timing reversed in PhreeqcRM.cpp for heterogeneous case.
Added AH2O_FACTOR 0.017 definition.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8778 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-06-04 17:05:57 +00:00
Scott R Charlton
3f0cd06d6e Added Peng/Robinson gas parameters and molar volume for solids to keyword PHASES
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8538 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-01 07:31:56 +00:00
David L Parkhurst
9048a9be86 Bugs fixes noted by Marco De-Vroed
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8371 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-14 20:42:12 +00:00
David L Parkhurst
276322a936 Have multiple SELECTED_OUTPUT working.
Need to have multiple USER_PUNCH.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7864 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-31 19:26:34 +00:00
David L Parkhurst
11ef24eb4b replaced Find with pp_assemblage_comp_ptr stored in struct unknown
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7723 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-16 17:58:27 +00:00
David L Parkhurst
24ed8b5cc0 Tony's changes for gases.
Removes some more 's.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7653 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-04-26 16:57:25 +00:00
David L Parkhurst
d5fa02a72a a little rearranging of global_structures and under
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7613 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-04-03 21:36:03 +00:00
David L Parkhurst
916ccdafa8 Working on copy operator.
Fixing problems with iso.dat.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7454 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-08 23:02:14 +00:00
David L Parkhurst
047414274f Working on Phreeqc copy
Running ion association model with equilibrium phases
Running Pitzer.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7449 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-07 22:07:33 +00:00
Scott R Charlton
564a0f8af5 moved phreeqc files into src
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/reorg@7308 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-10 06:04:12 +00:00