3957 Commits

Author SHA1 Message Date
Darth Vader
bed50e7725 Merge commit 'b27777460b923f047497dcfe78b622c74cf2f0bb' 2024-06-07 21:57:02 +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
9c0615491a Merge commit 'ed24ec246bbfdcd57adbd0d4a9e8fe088a5de5b7' 2024-06-07 21:56:59 +00:00
Darth Vader
ed24ec246b Squashed 'src/' changes from 79511203..2b17f7ca
2b17f7ca Merge commit '8024ee12891fde0332b86544b2b18010a91fde15'
8024ee12 Squashed 'phreeqcpp/' changes from e2f4d06..ceab9a1

git-subtree-dir: src
git-subtree-split: 2b17f7ca917334c9d668b1d63a6499118cd1273f
2024-06-07 21:56:59 +00:00
Darth Vader
0153e46ff7 Merge commit '9ba726de0f8b36a9143922bf148f6a259982756a' 2024-05-29 19:06:22 +00:00
Darth Vader
9ba726de0f Squashed 'src/' changes from fb3f60ce..79511203
79511203 Merge commit '067a8b1aaa326cecf6a1b5a167fe88448ef1e0b2'
067a8b1a Squashed 'phreeqcpp/' changes from 3d5242f..e2f4d06

git-subtree-dir: src
git-subtree-split: 795112031bb1ef92c0eb3c07aea03ea7b222093e
2024-05-29 19:06:21 +00:00
Darth Vader
dd0206a749 Merge commit 'a71e9dca90ec11a4f8c46c8b1af4f9ebed20ea32' 2024-05-27 19:32:10 +00:00
Darth Vader
a71e9dca90 Squashed 'phreeqc3-examples/' changes from ce693868..b3aa6834
b3aa6834 [phreeqc3] Updated ctest outputs

git-subtree-dir: phreeqc3-examples
git-subtree-split: b3aa6834f5840bcfd5df4e6b54207c79ed962f03
2024-05-27 19:32:10 +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
0665f6769c Merge commit '7bdb964b792addf903eb463fae23e10cfa34bf5f' 2024-05-27 19:32:09 +00:00
Darth Vader
7552f8f680 Squashed 'src/' changes from 70e32eba..fb3f60ce
fb3f60ce Merge commit '09af2d5b127a8efe403f47751c7c8465ec94874d'
09af2d5b Squashed 'phreeqcpp/' changes from cb6d9f4..3d5242f

git-subtree-dir: src
git-subtree-split: fb3f60ce26395696273caf5cdf9f3415fca60d5a
2024-05-27 19:32:06 +00:00
Darth Vader
535ad27392 Merge commit '7552f8f680a41d12454080cc1174765c86bb6354' 2024-05-27 19:32:06 +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
7f8e09cb3d Merge commit 'f47551aabd972c0124777e4e6c042098505e560a' 2024-05-20 17:29:37 +00:00
Darth Vader
c00f59c1f0 Merge commit 'e0295bd423ead168b03b474b06a8f140f67e5118' 2024-05-20 17:29:33 +00:00
Darth Vader
e0295bd423 Squashed 'phreeqc3-doc/' changes from ee42c30e..92562d5d
92562d5d lsp of databases, changed alk of e- to 1.0 in all databases, modified sit.dat

git-subtree-dir: phreeqc3-doc
git-subtree-split: 92562d5d331295e5eb67e7b4fbd32cb3616a0c45
2024-05-20 17:29:33 +00:00
Darth Vader
06332bcb62 Squashed 'src/' changes from e8716142..70e32eba
70e32eba Merge commit '0b3f349ad3bb84d493fc4d54bb6537a1fcafbc15'
0b3f349a Squashed 'phreeqcpp/' changes from 07c887a..cb6d9f4

git-subtree-dir: src
git-subtree-split: 70e32eba2ffcd58704cacd12134893f16b8e87be
2024-05-16 01:05:21 +00:00
Darth Vader
2886a98371 Merge commit '06332bcb62daece34f3818f46e11064a56799f23' 2024-05-16 01:05:21 +00:00
Darth Vader
6b08156032 Squashed 'phreeqc3-doc/' changes from 54237d62..ee42c30e
ee42c30e Updated GET$/PUT$ documentation

