87 Commits

Author SHA1 Message Date
github-actions[bot]
c36b70aa4a Squashed 'phreeqc3-doc/' changes from 05a4c62f..d76f816a
d76f816a Merge pull request #96 from dlparkhurst/mix_error
5ce8cb55 Tony's fit of sulfate solubilities for phreeqc.dat, pitzer.dat, phreeqc_rates.dat
1f54041a Note on isotopes for PhreeqcRM.
f0851e90 changed map to set to mix from largest mixing fraction to smallest

git-subtree-dir: phreeqc3-doc
git-subtree-split: d76f816aedab530a361a63c26a02b453eadf01a2
2025-09-10 22:44:27 +00:00
Darth Vader
dcf01e46e9 Squashed 'phreeqc3-doc/' changes from 71e7c5a0..394240f2
394240f2 Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.

git-subtree-dir: phreeqc3-doc
git-subtree-split: 394240f20af07dabe460ea1f6ce11016f7427362
2025-03-14 18:23:12 +00:00
Darth Vader
95c70688aa Squashed 'phreeqc3-doc/' changes from 0a3757d4..71e7c5a0
71e7c5a0 Updated for 3.8.7

git-subtree-dir: phreeqc3-doc
git-subtree-split: 71e7c5a0341c24ad2d134e18cc7f22e6ddc2435a
2025-02-25 21:56:41 +00:00
Darth Vader
3a0f756ff7 Squashed 'phreeqc3-doc/' changes from 797e95aa..e7f79ef2
e7f79ef2 removed tabs before eol in stimela.dat. Updated RELEASE.TXT.

git-subtree-dir: phreeqc3-doc
git-subtree-split: e7f79ef2413934217d74ebb84f9c3fc4369e648d
2025-02-18 20:26:31 +00:00
Darth Vader
bc33cd7484 Squashed 'phreeqc3-doc/' changes from fd438d3e..797e95aa
797e95aa Updated RELEASE.TXT for 3.8.6

git-subtree-dir: phreeqc3-doc
git-subtree-split: 797e95aadd3e1dd2932a04e862b1716867e21c11
2025-01-07 21:05:42 +00:00
Darth Vader
b0adf3f16b Squashed 'phreeqc3-doc/' changes from 70e57ae2..fd438d3e
fd438d3e slight changes to Release.txt
ef355d83 tweak to Release.txt
a75db3f6 Merge branch 'master' into mix_error
44aaa0e6 updated Release.txt for diffuse layer error.

git-subtree-dir: phreeqc3-doc
git-subtree-split: fd438d3e1f3c02dafee64fa92caea2a4c65344e8
2024-11-18 21:27:30 +00:00
Darth Vader
90cf51d443 Squashed 'phreeqc3-doc/' changes from 1cc308a1..70e57ae2
70e57ae2 Added PHREEQCI fix

git-subtree-dir: phreeqc3-doc
git-subtree-split: 70e57ae2d734c2f7e7985f3361c6b10be6fc3324
2024-11-14 19:23:41 +00:00
Darth Vader
6a5562003f Squashed 'phreeqc3-doc/' changes from 98fcfd3d..1cc308a1
1cc308a1 Added documentation for GAS_BINARY_PARAMETERS
1f0c405f Updated Release.txt with PhreeqcRM bug fix
09bf7c8c fixed ex22 for graphing. Updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: 1cc308a15bb182db55c2fa68b1455164cd27ac07
2024-11-14 01:37:09 +00:00
Darth Vader
8158e50421 Squashed 'phreeqc3-doc/' changes from c703f2f3..98fcfd3d
98fcfd3d [iphreeqc] Updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: 98fcfd3d56bd3774b057c02ef647c64f2b07e143
2024-10-25 18:14:35 +00:00
Darth Vader
12a6db0e2b Squashed 'phreeqc3-doc/' changes from a8fd3b6a..c703f2f3
c703f2f3 [phreeqc3] Updated outputs for 3.8.3
46e71825 Tony's tweak to transport, updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: c703f2f3e055b9157a06a59f09926a5caba04764
2024-10-22 01:03:07 +00:00
Darth Vader
67e3b79829 Squashed 'phreeqc3-doc/' changes from db48f0f6..a8fd3b6a
a8fd3b6a Changed Lamda to Lambda, but retained backward compatibility

git-subtree-dir: phreeqc3-doc
git-subtree-split: a8fd3b6a191f62885c8f2e31915410bbff840a2d
2024-10-11 19:11:57 +00:00
Darth Vader
b6d35e21c7 Squashed 'phreeqc3-doc/' changes from 7bb51ae7..db48f0f6
db48f0f6 Fix typos

git-subtree-dir: phreeqc3-doc
git-subtree-split: db48f0f69e9b2ec1880a62418e598777bc79ddcf
2024-10-08 20:05:40 +00:00
Darth Vader
ead288422b Squashed 'phreeqc3-doc/' changes from ca3ebafd..7bb51ae7
7bb51ae7 Whitespace adjustments

