13 Commits

Author SHA1 Message Date
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
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
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
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
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