git-subtree-dir: phreeqc3-doc
git-subtree-split: ee42c30eeefcb8f2404f9026068668dfc3358025
2024-05-13 23:12:32 +00:00
Darth Vader
955980ef13 Merge commit '6b08156032b104477e9e2d3222788e0c1121e509' 2024-05-13 23:12:32 +00:00
Darth Vader
31cc4c07e5 Merge commit '51648664f6f6550440d014f3a985ef9d575c02bd' 2024-05-13 18:46:19 +00:00
Darth Vader
51648664f6 Squashed 'src/' changes from 78fa3ba3..e8716142
e8716142 Merge commit '1efeb356693a42a67a7d7ccf60982c06e882dfdf'
1efeb356 Squashed 'phreeqcpp/' changes from 8f6cb45..07c887a

git-subtree-dir: src
git-subtree-split: e871614214e39fe009f3306b9f4997c5149c8493
2024-05-13 18:46:18 +00:00
Darth Vader
0cc5c5803b Merge commit 'fff75534d73a06719ce2fbb482f843e0fb9dc4c6' 2024-05-10 20:36:55 +00:00
Darth Vader
fff75534d7 Squashed 'src/' changes from edd80cec..78fa3ba3
78fa3ba3 Merge commit '97a4237601d215dd712df5fee01399c9c2841ff8'
97a42376 Squashed 'phreeqcpp/' changes from c035d9c..8f6cb45

git-subtree-dir: src
git-subtree-split: 78fa3ba34e587ccf739759274cff9affc7308a5a
2024-05-10 20:36:54 +00:00
Darth Vader
1d46928b3c Squashed 'phreeqc3-examples/' changes from a9d1de8f..ce693868
ce693868 Tony's revisions to html files. Updated ex21. Only thing left may be revisions to RATES in phreeqc_rates.dat

git-subtree-dir: phreeqc3-examples
git-subtree-split: ce6938682cc7cb1f3a72415505f393fb3ed017ab
2024-05-09 19:46:54 +00:00
Darth Vader
6c0ef8941c Merge commit '1d46928b3cb13921432063016bc92a25111435c2' 2024-05-09 19:46:54 +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
8c967b1c0e Merge commit 'd6b316ba3181d5e31486a0db01b13621ba293971' 2024-05-09 19:46:53 +00:00
Darth Vader
3587ae28e5 Merge commit '9882e3df3cca85659da2a430ffe240f895cdb272' 2024-05-09 19:46:51 +00:00
Darth Vader
9882e3df3c Squashed 'src/' changes from c767e9c6..edd80cec
edd80cec Merge commit 'bacfb0ea50c83434d21d3b0c8eda18543ee8b89a'
bacfb0ea Squashed 'phreeqcpp/' changes from 60ccbf8..c035d9c

git-subtree-dir: src
git-subtree-split: edd80cecf2ebc91f889e31872355bb6450bc9c0a
2024-05-09 19:46:50 +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
8f449a2172 Merge commit 'c276bbc3d1b583f58993073a7769447c0003fbac' 2024-05-07 22:42:04 +00:00
Darth Vader
a159b5af31 Squashed 'src/' changes from 8acfbb38..c767e9c6
c767e9c6 Merge commit '4a24a89572cca75b5919dabde3ac798c175bf899'
4a24a895 Squashed 'phreeqcpp/' changes from 0243c90..60ccbf8