git-subtree-dir: phreeqc3-doc
git-subtree-split: 7bb51ae783708bb9f004cc9ba6985ffc95df3ce8
2024-08-29 19:54:50 +00:00
Darth Vader
e4059956a8 Squashed 'phreeqc3-doc/' changes from cfaa0d9a..ca3ebafd
ca3ebafd updated release.txt with Tony's viscosity updates. Updated EDL Basic function documentation in HTML.

git-subtree-dir: phreeqc3-doc
git-subtree-split: ca3ebafda0fc09ea9b95a8ce4ee7890b6755b93b
2024-08-29 19:01:22 +00:00
Darth Vader
48526b3594 Squashed 'phreeqc3-doc/' changes from 162c3a25..cfaa0d9a
cfaa0d9a Added Kinec_v3.dat to distribution Updated RELEASE.TXT for IPhreeqc
7f831e87 Updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: cfaa0d9ad164cd5dd73163c8ca265b12793c8b99
2024-08-22 23:33:39 +00:00
Darth Vader
875145cc20 Squashed 'phreeqc3-doc/' changes from e87a48a2..162c3a25
162c3a25 Added to Release.txt about dump issue.

git-subtree-dir: phreeqc3-doc
git-subtree-split: 162c3a25ad948a0f262b15e6b0a7a1eff374e4f3
2024-07-11 19:14:29 +00:00
Darth Vader
43b0c86755 Squashed 'phreeqc3-doc/' changes from 92562d5d..e87a48a2
e87a48a2 Fixed unprintable characters in RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: e87a48a23412f2981e305c8f291b4340d05569a1
2024-06-25 19:35:12 +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
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
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
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
Darth Vader
80ab6f112d Squashed 'phreeqc3-doc/' changes from f289b94c..e30aa466
e30aa466 merged master into viscosity
c86d4366 release.txt

git-subtree-dir: phreeqc3-doc
git-subtree-split: e30aa466d8b6ef81ec0543f481d885ee0bbe992f
2024-04-17 00:17:29 +00:00
Darth Vader
7c3090dc15 Squashed 'phreeqc3-doc/' changes from 12e58e3e..f1ef4343
f1ef4343 [skip ci] Fixed typo Added path-ignore to github actions
b81c0fa8 update RELEASE.TXT
fd52458b release notes update

git-subtree-dir: phreeqc3-doc
git-subtree-split: f1ef4343674725bf10c69247bec90f3e5549a093
2023-11-20 00:17:11 +00:00
Darth Vader
51e91d4a6b Squashed 'phreeqc3-doc/' changes from ae15b211..12e58e3e
12e58e3e bug fix on Basic functions; minor update to Release.txt

git-subtree-dir: phreeqc3-doc
git-subtree-split: 12e58e3ec323fb6ce38b4e93c82fb36ad2212a81
2023-08-25 15:29:54 +00:00
Darth Vader
e9737db628 Squashed 'phreeqc3-doc/' changes from 399344e2..ae15b211
ae15b211 Added sleeps after curl -X POST
8cd33873 Tony's changes May 5 and 7.
71aeaa16 Tweaked RELEASE.TXT, fixed another GFW, this time redox.dat
ce92a0c1 Fixed Sg gfw and alkalinity in Amm.dat, phreeqc.dat, and pitzer.dat. Updated RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: ae15b2118015838a2c3e780660a56ada9232cda9
2023-05-26 04:22:35 +00:00
Darth Vader
b518cad5a5 Squashed 'phreeqc3-doc/' changes from c3ed55b0..399344e2
399344e2 fixed surface.cxx correct_gc. tweaked P_Vm, but it is not too stable.
cbf9cc1d Tony's viscosity with many examples

git-subtree-dir: phreeqc3-doc
git-subtree-split: 399344e2d5f22d4edd69ebd5c71b43d15d5a13b9
2023-04-10 18:26:17 +00:00
Darth Vader
8e3d93040a Squashed 'phreeqc3-doc/' changes from a321fbd6..8925f6c3
8925f6c3 updated RELEASE.TXT, revised PR_P and PR_PHI functions and the test case PR_error_incremental

git-subtree-dir: phreeqc3-doc
git-subtree-split: 8925f6c3e593af286eddce71943a535afa7b7a3f
2023-03-07 00:58:57 +00:00
Darth Vader
de976d7afd Squashed 'phreeqc3-doc/' changes from e52222e9..a321fbd6
a321fbd6 fixed ranges in ADVECTION, added test case advect_ranges, fixed RELEASE.TXT

git-subtree-dir: phreeqc3-doc
git-subtree-split: a321fbd61bc1901e82e5404f928bef35f679c94f
2021-11-29 15:14:07 +00:00
Darth Vader
9b8bb8814d Squashed 'phreeqc3-doc/' changes from 9f3e76c4..e52222e9
e52222e9 added change note concerning change in surface related to phase coming into existence

