112 Commits

Author SHA1 Message Date
Darth Vader
4a6ec6151e Squashed 'database/' changes from 4e898381..ec0212de
ec0212de removed tabs before eol in stimela.dat. Updated RELEASE.TXT.
3cf80a8a Added simela.dat-from Peter de Moel. Fixed bug in write_raw/read_raw GasComp, order of options

git-subtree-dir: database
git-subtree-split: ec0212ded233929c14fc4bc5d6f0d61604ef3c8e
2025-02-18 20:26:38 +00:00
Darth Vader
48d952740c Squashed 'database/' changes from bf60c1ca..4e898381
4e898381 Merge branch 'master' into mix_error
20d3a9e5 Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.

git-subtree-dir: database
git-subtree-split: 4e898381542ce722cd7c3c74fe9c2592ec34d41b
2025-01-07 20:00:03 +00:00
Darth Vader
47a34ca634 Squashed 'database/' changes from 1a221cd7..bf60c1ca
bf60c1ca Fix typos

git-subtree-dir: database
git-subtree-split: bf60c1ca9d528f429086991e96e445f6b3976981
2024-12-06 00:27:57 +00:00
Darth Vader
11997540b7 Squashed 'database/' changes from 6ff8cfe3..1a221cd7
1a221cd7 (NH4)2SO4 database update from Tony

git-subtree-dir: database
git-subtree-split: 1a221cd778c932dbc43f6d7601a3e43985f3e935
2024-11-21 00:30:05 +00:00
Darth Vader
cb834cf03d Squashed 'database/' changes from 1db6b42f..6ff8cfe3
6ff8cfe3 Added documentation for GAS_BINARY_PARAMETERS
a3cbc5d8 Made GAS_BINARY_PARAMETERS backward compatible
e5780c95 GAS_BINARY_PARAMETERS implemented. gas_binary_parameters test case
c1dd17c7 Tweaked H+ viscosity in databases, new test cases fig1 and H_HCl_HBr

git-subtree-dir: database
git-subtree-split: 6ff8cfe34150e60683b6ceb5c252ae07c211f976
2024-11-14 01:37:18 +00:00
Darth Vader
04e805fe8f Squashed 'database/' changes from 9e8d773e..1db6b42f
1db6b42f Changed Lamda to Lambda, but retained backward compatibility

git-subtree-dir: database
git-subtree-split: 1db6b42f19ffebb2d6ecc3c557e68c92dc13ad82
2024-10-11 19:12:07 +00:00
Darth Vader
d17a0c7767 Squashed 'database/' changes from 24d2c771..9e8d773e
9e8d773e Merge pull request #74 from mwtoews/fix-typos
dc8e003f Fix typos

git-subtree-dir: database
git-subtree-split: 9e8d773e18b9bbd8517b340061d6f509515fa019
2024-10-08 20:05:49 +00:00
Darth Vader
9f148afd1a Squashed 'database/' changes from 5146dd68..24d2c771
24d2c771 Tony updated OH- viscosity

git-subtree-dir: database
git-subtree-split: 24d2c771f3830a122fc3f91d5f0b185c0128bdfb
2024-09-24 22:03:35 +00:00
Darth Vader
13380db01c Squashed 'database/' changes from c51839c6..5146dd68
5146dd68 Added Kinec_v3.dat to distribution Updated RELEASE.TXT for IPhreeqc
b98a6538 Kinec_v3.dat should replace kinec.v2.dat

git-subtree-dir: database
git-subtree-split: 5146dd686e295681c78dc7f775ab22efa6f84ed6
2024-08-22 23:33:43 +00:00
Darth Vader
3a070775e2 Squashed 'database/' changes from 307253d3..c51839c6
c51839c6 Changed back to AmmH

git-subtree-dir: database
git-subtree-split: c51839c62249bbad9126d4e7aca71a3e4c598a76
2024-06-25 19:35:20 +00:00
Darth Vader
ca69fc3314 Squashed 'database/' changes from b5394351..307253d3
307253d3 Fixed AmmH in Amm.dat and comments in phreeqc.dat and phreeqc_rates.dat

git-subtree-dir: database
git-subtree-split: 307253d3f96635e2bd94cf6deecd72ac9dcbcb82
2024-06-20 21:53:24 +00:00
Darth Vader
f6094a96e6 Squashed 'database/' changes from 4fc5a196..b5394351
b5394351 Merge branch 'viscosity' of github.com:dlparkhurst/phreeqc3-1 into viscosity
7d53e27f formatted rate parameters for phreeqc_rates.dat

git-subtree-dir: database
git-subtree-split: b5394351dec7c541519a422ad42495fd9ec1945b
2024-06-10 01:32:15 +00:00
Darth Vader
f6eef43b74 Squashed 'database/' changes from 9bf3c42d..4fc5a196
4fc5a196 [phreeqc3] Updated databases

