Charlton, Scott R.
9c5d9b3e6b
Cleanup ( #72 )
2025-06-25 14:29:02 -06:00
Charlton, Scott R.
841ae669d6
Cleanup
2025-06-25 13:12:03 -06:00
Charlton, Scott R
5f0ff470f6
Refactor GitHub Actions workflows for subtree management and add subtrees.json configuration
2025-06-25 13:04:41 -06:00
Charlton, Scott R.
d53f91d57b
Refactor GitHub Actions workflows for subtree management and add subtrees.json configuration
2025-06-25 13:04:41 -06:00
Charlton, Scott R.
d74ca5abbe
Changed to ssh protocol
2025-06-20 18:19:03 -06:00
Charlton, Scott R.
cc60dbb615
Master subtree ( #71 )
...
Still working on subtree merging
2025-06-10 12:19:04 -06:00
Charlton, Scott R.
a85c274903
Merge pull request #70 from usgs-coupled/master-subtree
...
Merged to test manual run
2025-05-31 17:01:58 -06:00
Charlton, Scott R.
4ccb129917
Only run manually
2025-05-31 16:55:39 -06:00
Charlton, Scott R.
ced9d90841
Working on subtree merge
2025-05-31 16:52:37 -06:00
Marco De Lucia
4ea034e4e3
added SolVol, pH and pe to (essentials)
2025-04-03 14:57:07 +02: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
5824a7cd5c
Merge commit 'febfa05e38044719e80b19c6a74a6070fce3c1e7'
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
b15a6bded7
Merge commit '7ec217d47bfff56057000e1ac954d46b31417083'
2025-03-14 18:22:27 +00:00
Darth Vader
7ec217d47b
Squashed 'phreeqcpp/' changes from a4886d6..b24dedb
...
b24dedb Added missing newlines(\n) to distribution of species section
35afe0d Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.
git-subtree-dir: phreeqcpp
git-subtree-split: b24dedb82589e656af7af947f3c475b49ba36fc4
2025-03-14 18:22:27 +00:00
Charlton, Scott R
1dbd65fc74
Updated output for recent database changes
2025-03-14 10:02:13 -06:00
David Parkhurst
dd98e15167
Tony's changes Mar 12 plus my corrections.
2025-03-12 02:58:54 -06:00
David Parkhurst
394240f20a
Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.
2025-03-11 17:12:09 -06:00
David Parkhurst
c61c35ecee
Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.
2025-03-11 17:12:09 -06: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
71e7c5a034
Updated for 3.8.7
2025-02-25 14:47:08 -07: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
Charlton, Scott R
0a3757d4f3
Added stimela.dat to installer
2025-02-18 15:41:21 -07: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
142a864147
Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76'
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
Darth Vader
0eb2b93436
Merge commit '7c05598ee390fee52f2860d8766542a615f08d9d'
2025-02-18 20:25:42 +00:00
Darth Vader
7c05598ee3
Squashed 'phreeqcpp/' changes from c81916a..a4886d6
...
a4886d6 Added simela.dat-from Peter de Moel. Fixed bug in write_raw/read_raw GasComp, order of options
git-subtree-dir: phreeqcpp
git-subtree-split: a4886d603340240f6632bf46ddf256881eac58f9
2025-02-18 20:25:42 +00:00
David Parkhurst
ec0212ded2
removed tabs before eol in stimela.dat. Updated RELEASE.TXT.
2025-02-12 22:31:30 -07:00
David Parkhurst
e7f79ef241
removed tabs before eol in stimela.dat. Updated RELEASE.TXT.
2025-02-12 22:31:30 -07:00
David Parkhurst
3cf80a8adf
Added simela.dat-from Peter de Moel. Fixed bug in write_raw/read_raw GasComp, order of options
2025-02-12 21:48:14 -07: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
Charlton, Scott R
31517c71c7
Updated output for 3.8.6 release
2025-01-07 15:23:23 -07: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
