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

2665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
c2c124dd10 Merge commit '06e25ec860ea2065e0d93f0ff15fe761a67a6756' 2018-08-01 15:11:21 -06:00
David Parkhurst
06e25ec860 Correction to core10.dat from Neveu 2018-08-01 15:01:32 -06:00
Scott R Charlton
f6db49cad7 Merge commit 'ae5624d5df92823731a43efad4cdd210483bb3f7' 2018-08-01 13:25:33 -06:00
Scott R Charlton
ae5624d5df Merge commit '2e390fd5ab713c0c135208931dd015935da01f19' 2018-08-01 13:25:21 -06:00
David Parkhurst
2e390fd5ab commit fix for Mtg 2018-08-01 13:17:39 -06:00
Scott R Charlton
526e02330d Merge commit '1d5c59a175fa4bcc9d525f1feda2cd4b9415143e' 2018-07-31 18:45:29 -06:00
Scott Charlton
1d5c59a175 Add 'phreeqcpp/' from commit 'da9d06b423a87ed5eae503c0faf779ac11c96027' 
git-subtree-dir: phreeqcpp
git-subtree-mainline: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
git-subtree-split: da9d06b423a87ed5eae503c0faf779ac11c96027
 2018-07-31 16:56:09 -06:00
Scott Charlton
d5345a7aee Add 'phreeqc3-examples/' from commit 'e977363da4c1ae1708ebddca38d5312b6813a337' 
git-subtree-dir: phreeqc3-examples
git-subtree-mainline: 8de0e98ed90bb2b639659c820168ab18c1062992
git-subtree-split: e977363da4c1ae1708ebddca38d5312b6813a337
 2018-07-31 16:55:50 -06:00
Scott Charlton
8de0e98ed9 Add 'phreeqc3-doc/' from commit '7a7c7c04dd3fc8605d421da7774d2b95225be7dc' 
git-subtree-dir: phreeqc3-doc
git-subtree-mainline: f2026ac2d3748f57af8ed0764d3a2d77f9fcf84b
git-subtree-split: 7a7c7c04dd3fc8605d421da7774d2b95225be7dc
 2018-07-31 16:55:25 -06:00
Scott Charlton
f2026ac2d3 Add 'database/' from commit '488636aea287b5f185979012d820ac17f1dd3492' 
git-subtree-dir: database
git-subtree-mainline: 8daede105d635d73696050a98cc157fdd470a5ae
git-subtree-split: 488636aea287b5f185979012d820ac17f1dd3492
 2018-07-31 16:55:05 -06:00
Scott Charlton
8daede105d Add 'examples/fortran/' from commit 'c5f2dba47264f3535411ca7510941efd282ffb9a' 
git-subtree-dir: examples/fortran
git-subtree-mainline: badfc51b4fdc3f960243c69ff2707f952427f3ac
git-subtree-split: c5f2dba47264f3535411ca7510941efd282ffb9a
 2018-07-31 16:54:58 -06:00
Scott Charlton
badfc51b4f Add 'examples/com/' from commit 'f90209d22ab165052a564c0ccdd346071d1fc803' 
git-subtree-dir: examples/com
git-subtree-mainline: 6440359f1983c3200dc42fbcd59ed98edf376c7d
git-subtree-split: f90209d22ab165052a564c0ccdd346071d1fc803
 2018-07-31 16:54:51 -06:00
Scott Charlton
6440359f19 Add 'examples/c/' from commit '8d5070c9f9dd15edb8734b9d06bc5f39773b05a1' 
git-subtree-dir: examples/c
git-subtree-mainline: 7ecdd48257ae230c2569d3248a944d9cba6dc97e
git-subtree-split: 8d5070c9f9dd15edb8734b9d06bc5f39773b05a1
 2018-07-31 16:54:46 -06:00
Scott Charlton
7ecdd48257 Split 'src/' into commit 'ba5f2ba885b4cc757201e28f9b4dce158f7cc66b' 
git-subtree-dir: src
git-subtree-mainline: fe71fe0cfc8512a17ff18fc0eee7d498a2886113
git-subtree-split: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
 2018-07-31 16:54:37 -06:00
Scott Charlton
da9d06b423 Split 'common/' into commit '077abe0106b2c1d44d8e996d62ae3e8b2c23bf62' 
git-subtree-dir: common
git-subtree-mainline: 114cea674411a4eea23af8658f29c6e4bd562f8d
git-subtree-split: 077abe0106b2c1d44d8e996d62ae3e8b2c23bf62
 2018-07-31 16:33:42 -06:00