git-subtree-dir: src
git-subtree-split: c767e9c6a1847ed4e968b2f45b5d9e4c7f69d429
2024-05-07 22:42:01 +00:00
Darth Vader
ac0a959f1b Merge commit 'a159b5af317ba8b61dd3a6c9242a98e76829467d' 2024-05-07 22:42:01 +00:00
Darth Vader
4870c6a2e8 Merge commit '4a52c4cc317699d3d83723c7e3ea131dca7c4dd8' 2024-05-07 22:41:59 +00:00
Darth Vader
4a52c4cc31 Squashed 'phreeqc3-doc/' changes from 36acf3ff..54237d62
54237d62 removed CALCULATE_VALUES description
aaefea95 Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, updated CMakeLists, ran all examples, added test case ss_kinetics
e37ae0af Word from PDF for documentation
de06166d added put$ and get$ Basic functions. Added test cases get_put_ to test get$ and put$. Added kinetic_rates_carbfix to use new database kinec.v2.dat. Fixed pad$ to use strexpr.
543816f0 added Kinec.v2.dat and updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: 54237d62fcb0201e2c57889da9d284c6e3405431
2024-05-07 22:41:58 +00:00
Charlton, Scott R
5f00edf1ab Use phreeqc.dat from 90a6449 for TestMultiPunchCSelectedOutput tests 2024-04-19 16:37:58 -06:00
Darth Vader
5898c60f38 Merge commit 'b1888bb5d68d0ae9736556acd5702d44448eb492' 2024-04-19 19:50:20 +00:00
Darth Vader
b1888bb5d6 Squashed 'src/' changes from 478318af..8acfbb38
8acfbb38 Merge branch 'master' into module
666e4b81 Issue 160 in phreeqc. llnl minimum temperature problem. There are several places where a SOLUTION is constructed to get lists or test the database. By default the SOLUTION is 25C, so if llnl has a minimum temperature greater (or maximum temperature less) than 25, an error is encountered. The fix is to change the temperature of the SOLUTIONs to the minimum temperature of the llnl grid if llnl is being used.

git-subtree-dir: src
git-subtree-split: 8acfbb384a34dead1b805f5ee33d7dcd6c0b3a13
2024-04-19 19:50:19 +00:00
Darth Vader
abbac3bb03 Merge commit '799a4e7ee471ab80ac21f4dceb7233324576c6da' 2024-04-18 21:18:02 +00:00
Darth Vader
799a4e7ee4 Squashed 'src/' changes from e8c03d16..478318af
478318af Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8'
f100f492 Squashed 'phreeqcpp/' changes from 89d028d..0243c90

git-subtree-dir: src
git-subtree-split: 478318affeece3b1026a8c6a9d44264d61766bfa
2024-04-18 21:18:01 +00:00
Darth Vader
9d0b5a7440 Squashed 'phreeqc3-examples/' changes from fbe17c9e..a9d1de8f
a9d1de8f Updated output files (from windows)
47ace2e0 Changed examples/ex21 encoding to UTF-8

git-subtree-dir: phreeqc3-examples
git-subtree-split: a9d1de8fa2842e839fabadc1f4a49fe3afb23ab1
2024-04-18 20:08:49 +00:00
Darth Vader
8bd2c62315 Merge commit '9d0b5a7440499bf4adb70d39e2a743cc07f2380a' 2024-04-18 20:08:49 +00:00
Darth Vader
e53806d156 Squashed 'phreeqc3-examples/' changes from 5fe290be..fbe17c9e
fbe17c9e Tony's update to example 21

git-subtree-dir: phreeqc3-examples
git-subtree-split: fbe17c9e10e5d468a074faab593e07b63dda68fe
2024-04-18 18:17:14 +00:00
Darth Vader
e64f73da33 Merge commit 'e53806d1564015bc179c2b479c305c5ac8a279b3' 2024-04-18 18:17:14 +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
4080dd2f0c Merge commit '519b2e6b4c364a454a491ad8791473097fbd370c' 2024-04-18 18:17:13 +00:00
Darth Vader
1d8783186c Squashed 'src/' changes from b4a42445..e8c03d16
e8c03d16 Merge commit 'c378c74d7f2510092a8fca311f7ffbbb7ed96f1d'
c378c74d Squashed 'phreeqcpp/' changes from 7284fed..89d028d

git-subtree-dir: src
git-subtree-split: e8c03d169346861db62629edb0ca43e1fd688be9
2024-04-18 18:17:11 +00:00
Darth Vader
c76339d766 Merge commit '1d8783186c3d231e5ca909a0427cb33b2c29d558' 2024-04-18 18:17:11 +00:00
Darth Vader
6bfe0dbbab Squashed 'phreeqc3-doc/' changes from e30aa466..36acf3ff
36acf3ff updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: 36acf3ff50e03e7985f71c24eb196e8f43e875c7
2024-04-18 18:17:09 +00:00