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
1,300 Commits 6 Branches 4 Tags
Commit Graph

1300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Scott R Charlton
e04d06e1af documented new optional slength argument to GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10770 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 06:02:29 +00:00
Scott R Charlton
8ed5bbb468 documented new optional slength argument to GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10770 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 06:02:29 +00:00
Scott R Charlton
b1da32aa01 updated for common directory and optional string length argument 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10769 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 02:50:37 +00:00
Scott R Charlton
bd84d2a56f added code to initialize slength to zero for Fortran GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10768 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 01:24:53 +00:00
Scott R Charlton
993349370d added code to initialize slength to zero for Fortran GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10768 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 01:24:53 +00:00
Scott R Charlton
d9b02af0e0 added optional fortran argument to GetSelectedOutputValue for the string length 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10767 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 00:21:32 +00:00
Scott R Charlton
0c8eb2c8c2 added optional fortran argument to GetSelectedOutputValue for the string length 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10767 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 00:21:32 +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
Scott R Charlton
ce5c983e6a added jenkins build script for iphreeqc-R-dist-linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10649 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-07 04:44:28 +00:00
Scott R Charlton
9cdff0b0c2 working on finalizing jenkins 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10648 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-07 03:54:30 +00:00
Scott R Charlton
59580996c4 added jenkins build script for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10647 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-07 01:53:18 +00:00
Scott R Charlton
94cac8272b updated for Dictionary/Serializer 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10619 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 05:23:30 +00:00
Scott R Charlton
4c904ac2c4 readded dumper.Po 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10617 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 04:09:43 +00:00
Scott R Charlton
17f70afbb2 added Dictionary/Serializer to unit.vcproj 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10614 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 02:37:31 +00:00
Scott R Charlton
9133a24578 added Dictionary/Serializer to unit test 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10613 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 02:31:31 +00:00
Scott R Charlton
6ecc3a10d2 added Dictionary/Serializer 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10612 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 02:11:34 +00:00
Scott R Charlton
6d7569be78 added Dictionary/Serializer 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10612 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 02:11:34 +00:00
Scott R Charlton
14fd69456f updated valgrind --leak-check 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10605 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-24 01:04:03 +00:00
Scott R Charlton
68ca880ccb updated to run valgrind in jenkins 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10604 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-24 00:30:33 +00:00
Scott R Charlton
2b8c027339 updated x64 vars 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10595 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-19 06:18:35 +00:00
Scott R Charlton
83a471ba07 updated for new error handling; 
updated cppunit to 1.13.2 on windows for jenkins

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10594 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-19 01:43:26 +00:00
David L Parkhurst
a719b57921 First cut at parallelization. 
Runs with PhreeqcRM, but I don't think answers are right yet.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10561 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-10 20:56:20 +00:00
David L Parkhurst
863997d3ae First cut at parallelization. 
Runs with PhreeqcRM, but I don't think answers are right yet.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10561 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-10 20:56:20 +00:00
David L Parkhurst
e4fa262155 Removed phreeqcpp/ from include statement. 
Added ifdef for PHREEQC_PARALLEL

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10557 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-09 16:50:33 +00:00
David L Parkhurst
258f1064aa Removed phreeqcpp/ from include statement. 
Added ifdef for PHREEQC_PARALLEL

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10557 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-09 16:50:33 +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
Scott R Charlton
e994f78e39 testing executing powershell script 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10536 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-26 02:16:14 +00:00
Scott R Charlton
79ac1cd7c3 name was getting overridden 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10530 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-18 02:18:42 +00:00
Scott R Charlton
a6025dadd0 removed tag from dist name 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10529 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-18 02:10:42 +00:00
Scott R Charlton
19fa3f8fcb added more file exist checks 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10498 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-10 05:23:40 +00:00
Scott R Charlton
d664a25e70 added file exists check for sed files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10497 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-10 05:04:25 +00:00
Scott R Charlton
f102482de7 updated to add branch/tag name to distname 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10496 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-10 03:37:59 +00:00
Scott R Charlton
ba906ac2b9 should be no errors 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10489 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 07:13:51 +00:00
Scott R Charlton
2d529c1fb6 testing failure 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10488 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 06:05:16 +00:00
Scott R Charlton
203da0f874 changed return value for unit 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10487 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 06:02:31 +00:00
Scott R Charlton
aa5c564509 ifdef some tests out 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10486 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 05:58:14 +00:00
Scott R Charlton
6f0029b4b0 ifdef some tests out 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10485 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 05:45:03 +00:00
Scott R Charlton
e544a389c8 working on unit tests for jenkins 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10484 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-11-07 05:38:24 +00:00