git-subtree-dir: database
git-subtree-split: 4fc5a196119c09ee6337f6c13618c8031bc6acaa
2024-06-08 00:05:43 +00:00
Darth Vader
b27777460b Squashed 'database/' changes from e39a5d3c..9bf3c42d
9bf3c42d 20240607b pitzer.dat
bab2c2e2 20240607a database22.zip
9064885f 20240607 database2.zip from Tony
a4a7ecab Tony's change to Sr and NH4, SC_Ohm and rate_xmpls, basicsubs.cpp error

git-subtree-dir: database
git-subtree-split: 9bf3c42d7c3df8472e2e83b0138032fe8697990b
2024-06-07 21:57:02 +00:00
Darth Vader
7bdb964b79 Squashed 'database/' changes from 26398a44..e39a5d3c
e39a5d3c fixed Br- in phreeqc_rates.dat
939517fc Tonys changes to Br in phreeqc.dat, amm.dat, and pitzer.dat. New test case NaK_ClBr.

git-subtree-dir: database
git-subtree-split: e39a5d3c5e703dbad6f91400acee67bb270de636
2024-05-27 19:32:09 +00:00
Darth Vader
f47551aabd Squashed 'database/' changes from 017185a7..26398a44
26398a44 lsp of databases, changed alk of e- to 1.0 in all databases, modified sit.dat
1c2e59be Tony revised latest sit with lsp
1693e0c1 New version from Tony
5faf092b Tony revisions to phreeqc_rates.dat and rate_xmpls
0bcc9db0 Tony tweaked phreeqc_rates.dat and added rate_xmpls test case.

git-subtree-dir: database
git-subtree-split: 26398a442446dc31463fb08c3d1cd06df609b633
2024-05-20 17:29:37 +00:00
Darth Vader
d6b316ba31 Squashed 'database/' changes from 0d58080e..017185a7
017185a7 Tony updates to phreeqc_rates.dat. Added albite_rates. Copy/paste error in read.cpp

git-subtree-dir: database
git-subtree-split: 017185a7b26a90c83deb7ed402f570c5d0f51f70
2024-05-09 19:46:53 +00:00
Darth Vader
c276bbc3d1 Squashed 'database/' changes from 49d82d37..0d58080e
0d58080e fixed case of Kinec.v2.dat
71e10f57 Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, updated CMakeLists, ran all examples, added test case ss_kinetics
93ba7f97 Tony's latest databases
b6ecf248 added Kinec.v2.dat and updated RELEASE.TXT

git-subtree-dir: database
git-subtree-split: 0d58080e75184dc9c9020204ae6a2c300d0c7f02
2024-05-07 22:42:04 +00:00
Darth Vader
519b2e6b4c Squashed 'database/' changes from bae20ea7..49d82d37
49d82d37 fix for new Valgrind problem. Added a newer CEMDATA database for the database collection.
ad2440a3 Tony changes 20240414, with correction to CH4 Vm. Changes to src. seaw_SC expanded.
b3469711 Merge branch 'master' into viscosity
87eeeec8 Merge branch 'master' into viscosity

git-subtree-dir: database
git-subtree-split: 49d82d37607fa4814aa4f13df0960ffd36e8fdcf
2024-04-18 18:17:13 +00:00
Darth Vader
4a0af1be39 Squashed 'database/' changes from 22eb9506..bae20ea7
bae20ea7 Merge pull request #45 from dlparkhurst/viscosity
d18452f3 All test cases run. Fixed CALCULATED_VALUES and RATES in Amm.dat and phreeqc.dat
5c6d1c5a Tony's changes Mar 15, 2024
39130824 Tony's changes Mar 15, 2024
bc1f8f86 Tony's changes Mar 15, 2024
3318883e Tony's Mar 15, changes.
77038cb6 modified NH3 from Tony's Amm.dat
e510f752 Tony's changes 2/12/2024

git-subtree-dir: database
git-subtree-split: bae20ea7e849a914e6abea15c71cdad69db68db7
2024-04-17 00:17:32 +00:00
Darth Vader
8e1a4d0836 Squashed 'database/' changes from 976555e2..22eb9506
22eb9506 normalized text files

git-subtree-dir: database
git-subtree-split: 22eb9506866dbce35ae69811760e51e5fc785b5c
2024-04-05 17:14:37 +00:00
Darth Vader
76aea93737 Squashed 'database/' changes from 9665bd4a..976555e2
976555e2 Added PHREEQC_ThermoddemV1.10_15Dec2020.dat

git-subtree-dir: database
git-subtree-split: 976555e201ea1ba8a0f37a78edfeec0e1550dd98
2024-03-13 18:03:29 +00:00
Darth Vader
d59be381ee Squashed 'database/' changes from e0447f7a..9665bd4a
9665bd4a Updated for ubuntu 22.04

git-subtree-dir: database
git-subtree-split: 9665bd4a81b47793f54efa908511c8caaa890d53
2024-03-05 18:15:01 +00:00
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