2274 Commits

Author SHA1 Message Date
Charlton, Scott R.
9afaa30df1 Add comment to clarify the use of sync-subtrees-action in lint-subtrees.yml 2025-06-26 19:10:03 -06:00
Charlton, Scott R.
64825ec73c Add comment to clarify manual trigger for linting workflow in lint-subtrees.yml 2025-06-26 12:40:11 -06:00
Charlton, Scott R.
470638d989 Add clarification comment for linting workflow in lint-subtrees.yml 2025-06-26 12:23:54 -06:00
Charlton, Scott R.
e6661a8fba Add comment to clarify purpose of linting workflow for subtrees.json 2025-06-26 12:18:10 -06:00
github-actions[bot]
9545998b70 Merge commit 'dc93b6ea031d5bfb9b1a211261364f25d9bfb426' 2025-06-26 00:11:32 +00: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
Darth Vader
5824a7cd5c Merge commit 'febfa05e38044719e80b19c6a74a6070fce3c1e7' 2025-03-14 18:23:15 +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
Darth Vader
142a864147 Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76' 2025-02-18 20:26:35 +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
Darth Vader
444ba08cda Merge commit '35f13a0f66449dd0d7f01732a52d2c2078728e2a' 2025-01-07 19:59:58 +00:00
Darth Vader
47bcb44d5e Merge commit '7afa4755116f041a37c52ecdeb716a64033fdd1f' 2025-01-07 19:59:19 +00:00
Darth Vader
7afa475511 Squashed 'phreeqcpp/' changes from b948e30..c81916a
c81916a Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.

git-subtree-dir: phreeqcpp
git-subtree-split: c81916ad120db26b431bae629b25e64447b72c75
2025-01-07 19:59:19 +00:00
Darth Vader
584bb5a66f Merge commit 'd3b4c500de84f4dd207eb30b3a612fac16db167d' 2024-12-06 16:50:05 +00:00
Darth Vader
b4a1f672db Merge commit '3c8e294fd35563abbf53316d100d9f900e2b5b5a' 2024-12-06 16:49:25 +00:00
Darth Vader
3c8e294fd3 Squashed 'phreeqcpp/' changes from c369020..b948e30
b948e30 Exception caught in PhreeqcI. Null pointer for bad definition in SURFACE_MASTER_SPECIES. Test case surf_error added, which catches the error, but run exits.

