4161 Commits

Author SHA1 Message Date
github-actions[bot]
bc05d0a090 Merge commit '846d30ae5211cbabde521d866a67454cd0fe48b0' 2025-08-14 00:09:12 +00:00
github-actions[bot]
846d30ae52 Squashed 'src/' changes from fc5d3678..767640fe
767640fe Merge commit 'ee5a445a02e63b9973f1ebe9325556973033bb31'
ee5a445a Squashed 'phreeqcpp/' changes from b8182e5..0f2dfae

git-subtree-dir: src
git-subtree-split: 767640fe35eca288be7f6597e5e88cbbad9f600f
2025-08-14 00:09:12 +00:00
github-actions[bot]
204b0e3455 Merge commit '8f505c6f0035e9a9f2cbb5e575247a521025ab13' 2025-08-06 22:49:50 +00:00
github-actions[bot]
8f505c6f00 Squashed 'src/' changes from b33a48e2..fc5d3678
fc5d3678 Merge commit 'cf140ebf070063962cfffd64b0b9cdb36f70995f'
cf140ebf Squashed 'phreeqcpp/' changes from 6991516..b8182e5
d69db23e Merge commit 'dd44fc2b0f3a6e6820b5f703741faa0a25b89530'
dd44fc2b Squashed 'phreeqcpp/' changes from b24dedb..6991516

git-subtree-dir: src
git-subtree-split: fc5d3678d9a257fb50c31b9507414db048cd7559
2025-08-06 22:49:50 +00:00
github-actions[bot]
59677a76c2 Merge commit '275553971d84e878866e8e326a6c3766a7e96aaa' 2025-08-06 22:48:19 +00:00
github-actions[bot]
275553971d Squashed 'phreeqc3-examples/' changes from 1dbd65fc..6baa6075
6baa6075 Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: phreeqc3-examples
git-subtree-split: 6baa60752980bb9647c76f946256341b16fb9ca8
2025-08-06 22:48:19 +00:00
github-actions[bot]
854f17c298 Merge commit '0a5c6fc279b5f7ba17de9303bf5bbf21c7c56f79' 2025-08-06 22:48:18 +00:00
github-actions[bot]
0a5c6fc279 Squashed 'phreeqc3-doc/' changes from 394240f2..05a4c62f
05a4c62f Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: phreeqc3-doc
git-subtree-split: 05a4c62f48558d3d9c4b3dccf6ea4f2bb1f3b8e2
2025-08-06 22:48:18 +00:00
github-actions[bot]
af8fe101e2 Merge commit '7ad9ab5dc63ff6a4fa4400c19ac9ef8cdefed9c6' 2025-08-06 22:48:17 +00:00
github-actions[bot]
7ad9ab5dc6 Squashed 'database/' changes from dd98e151..5df53219
5df53219 Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: database
git-subtree-split: 5df53219e1f6143cee10c67da88317f0dcd00c2b
2025-08-06 22:48:17 +00:00
github-actions[bot]
5e10caae9d Merge commit 'eead2b365915e5b65f4840e5f3fac5a0c4de749b' 2025-08-06 22:48:16 +00:00
github-actions[bot]
eead2b3659 Squashed 'examples/fortran/' changes from 209412f4..5b829f90
5b829f90 Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: examples/fortran
git-subtree-split: 5b829f90667aefbe9eaaf9b1c97d7be7ddb87fa6
2025-08-06 22:48:16 +00:00
github-actions[bot]
75b4b5a33f Merge commit 'dc7a88c8c0b3206fe183e81736b77cbcfa7c8ec4' 2025-08-06 22:48:15 +00:00
github-actions[bot]
dc7a88c8c0 Squashed 'examples/com/' changes from a0ea2708..98de25e0
98de25e0 Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: examples/com
git-subtree-split: 98de25e096d6eb025f06a702576a562317aa6a6d
2025-08-06 22:48:15 +00:00
github-actions[bot]
dd9748d1b3 Merge commit '12119014f706723cce192eee04b88f39c96686e7' 2025-08-06 22:48:14 +00:00
github-actions[bot]
12119014f7 Squashed 'examples/c/' changes from 1680e5b7..371cbbd8
371cbbd8 Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: examples/c
git-subtree-split: 371cbbd81ba4173cbe3c13d267fda1573be27425
2025-08-06 22:48:14 +00:00
github-actions[bot]
e2bd17174b Squashed 'src/' changes from b15a6bde..b33a48e2
b33a48e2 Add workflows and configuration for syncing and linting subtrees

git-subtree-dir: src
git-subtree-split: b33a48e2bab452868b846a242ce3ac8ba7e4748f
2025-08-06 22:48:13 +00:00
github-actions[bot]
6e1567d3f9 Merge commit 'e2bd17174b917c46184eaf107ea7add8f4b328e6' 2025-08-06 22:48:13 +00:00
Charlton, Scott R.
4a0e162b91 Add workflows and configuration for syncing and linting subtrees
- Created .github/subtrees.json to define subtree repositories.
- Added linting workflow for subtrees.json in .github/workflows/lint-subtrees.yml.
- Implemented sync workflow for subtrees in .github/workflows/subtree.yml.
- Created subtrees.json and superprojects.json files in database, examples/c, examples/com, and examples/fortran directories.
- Added linting workflows for subtrees.json and superprojects.json in respective directories.
- Established sync workflows for subtrees in examples/c, examples/com, examples/fortran, and src directories.
- Configured subtrees.json and superprojects.json for src and src/phreeqcpp directories.
- Implemented linting workflows for subtrees.json and superprojects.json in src and src/phreeqcpp directories.
- Added common superprojects.json in src/phreeqcpp/common directory.
2025-08-06 16:46:25 -06:00
Darth Vader
402dc2ec9b Squashed 'phreeqc3-examples/' changes from 31517c71..1dbd65fc
1dbd65fc Updated output for recent database changes

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1dbd65fc74fc452b40d37030c51cff2f9bccf894
2025-03-14 18:23:20 +00:00
Darth Vader
6136c88a50 Merge commit '402dc2ec9b50394af226ce431a39925c1030fd2e' 2025-03-14 18:23:20 +00:00
Darth Vader
a3aa597dd5 Squashed 'database/' changes from ec0212de..dd98e151
dd98e151 Tony's changes Mar 12 plus my corrections.
c61c35ec Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.

