1434 Commits

Author SHA1 Message Date
David L Parkhurst
e2b406049a Update to 12494 of phreeqc3-trunk
Includes add of ColdChem.database/CMakeLists.txt
Updating documentation
iso_example
.out files.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12495 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-03-07 20:06:50 +00:00
David L Parkhurst
2b795a0465 Getting ready for release.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12489 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-03-07 17:48:41 +00:00
Scott R Charlton
1d7e2cb9e9 adding ColdChem.dat to R dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12482 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-03-03 02:44:40 +00:00
Scott R Charlton
e938f855d0 added ColdChem.dat database
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12479 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-03-02 22:04:42 +00:00
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
1e3c406336 Added ColdChem.dat.
Added antarcticite test case.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12477 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-03-02 18:51:23 +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
2c2a8ca68b 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
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
50cb16f813 Ascii problem
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12375 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-08 19:22:07 +00:00
David L Parkhurst
0b81a8ccd4 Update
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12373 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-08 16:21:35 +00:00
Scott R Charlton
afd4e5e623 replaced auto_ptr with unique_ptr for IPhreeqc
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12343 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-07 21:42:50 +00:00
Scott R Charlton
44e78b0291 replaced auto_ptr with unique_ptr for IPhreeqc
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12343 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-07 21:42:50 +00:00
David L Parkhurst
3d577f3bed Most recent release added.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12330 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-05 22:36:11 +00:00
Scott R Charlton
90ff11b507 updated for cppunit-1.13.2 (DEV_CPPUNIT_VS2010 = C:\3RDPARTY\cppunit-1.13.2-VS2010)
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12302 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-01 06:20:57 +00:00
Scott R Charlton
08cb9015de changed url
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12283 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-01-26 02:02:44 +00:00
David L Parkhurst
ba7b2061f4 Updated for 3.3.10.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12219 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-01-12 22:22:08 +00:00
David L Parkhurst
51538045ab Update RELEASE.TXT
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11945 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-11-14 22:03:04 +00:00
David L Parkhurst
5cf3321376 Fixed comments in Amm.dat for RATES definitions of silicates.
Latest sit.dat (9b).

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11942 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-11-14 20:11:56 +00:00
David L Parkhurst
393ef83026 typos
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11699 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-09-07 19:23:42 +00:00
David L Parkhurst
90a09e3e6a Up to SVN 11559
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11646 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-08-19 21:44:52 +00:00
David L Parkhurst
86a1d7bccd Added latest comments through 11418.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11419 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-07-01 14:15:00 +00:00
David L Parkhurst
599e5ce573 Updated RELEASE.TXT
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-24 19:07:31 +00:00
Scott R Charlton
5caef7a82e removed dw.cpp from project
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11302 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-17 04:17:15 +00:00
Scott R Charlton
3f81ba8d56 removed dw.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11297 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-17 01:19:09 +00:00
Scott R Charlton
f6c2243d59 removed dw.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11296 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-17 01:02:38 +00:00
Scott R Charlton
e3021d24e3 removed dw.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11295 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-17 00:48:07 +00:00
Scott R Charlton
6837c17da3 removed dw.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11294 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-17 00:40:45 +00:00
Scott R Charlton
a742b01bd8 removed dw.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11294 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-17 00:40:45 +00:00
David L Parkhurst
46ee89dafa remove dw.cpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11286 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-16 22:48:07 +00:00
Scott R Charlton
007ea849bd reverse merged 11251
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11252 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-09 04:07:05 +00:00
Scott R Charlton
fe86acddc5 added post-build to create backup manifest file
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11251 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-09 03:58:23 +00:00
David L Parkhurst
87f3986827 update RELEASE.TXT for kinetics_formula$ and sys("kin",
change eol on sys_kin
check in unequal
add unequal to Makefile

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11154 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-05-04 21:08:17 +00:00
David L Parkhurst
be13bc77ef update
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11136 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-05-03 18:31:26 +00:00
Scott R Charlton
937632d8d2 removed invalid assert
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11128 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-04-29 01:00:07 +00:00
Scott R Charlton
5298ed5d58 removed invalid assert
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@11128 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-04-29 01:00:07 +00:00
David L Parkhurst
c3bba4ace7 ready for 3.3.7
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11094 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-04-21 15:40:58 +00:00
David L Parkhurst
08db4e970f Cerussite misspelled in 5 databases.
Modified Calcite RATES to handle M0=0
Added quartz to wateq4f.dat

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11091 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-04-21 15:20:05 +00:00
David L Parkhurst
3258e5778e Update for next release.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11059 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-04-14 23:31:48 +00:00
David L Parkhurst
0978f81fe0 Added new Vm from phreeqc.dat
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@11028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-04-08 15:42:18 +00:00
David L Parkhurst
771ce56e6a Merged changes through SVN 10892 from trunk.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10895 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 18:26:48 +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
f716528eb7 Added mineral Vms
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10892 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 16:39:23 +00:00
David L Parkhurst
ad01777c4f Added setdiff_c method.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10891 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 16:38:33 +00:00
Scott R Charlton
c12d30b02d updated for Ionic Strength units
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10890 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 02:07:42 +00:00
Scott R Charlton
5ed09a8d08 added Dictionary
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10889 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 02:07:11 +00:00
Scott R Charlton
547d6d99c6 updated for jenkins
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10888 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-03 22:48:14 +00:00
David L Parkhurst
b64d1d035b Updated RELEASE.TXT
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10806 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-02-03 23:52:32 +00:00