git-subtree-dir: phreeqcpp
git-subtree-split: b948e30d1ef801f52c99736b58e79dcff5537e23
2024-12-06 16:49:25 +00:00
Darth Vader
bc21c20a34 Merge commit '3e3c06308338cfdb1eda420553ff9b6058a95643' 2024-12-06 00:27:53 +00:00
Mike Taves
51eedbc27a Fix typos 2024-12-02 15:28:05 +13:00
Mike Taves
8a45f9f23a Fix typos 2024-12-02 15:28:05 +13:00
Darth Vader
0014b5b0a5 Merge commit '3e1c0d11a21bedfeb288ed4a8737d0a9287e2e7f' 2024-11-19 01:18:44 +00:00
Darth Vader
80bf22d292 Squashed 'phreeqcpp/' changes from b576c75..c369020
c369020 59 compiler error on macos (#60)

git-subtree-dir: phreeqcpp
git-subtree-split: c369020dbdaee3179efad614d3e841ed4b470ccf
2024-11-19 01:17:49 +00:00
Darth Vader
7bae85a32f Merge commit '80bf22d292021bc23620baa144f0a685fa73a82f' 2024-11-19 01:17:49 +00:00
Charlton, Scott R.
8b2126270c 59 compiler error on macos (#60)
* Closes usgs-coupled/iphreeqc#59
2024-11-18 18:10:42 -07:00
Charlton, Scott R
3fd5b896c9 59 compiler error on macos (#60)
* Closes usgs-coupled/iphreeqc#59
2024-11-18 18:10:42 -07:00
Darth Vader
72075d5afb Merge commit '21df9497a0c5083f8e6add67e29601662ff47598' 2024-11-18 21:29:52 +00:00
Darth Vader
8184121c90 Squashed 'phreeqcpp/' changes from f5587da..b576c75
b576c75 two fixes for charge balance error when using PhreeqcRM.

git-subtree-dir: phreeqcpp
git-subtree-split: b576c752b474cafb9036e6c7b387cfc61d8f6c8d
2024-11-18 21:28:16 +00:00
Darth Vader
ce34aa5e05 Merge commit '8184121c90728d5026fa0485302e4584a559ffd8' 2024-11-18 21:28:16 +00:00
Darth Vader
90b9269e70 Merge commit '5f272b1fe3cfa93d5e5512461e41d049fc3a00be' 2024-11-14 01:39:23 +00:00
Darth Vader
b34eedb91d Squashed 'phreeqcpp/' changes from ccb9ba3..f5587da
f5587da Made GAS_BINARY_PARAMETERS backward compatible
f57db33 GAS_BINARY_PARAMETERS implemented. gas_binary_parameters test case
f4f1f69 Tweaked H+ viscosity in databases, new test cases fig1 and H_HCl_HBr

git-subtree-dir: phreeqcpp
git-subtree-split: f5587dae0a068b1346a04108be71e266860e4706
2024-11-14 01:37:56 +00:00
Darth Vader
57b3a6cd39 Merge commit 'b34eedb91d08cd3b5fd34a70311fad8c14c7854d' 2024-11-14 01:37:56 +00:00
Darth Vader
092e3664df Merge commit 'e5c4d819de6ffc5246306e4ed4301c69d9754efa' 2024-10-22 23:30:51 +00:00
Darth Vader
5e9815843e Squashed 'phreeqcpp/' changes from 455b49c..ccb9ba3
ccb9ba3 Fixed uninitialized memory errors

git-subtree-dir: phreeqcpp
git-subtree-split: ccb9ba3c63b17166035f42586010bb43f217220b
2024-10-22 23:29:47 +00:00
Darth Vader
2d39015754 Merge commit '5e9815843e3a0854497d8191449a21ed24ebac47' 2024-10-22 23:29:47 +00:00
Darth Vader
d17459781e Merge commit 'aa9d98adea8397aa2f047ceb93ccc18aa9e726a6' 2024-10-22 01:05:32 +00:00
Darth Vader
301276613d Squashed 'phreeqcpp/' changes from 8c0d001..455b49c
455b49c Tony's tweak to transport, updated RELEASE.TXT
7233c29 fixed viscos_0 as new datum in solution class.
9f438c1 Tony's changes for viscosity and heat in transport. ex13_impl failed in Release.

git-subtree-dir: phreeqcpp
git-subtree-split: 455b49c2a7e20aef296e2cbd08348391c1e8d9e5
2024-10-22 01:04:23 +00:00
Darth Vader
74f96d02a5 Merge commit '301276613dd66ac3d604656ae135d9087e98ad69' 2024-10-22 01:04:23 +00:00
Darth Vader
7814bf7463 Merge commit 'dfdd36142fe914b3e6b89a5c55abc2eb4df8e19e' 2024-10-11 19:14:04 +00:00
Darth Vader
9172a45eb2 Squashed 'phreeqcpp/' changes from ead498a..8c0d001
8c0d001 Changed Lamda to Lambda, but retained backward compatibility

git-subtree-dir: phreeqcpp
git-subtree-split: 8c0d00166b66af612f75b87eebc47f0badc6ce37
2024-10-11 19:12:45 +00:00
Darth Vader
1f19e9893b Merge commit '9172a45eb2d9bc13d777272d8320ebda14e78937' 2024-10-11 19:12:45 +00:00
Darth Vader
418104cbdf Merge commit 'c27bfc7b64e0b47c6bde0ea233919dfa87808993' 2024-10-08 22:02:45 +00:00
Darth Vader
792cdda060 Squashed 'phreeqcpp/' changes from c876219..ead498a
ead498a Merge pull request #79 from dlparkhurst/mix_error
4409349 fixed error with MIX that Scott found on merge.

git-subtree-dir: phreeqcpp
git-subtree-split: ead498ab60e71b7175c0e4bc6468a0804851ac20
2024-10-08 22:02:03 +00:00
Darth Vader
4f8c3967aa Merge commit '792cdda06002b1ebc354b23ca1af4edcdbd24c26' 2024-10-08 22:02:03 +00:00
Darth Vader
7f683b4082 Merge commit '622bc5fb4cc8f67f9303e45c98397b97fe30822f' 2024-10-08 20:05:43 +00:00
Darth Vader
4e80a54467 Squashed 'phreeqcpp/' changes from 7c7fafd..c876219
c876219 Merge commit '64310ada821d1cc387af4507db7029fe3326784b'
64310ad Squashed 'common/' changes from 399aba2..648db22

git-subtree-dir: phreeqcpp
git-subtree-split: c876219b1b064ab7c17e0bc4ad8bff13e0aeb108
2024-10-08 20:05:00 +00:00
Darth Vader
d6a74675d7 Merge commit '4e80a54467a084df3b666c7d6fc56a4798fd3301' 2024-10-08 20:05:00 +00:00
Darth Vader
b537589773 Squashed 'phreeqcpp/' changes from e317dd0..7c7fafd
7c7fafd Merge pull request #78 from dlparkhurst/mix_error
eb0591c Merge pull request #74 from mwtoews/fix-typos
334df5e Tony's fix in heat transport
bf897a2 Marked old error in mix. Updated test case.
58566a6 Fix ah2o in adding a solution. Fixed bad_graph database.
75effd0 Merge branch 'viscosity' into mix_error
f4708df account for water mass in addition to mixing fractions
70954c6 mixing by water mass times mixing fraction
84b59ab Fix typos

git-subtree-dir: phreeqcpp
git-subtree-split: 7c7fafd686d7c41753132a978a1d55d4d25b601b
2024-10-08 20:04:33 +00:00
Darth Vader
0209fdf9c7 Merge commit 'b537589773f4819fe97ff8e5322bcd38c54b63f7' 2024-10-08 20:04:33 +00:00
Darth Vader
0bd8217516 Merge commit 'ca6b882bcab9708f90c8761e0d4a4d572c57fce7' 2024-09-24 22:03:32 +00:00