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

1434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Parkhurst
7a7c7c04dd Tony's message 2018-03-09 16:57:06 -07:00
David Parkhurst
5a73aa95c6 notes for Tony's changes 2018-03-07 17:17:38 -07:00
Scott R Charlton
488636aea2 Added Tipping_Hurley.dat to distributions 2018-02-23 14:22:23 -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
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
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
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
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
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
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
88c2b95fc7 RELEASE.TXT updated for new version. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12777 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-08-02 20:03:36 +00:00
David L Parkhurst
5c2f6b1078 Merge with trunk to 12776 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12776 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-08-02 20:02:16 +00:00
David L Parkhurst
6711ecab51 Merge with trunk to 12776 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12776 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-08-02 20:02:16 +00:00
David L Parkhurst
33f827b0f7 Added references and comments to core10.dat. Should be ready for new distribution. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12774 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-08-02 19:13:56 +00:00
David L Parkhurst
e49e199894 transcription error for the ethane analytical expression caught by Marc Neveu. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12758 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-08-01 22:09:36 +00:00
Scott R Charlton
f821d0b075 added core10.dat to distributions 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12751 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-07-27 04:22:12 +00:00
Scott R Charlton
5bbe4ca018 added core10.dat from https://github.com/MarcNeveu/IcyDwarf/blob/master/IcyDwarf/PHREEQC-3.1.2/core10.dat 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12732 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-07-18 22:06:49 +00:00
David L Parkhurst
0b32fddb5b Synced to PHREEQC3 12702 
Error when reading PHASES and -no_check was read instead
of equation.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12703 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-05-10 20:03:07 +00:00
David L Parkhurst
151972a1ee Error when reading PHASES and -no_check was read instead 
of equation.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12702 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-05-10 20:00:03 +00:00
David L Parkhurst
9b9f9b3263 Synced with concrete 12683. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12684 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-25 18:03:36 +00:00
David L Parkhurst
3cbc556610 Synced with PHREEQC 12683. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12683 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-25 18:03:14 +00:00
Scott R Charlton
c773a07831 working on cran dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12667 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-08 06:17:45 +00:00
Scott R Charlton
a02faf7a92 added HEAD replacement 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12666 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-08 06:09:05 +00:00
Scott R Charlton
347272a452 added sed for jenkins R build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12665 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-08 06:04:45 +00:00
Scott R Charlton
2f5071790c added remaining .Call routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12664 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-08 05:30:39 +00:00
Scott R Charlton
2807ca2045 working on CRAN dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12663 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-04-08 05:16:29 +00:00
David L Parkhurst
ba5f2ba885 save state. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12650 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-31 20:32:48 +00:00
David L Parkhurst
8f81bf1702 save state. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12650 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-31 20:32:48 +00:00
David L Parkhurst
74e4459310 update RELEASE.TXT 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12636 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-29 20:50:12 +00:00
David L Parkhurst
199fdb683d Updated to svn 12361 on trunk 
Added documentation for density calculate



git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12635 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-29 20:48:54 +00:00
David L Parkhurst
8cc37106d0 updated with title and density calculate. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12631 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-29 19:42:34 +00:00
David L Parkhurst
78734c68e6 Added documentation for electro-migration at top of RELEASE.TXT file. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12547 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-10 19:42:59 +00:00
David L Parkhurst
2e0a8a5121 Merged phreeqc3-trunk through 12545. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12546 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-10 18:30:49 +00:00
David L Parkhurst
7a7b24ea3b Update RELEASE.TXT 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12545 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-10 18:30:15 +00:00
Scott R Charlton
f05a504db7 Added APHI and PHASE_VM Basic functions 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12535 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-03-10 01:14:35 +00:00
David L Parkhurst
9e544b2539 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