git-subtree-dir: database
git-subtree-split: dd98e151672348f240062be7fe72242e86226696
2025-03-14 18:23:18 +00:00
Darth Vader
aefd03ac34 Merge commit 'a3aa597dd53a2001e4879dbbc09e9f3658a3c1c8' 2025-03-14 18:23:18 +00:00
Darth Vader
febfa05e38 Squashed 'src/' changes from 0eb2b934..b15a6bde
b15a6bde Merge commit '7ec217d47bfff56057000e1ac954d46b31417083'
7ec217d4 Squashed 'phreeqcpp/' changes from a4886d6..b24dedb

git-subtree-dir: src
git-subtree-split: b15a6bded75060c7f1b9456de3892e307f5c6674
2025-03-14 18:23:15 +00:00
Darth Vader
6c9b8aaf07 Merge commit 'febfa05e38044719e80b19c6a74a6070fce3c1e7' 2025-03-14 18:23:15 +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
03653d3b4a Merge commit 'dcf01e46e9e2cf6bc39c943042343aa3a066659c' 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
7578086671 Merge commit '95c70688aa2ff904a635b4de93970bf24acaa0e0' 2025-02-25 21:56:41 +00:00
Charlton, Scott R
0547e23cdc Added code to generate stimela.ascii 2025-02-19 14:38:40 -07:00
Charlton, Scott R
83580b365e Set c++14
Updated googletest to 1.16.0
Added stimela.dat to tests and build-databases.R
2025-02-19 14:06:14 -07:00
Darth Vader
8e12e1d937 Squashed 'phreeqc3-doc/' changes from e7f79ef2..0a3757d4
0a3757d4 Added stimela.dat to installer

git-subtree-dir: phreeqc3-doc
git-subtree-split: 0a3757d4f3b62594cd20221591b262c39e0f01f6
2025-02-18 22:46:33 +00:00
Darth Vader
9871f67154 Merge commit '8e12e1d9376b8f97abcb8301cd5f9995c1fbf22e' 2025-02-18 22:46:33 +00:00
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
81e380194a Merge commit '4a6ec6151e2f155dd16dc438023b743fbc77e6ae' 2025-02-18 20:26:38 +00:00
Darth Vader
ff1bded841 Squashed 'src/' changes from 47bcb44d..0eb2b934
0eb2b934 Merge commit '7c05598ee390fee52f2860d8766542a615f08d9d'
7c05598e Squashed 'phreeqcpp/' changes from c81916a..a4886d6

git-subtree-dir: src
git-subtree-split: 0eb2b934364f19a7a20439de35f9a9b1d4753c1c
2025-02-18 20:26:35 +00:00
Darth Vader
6c58153c18 Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76' 2025-02-18 20:26:35 +00:00
Darth Vader
34fef06d5c Merge commit '3a0f756ff7940772b9fdf5879b7fd0c8e744cbc5' 2025-02-18 20:26:32 +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
Charlton, Scott R.
b0491191e7
Updated cran artifacts 2025-01-10 12:23:44 -07:00
Darth Vader
1680cde7ab Squashed 'phreeqc3-examples/' changes from 1777f2bc..31517c71
31517c71 Updated output for 3.8.6 release

git-subtree-dir: phreeqc3-examples
git-subtree-split: 31517c71c70af07af992b2dceb8ebc1b8ff74e3d
2025-01-07 22:28:23 +00:00
Darth Vader
47ce8e0adb Merge commit '1680cde7ab23a71e3b514013815ccf08498a0dc8' 2025-01-07 22:28:23 +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
a4109721f5 Merge commit 'bc33cd74844e5f14f8771f6cc85e6e89165ad2e9' 2025-01-07 21:05:42 +00:00
Darth Vader
3d759f6997 Squashed 'phreeqc3-examples/' changes from 8f9acfc7..1777f2bc
1777f2bc Merge branch 'mix_error' of github.com:dlparkhurst/phreeqc3-1 into mix_error
da8a610a Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1777f2bc99bd9b655e838908e0fdfb81bfdd1e3f
2025-01-07 20:00:06 +00:00
Darth Vader
a7e6f6d4c8 Merge commit '3d759f69973bad20c855f53a0a75a3db3b35516a' 2025-01-07 20:00:06 +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
8cb6444f3b Merge commit '48d952740c344516d2d238bc7f1ae41807a0b7d2' 2025-01-07 20:00:03 +00:00
Darth Vader
13bd43d71f Merge commit '35f13a0f66449dd0d7f01732a52d2c2078728e2a' 2025-01-07 19:59:58 +00:00
Darth Vader
35f13a0f66 Squashed 'src/' changes from b4a1f672..47bcb44d
47bcb44d Merge commit '7afa4755116f041a37c52ecdeb716a64033fdd1f'
7afa4755 Squashed 'phreeqcpp/' changes from b948e30..c81916a

git-subtree-dir: src
git-subtree-split: 47bcb44d5ee21759c606efe72f0a50d8d7c3b638
2025-01-07 19:59:57 +00:00