David Parkhurst
114cea6744 minor memory leak in fail2 2018-03-16 17:41:34 -06:00
David Parkhurst
7a7c7c04dd Tony's message 2018-03-09 16:57:06 -07:00
David Parkhurst
7d044e79a6 Tony fixed error with sc2 and aquia 2018-03-09 11:22:22 -07:00
David Parkhurst
5a73aa95c6 notes for Tony's changes 2018-03-07 17:17:38 -07:00
David Parkhurst
86a55b5b5d Tony's changes from 20180305 2018-03-07 17:08:33 -07:00
David Parkhurst
e977363da4 Tony's changes to ex21 2018-03-06 15:14:26 -07:00
David Parkhurst
b0fdcc41e4 Added Mtg(g) in calc_PR 2018-03-04 20:48:19 -07:00
Scott R Charlton
488636aea2 Added Tipping_Hurley.dat to distributions 2018-02-23 14:22:23 -07:00
David Parkhurst
6c9e9843b7 One more compiler warning 2018-02-23 09:39:25 -07:00
David L Parkhurst
fe71fe0cfc Merge branch 'fix_unit_tester' into 'master' 
added new databases to unit tester

See merge request svn_GW/IPhreeqc!1
 2018-02-22 16:44:14 -07:00
David Parkhurst
b7ee4d4502 Fixed bug from Shell. Segv because s_list.size differed from count_s_x. 
Fixed compiler warnings from jenkins.
 2018-02-22 14:45:39 -07:00
David Parkhurst
8e12139000 Fixed bug from Shell. Segv because s_list.size differed from count_s_x. 
Fixed compiler warnings from jenkins.
 2018-02-22 14:45:39 -07:00
David Parkhurst
5c5993abc8 added new databases to unit tester 2018-02-19 19:14:17 -07:00
David Parkhurst
2d53d8b2df Tony's changes and bug fixes 2018-02-17 20:09:31 -07:00
David Parkhurst
fa7a3c7192 Tony's changes and bug fixes 2018-02-17 20:09:31 -07:00
Parkhurst
c2aec612a2 Database changes from Tony Feb 15, 2018 2018-02-15 15:52:14 -07:00
Scott R Charlton
5b28a87a5d Convert svn:ignore properties to .gitignore. 2018-02-07 23:39:03 -07:00
David L Parkhurst
6854778d29 One more line in dump for potential. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12927 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-09 22:15:30 +00:00
Scott R Charlton
c3188400bf fixed to compile in vs2005 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-09 01:55:49 +00:00
Scott R Charlton
9d86ee1b8c moved concrete-2005 and renamed to trunk 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-08 23:25:48 +00:00
Scott R Charlton
90cde1d670 moved concrete-2005 and renamed to trunk 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-08 23:25:48 +00:00
Scott R Charlton
d801026f14 moved concrete-2005 and renamed to trunk 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-08 23:25:48 +00:00
Scott R Charlton
07da756c47 moved concrete-2005 and renamed to trunk 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-11-08 23:25:48 +00:00
Scott R Charlton
800f234506 added Form1.2005.resX to configure dist 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete-2005@12904 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-10-31 20:38:32 +00:00
Scott R Charlton
db60ab0e3a fixed to compile in vs2005 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete-2005@12903 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-10-31 19:55:15 +00:00
David L Parkhurst
22f9ecedf0 Updating RELEASE.TXT for RELEASE.TXT 
Slight modification to Na2SO4_phr.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12886 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-10-30 19:10:42 +00:00
David L Parkhurst
a46a85a9f0 Making consistent 
phi = (phi > 4.44 ? 4.44 : (phi < -3 ? -3 : phi));

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12860 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-10-03 20:55:36 +00:00
David L Parkhurst
077abe0106 Tony's changes. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12858 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-28 21:48:05 +00:00
David L Parkhurst
b5ef46d09a Tony's changes. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12858 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-28 21:48:05 +00:00
David L Parkhurst
87e5122905 Before Ampere, check in all test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12842 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-25 22:18:10 +00:00
David L Parkhurst
0c2a1aa33a Update of ColdChem.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12840 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-25 19:11:42 +00:00
David L Parkhurst
62dd5a0342 Update of ColdChem.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12840 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-25 19:11:42 +00:00
David L Parkhurst
444a9e3b85 Update of ColdChem.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12839 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-25 19:11:17 +00:00
David L Parkhurst
464c9d13f0 Update of ColdChem.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12839 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-09-25 19:11:17 +00:00
David L Parkhurst
299188f3ce Fixed dist_x function for transport. 
Added dist_x test case.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12814 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-08-30 19:36:32 +00:00