git-subtree-dir: phreeqc3-doc
git-subtree-split: e52222e9fd82aa1f1abfe06e8e43f2d3452cc8ee
2021-11-09 01:59:49 +00:00
Darth Vader
24a1004c15 Squashed 'phreeqc3-doc/' changes from 1f963b6d..9f3e76c4
9f3e76c4 Fixed DIFF_C and SETDIFF_C. Updated RELEASE.txt

git-subtree-dir: phreeqc3-doc
git-subtree-split: 9f3e76c4b9d7a2e9d231b4a201b5cae4c32bec10
2021-10-31 19:40:51 +00:00
Darth Vader
6ece343e4a Squashed 'phreeqc3-doc/' changes from 7a7c7c04..1f963b6d
1f963b6d new Basic functions
5431417d noted changes for Peng-Robinson gases and Pitzer
2aee1d68 updated RELEASE.TXT
a3d35b63 Update RELEASE.TXT, add + in solution definition
d469c0d9 latest change Fe(+3) in RELEASE.TXT
4656bd00 fixed add_constant, undefined surface null pointer, added test cases
6251be94 updated RELEASE
481eedd9 release.txt, couple size_t
450fd69f fix to RELEASE.TXT
705653dd [phreeqci] reformated Basic Summary; added arguments to SETDIFF_C
90ae41fc tweaked RELEASE.TXT
5228f81e updated for Basic functions
0087a2c7 New PhreeqcRM methods
cf68cd89 Updated RELEASE.TXT, sys_sort
6512551f added optional 6th argument to Basic function sys to change sort order from molality or moles to the name. Added synonym PAD$. Added new mytest/sys_sort.
1039e398 [wphast] updated date
50073d4c [phreeqc3] updated image location
6227f660 added ADD_HEADING for IPhreeqc
e7326214 Added EOL_NOTAB$ and NO_NEWLINE$, updated release notes
4357f6fa updated list of databases
f1ddd8af Tony's changes to implicit Nernst-Planck calculation
3524b835 added Basic function DEBYE_LENGTH and test case zeta
5c3f67fc Finished up surface and exchange related for cases where related phase or kinetic reaction was modified. Proportionality should now be maintained. Added test cases.
e69e150a Documented change for Kinniburgh to allow strings in selected output under all conditions
4972f1d2 Merge remote-tracking branch 'coupled/master'
1ea94aeb Noted bug fix in Fortran RM_RunString instance order for documentation
001a6b42 [phreeqci] Testing subtree merges
a9eadc26 Merge commit '206bd3e73665fb802ddb0b0ce9150353eb86b3cd'
206bd3e7 [phreeqc3] Testing subtree merges
c6ecaadf Merge commit '006fd2459d694c18c772996098d662960a35a628'
006fd245 Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff
0f79fee4 Added .gitlab-ci.yml
d10040e8 Added .gitlab-ci.yml
3f9e12e8 Fixed GFW bug on new elements in TRANSPORT
ed1c5314 Updated RELEASE.TXT for PhreeqcI TRANSPORT Bug
4b1efdf2 Tweak of Release.txt
2f0b20f0 Revised Frame on labtop xp virtual machine. Wrote book html. Copied html and fm files to implicit3. Ran fixup. Now checking in.
e96a11b4 updating release.txt with Tonys descriptions
a3fe841d reran more examples that have additional cell prints for TRANSPORT
4c3958e1 Updated RELEASE.TXT
d4070c8a Modified RELEASE.TXT for _MIX documentation
d590d398 Fixed gas_phase_mix bug, added test case
82f58e12 updated release.txt for solid solution numerical method
545b74b3 Tony's changes 20190117, updated RELEASE.TXT
faa792ee added new features, inverse and copy
dd597b11 Fixed bug where 1W was interpreted as an isotope
5d08736a added option -ddl to surface. Added test case
7e0ef930  Added documentation for new methods in Release.txt
9044ed29 updating revisions to phreeqcrm
49025090 Tony's changes; diffuse layer with pitzer

git-subtree-dir: phreeqc3-doc
git-subtree-split: 1f963b6dc569c7c9b141da43a3d2b603920044af
2021-10-30 22:54:21 +00: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
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
2d53d8b2df Tony's changes and bug fixes 2018-02-17 20:09:31 -07: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
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
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
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
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
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
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
e2b406049a 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
David L Parkhurst
2c2a8ca68b 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
771ce56e6a Merged changes through SVN 10892 from trunk.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10895 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 18:26:48 +00:00
David L Parkhurst
ad01777c4f Added setdiff_c method.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10891 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 16:38:33 +00:00
David L Parkhurst
79b46f6fa3 New release notes.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10760 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-28 23:58:25 +00:00
David L Parkhurst
dfa23197b4 Updates.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10421 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-10-22 16:03:08 +00:00
David L Parkhurst
98f72737c1 Updated RELEASE.TXT with recent revisions.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10395 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-10-16 19:12:31 +00:00