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
89 Commits 6 Branches 4 Tags
Commit Graph

89 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
4a8e5582e7 Squashed 'database/' changes from 6b0972bd..e0447f7a 
e0447f7a Minimum data base.

git-subtree-dir: database
git-subtree-split: e0447f7ad56fc91f0c37b79f3e895fd700f048a6
 2023-11-20 00:17:18 +00:00
Darth Vader
25d296d554 Squashed 'database/' changes from 64d92a5a..6b0972bd 
6b0972bd Merge remote-tracking branch 'origin/master'
f9d7fa2d Tony's changes May 5 and 7.
2f8712a3 Tweaked RELEASE.TXT, fixed another GFW, this time redox.dat
5278d54f Fixed Sg gfw and alkalinity in Amm.dat, phreeqc.dat, and pitzer.dat. Updated RELEASE.TXT

git-subtree-dir: database
git-subtree-split: 6b0972bd436a1ca6d7dfaf69d5d5307d8b232513
 2023-05-26 04:22:38 +00:00
Darth Vader
ef475d0f25 Squashed 'database/' changes from fd9eb5ee..64d92a5a 
64d92a5a Added sleeps after curl -X POST

git-subtree-dir: database
git-subtree-split: 64d92a5a0bca60518e33cdec704fa47945796166
 2023-05-26 02:28:12 +00:00
Darth Vader
70f82ce8d6 Squashed 'database/' changes from 91aa5fd8..fd9eb5ee 
fd9eb5ee Tony's viscosity with many examples

git-subtree-dir: database
git-subtree-split: fd9eb5ee8ab232613fc558fa2e11f2c37cc21c5f
 2023-04-10 18:26:21 +00:00
Darth Vader
cb3f03cf1a Squashed 'database/' changes from 4c2ea26c..91aa5fd8 
91aa5fd8 Introduce end-of-line normalization (#6)

git-subtree-dir: database
git-subtree-split: 91aa5fd89b2f211b1dc85020c227df1a35676318
 2023-03-08 21:57:04 +00:00
Darth Vader
b17a8be1df Squashed 'database/' changes from a161f1c8..4c2ea26c 
4c2ea26c Merge pull request #17 from scharlton2/bmi-working
6b9245ae pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: database
git-subtree-split: 4c2ea26c5adf80379785359fc4e42b6d456a09b8
 2023-03-07 02:43:16 +00:00
Darth Vader
2a2134b55c Squashed 'database/' changes from 20e6e440..a161f1c8 
a161f1c8 added Thermoddem database

git-subtree-dir: database
git-subtree-split: a161f1c81da294667fd96a8d775254bdb33a474c
 2023-03-07 00:58:59 +00:00
Darth Vader
39086e3af2 Squashed 'database/' changes from 488636ae..20e6e440 
20e6e440 still produces different residuals
6ea9caf0 Tony H2S. Amm.dat, phreeqc.dat, pitzer.dat, utf8, updated test cases
c1c97a85 before H2S
a7be9fcf Updated Amm.dat, phreeqc.dat, pitzer.dat for H2S(g)
b40b25fd Another SIT database
fce334ff use cmake for valgrind tests
90f9cb53 checking in test cases using latest revisions. degree sign in pitzer.dat
d45a37e0 database UTF-8
3aa7a146 Tony database update, kinetic_rates example
f385cf57 Tony's updates March 10, 2021
88afb660 Tony's changes March 10, 2021.
4396def4 add databases
e4e5449a [wphast] updated date
4c209593 [phreeqc3] updated image location
beaab1d6 more characters
6b8138c2 fixed degree sign
759cac1f fixed some sit.dat characters
3f258562 updated databases
8be6ec5f update to charlton master
2560903d [phreeqci] Testing subtree merges
1d71804f Merge commit 'a400365a5e06a9cd2ac0aa6e2c51fa4797c631f8'
a400365a [phreeqc3] Testing subtree merges
4296b155 Merge commit '0e8069e37275f23d47e04bd6b7873ec56dfdf088'
0e8069e3 Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff
fa7cbaf5 Added .gitlab-ci.yml
6a8d5088 Added .gitlab-ci.yml
cfc208b0 updated installer
164b85d3 Fixed some bugs with iso.dat inverse modeling, added test case. Still does not generate [13C](4) and [13C](-4) from SOLUTION
06e25ec8 Correction to core10.dat from Neveu

git-subtree-dir: database
git-subtree-split: 20e6e440f056358f9887ada878a76d8e3d4ecc64
 2021-10-30 22:54:23 +00:00
Scott R Charlton
488636aea2 Added Tipping_Hurley.dat to distributions 2018-02-23 14:22:23 -07:00
Parkhurst
c2aec612a2 Database changes from Tony Feb 15, 2018 2018-02-15 15:52:14 -07: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
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
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
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
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
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
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
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
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
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
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
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
David L Parkhurst
ebe582ad89 Updates for CO2 and CH4 in phreeqc.dat and CH4 in pitzer.dat. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-27 15:20:57 +00:00
David L Parkhurst
e4bc7b8eb9 MINTEQ version 4 has wrong sign for delta H of NH3. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10038 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-03 13:41:50 +00:00
David L Parkhurst
a245bdbf84 Tony's latest CO2. 
looks like Hebach has multiple roots, and
ternary looks off.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9988 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-07-13 20:17:56 +00:00
Scott R Charlton
0072ba834b added frezchem.dat to databases for automake 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9660 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-15 04:48:06 +00:00
Scott R Charlton
46ebca108d added frezchem.dat to databases 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9650 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-13 21:32:43 +00:00
David L Parkhurst
28056e8da6 Latest from Amphos. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9639 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-12 16:00:41 +00:00
David L Parkhurst
d9970213ab Hg2(+2) changed to Hg(+1) 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9631 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-09 18:46:46 +00:00
David L Parkhurst
8203b7008b Version 9a 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9617 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 19:10:28 +00:00
Scott R Charlton
de35816f89 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9542 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-20 22:13:45 +00:00
Scott R Charlton
0b4148b355 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9540 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-17 22:21:17 +00:00
David L Parkhurst
c940f08cd1 Updated Quartz 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9462 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-02 22:01:19 +00:00
David L Parkhurst
cc015bdffc With Tony's revisions. 
Still need to fix quartz in phreeqc.dat and Amm.dat.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9461 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-02 21:46:29 +00:00