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
Darth Vader
0574a86c4e
Squashed 'phreeqc3-examples/' changes from 09d4a0ba..8f9acfc7
...
8f9acfc7 Updated cmake_minimum_required and fixed surf_error test
git-subtree-dir: phreeqc3-examples
git-subtree-split: 8f9acfc77c9261e87c156056b8acafc21946298f
2024-12-06 16:50:10 +00:00
Darth Vader
b389eb39b4
Merge commit '0574a86c4ee8888db3264728889b391638cd3c29'
2024-12-06 16:50:10 +00:00
Darth Vader
d3b4c500de
Squashed 'src/' changes from 51eedbc2..b4a1f672
...
b4a1f672 Merge commit '3c8e294fd35563abbf53316d100d9f900e2b5b5a'
3c8e294f Squashed 'phreeqcpp/' changes from c369020..b948e30
git-subtree-dir: src
git-subtree-split: b4a1f672db7d7203a306a7c499cf8c67142da2bc
2024-12-06 16:50:05 +00:00
Darth Vader
f6affb8f0e
Merge commit 'd3b4c500de84f4dd207eb30b3a612fac16db167d'
2024-12-06 16:50:05 +00:00
Darth Vader
47a34ca634
Squashed 'database/' changes from 1a221cd7..bf60c1ca
...
bf60c1ca Fix typos
git-subtree-dir: database
git-subtree-split: bf60c1ca9d528f429086991e96e445f6b3976981
2024-12-06 00:27:57 +00:00
Darth Vader
c5e17364a0
Merge commit '47a34ca634047faf645ba7302fee4f6de934dcfd'
2024-12-06 00:27:57 +00:00
Darth Vader
fc1d6ef789
Squashed 'examples/com/' changes from af8d7af7..a0ea2708
...
a0ea2708 Fix typos
git-subtree-dir: examples/com
git-subtree-split: a0ea2708e5bace20877bdafb23bbe9f14b84c82d
2024-12-06 00:27:54 +00:00
Darth Vader
7e74e00df1
Merge commit 'fc1d6ef789171ce6feef8a7ad5fe0ce298a2a4d9'
2024-12-06 00:27:54 +00:00
Darth Vader
3e3c063083
Squashed 'src/' changes from 7bae85a3..51eedbc2
...
51eedbc2 Fix typos
git-subtree-dir: src
git-subtree-split: 51eedbc27a828ff36a1ca732abea394e7f7f32bd
2024-12-06 00:27:53 +00:00
Darth Vader
50b5cfaf1f
Merge commit '3e3c06308338cfdb1eda420553ff9b6058a95643'
2024-12-06 00:27:53 +00:00
Charlton, Scott R.
7d11ec3bc5
Merge pull request #66 from mwtoews/codespell
...
Fix typos
2024-12-05 16:34:32 -07:00
Charlton, Scott R.
7e412da938
Updated Author metadata
2024-12-03 17:10:50 -07:00
Charlton, Scott R.
4783d83671
Changed http to https
2024-12-03 16:13:01 -07:00
Charlton, Scott R.
b392fb02f6
Updated phreeqc urls for R
2024-12-03 15:28:50 -07:00
Mike Taves
31af15ae73
Fix typos
2024-12-02 15:28:05 +13:00
Charlton, Scott R.
980068c1dc
Added Authors@R field
2024-11-22 15:45:14 -07:00
Charlton, Scott R.
f2a8c8ee70
Added README.md
2024-11-22 14:46:02 -07:00
Charlton, Scott R.
f849e9f29f
Changed http -> https
2024-11-21 15:15:08 -07:00
Charlton, Scott R.
cb1ebf2d7f
Added devel for macos and windows
2024-11-21 14:33:39 -07:00
Darth Vader
5286d9779b
Squashed 'phreeqc3-examples/' changes from 8bf42359..09d4a0ba
...
09d4a0ba [phreeqc3] (NH4)2SO4 database update from Tony
git-subtree-dir: phreeqc3-examples
git-subtree-split: 09d4a0ba8e3de3165be534cfe76128a746b8e306
2024-11-21 00:30:07 +00:00
Darth Vader
51105d4518
Merge commit '5286d9779b0b7a7e46f43070248b68bb586fb6cc'
2024-11-21 00:30:07 +00:00
Darth Vader
11997540b7
Squashed 'database/' changes from 6ff8cfe3..1a221cd7
...
1a221cd7 (NH4)2SO4 database update from Tony
git-subtree-dir: database
git-subtree-split: 1a221cd778c932dbc43f6d7601a3e43985f3e935
2024-11-21 00:30:05 +00:00
Darth Vader
94d8708795
Merge commit '11997540b7baf54728361eab8f52495f61d84acb'
2024-11-21 00:30:05 +00:00
Darth Vader
efc186d887
Merge commit 'd7add6c470a3941ddca7923366c7b762e7ad095e'
2024-11-19 21:21:33 +00:00
Darth Vader
d7add6c470
Squashed 'phreeqc3-examples/' changes from 14217984..8bf42359
...
8bf42359 [phreeqc3] Updated outputs for 3.8.5
git-subtree-dir: phreeqc3-examples
git-subtree-split: 8bf423592e4a25662a9204d8da692f90dd6a4f45
2024-11-19 21:21:32 +00:00
Darth Vader
cb34d045ce
Merge commit 'f8e7a9b6e3ec6398ed657c0c8355a3c66906115f'
2024-11-19 20:21:50 +00:00
Darth Vader
f8e7a9b6e3
Squashed 'phreeqc3-examples/' changes from 48e4f323..14217984
...
14217984 Re-encoded ex22 to utf-8
git-subtree-dir: phreeqc3-examples
git-subtree-split: 1421798482260cc1490c159749ca5554b3f4e391
2024-11-19 20:21:50 +00:00
Charlton, Scott R.
d6b0081a8b
Merge pull request #62 from scharlton2/61-cran-build-failing-due-to-non-ascii-examples
...
Re-encoded ex22 to utf-8
2024-11-19 13:17:19 -07:00
Charlton, Scott R.
4507e96f79
Re-encoded ex22 to utf-8
2024-11-19 12:56:43 -07:00
Darth Vader
048b92e3dd
Merge commit '3e1c0d11a21bedfeb288ed4a8737d0a9287e2e7f'
2024-11-19 01:18:44 +00:00
Darth Vader
3e1c0d11a2
Squashed 'src/' changes from ce34aa5e..7bae85a3
...
7bae85a3 Merge commit '80bf22d292021bc23620baa144f0a685fa73a82f'
80bf22d2 Squashed 'phreeqcpp/' changes from b576c75..c369020
3fd5b896 59 compiler error on macos (#60 )
git-subtree-dir: src
git-subtree-split: 7bae85a32f92ccc7ebb8e658fd4f4d16b20217c0
2024-11-19 01:18:43 +00:00
Charlton, Scott R.
2c3c7334b7
59 compiler error on macos ( #60 )
...
* Closes usgs-coupled/iphreeqc#59
2024-11-18 18:10:42 -07:00
Darth Vader
21df9497a0
Squashed 'src/' changes from 57b3a6cd..ce34aa5e
...
ce34aa5e Merge commit '8184121c90728d5026fa0485302e4584a559ffd8'
8184121c Squashed 'phreeqcpp/' changes from f5587da..b576c75
git-subtree-dir: src
git-subtree-split: ce34aa5e05ddf53f5b3b7ae2240437d31a736f4a
2024-11-18 21:29:52 +00:00
Darth Vader
02d8641328
Merge commit '21df9497a0c5083f8e6add67e29601662ff47598'
2024-11-18 21:29:52 +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
81f3c709a1
Merge commit 'b0adf3f16b2ec47984b51a737f38ce0bc5287672'
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
1f98a67f94
Merge commit '90cf51d443206ded5301a993908f2547259bbb70'
2024-11-14 19:23:41 +00:00
Darth Vader
5f272b1fe3
Squashed 'src/' changes from 2d390157..57b3a6cd
...
57b3a6cd Merge commit 'b34eedb91d08cd3b5fd34a70311fad8c14c7854d'
b34eedb9 Squashed 'phreeqcpp/' changes from ccb9ba3..f5587da
git-subtree-dir: src
git-subtree-split: 57b3a6cd39393db8b91ec6b40325addb453d10e2
2024-11-14 01:39:23 +00:00
Darth Vader
e5c236a366
Merge commit '5f272b1fe3cfa93d5e5512461e41d049fc3a00be'
2024-11-14 01:39:23 +00:00
Darth Vader
777e6ee471
Squashed 'phreeqc3-examples/' changes from 4a6ad41a..48e4f323
...
48e4f323 [phreeqc3] Updated outputs for 3.8.4
ae35abae fixed ex22 for graphing. Updated RELEASE.TXT
6dbd4864 Tony's changes to example 22
git-subtree-dir: phreeqc3-examples
git-subtree-split: 48e4f3231506cb50a96f0064e3ce6fb2e52565ea
2024-11-14 01:37:20 +00:00
