Mike Taves
26ffbfee94
Fix typos
2024-12-02 15:28:05 +13:00
Mike Taves
a0ea2708e5
Fix typos
2024-12-02 15:28:05 +13:00
Mike Taves
8a45f9f23a
Fix typos
2024-12-02 15:28:05 +13: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
Charlton, Scott R
09d4a0ba8e
[phreeqc3] (NH4)2SO4 database update from Tony
2024-11-20 17:25:39 -07:00
David Parkhurst
1a221cd778
(NH4)2SO4 database update from Tony
2024-11-20 14:49:09 -07: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
Charlton, Scott R
8bf423592e
[phreeqc3] Updated outputs for 3.8.5
2024-11-19 14:16:37 -07: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
1421798482
Re-encoded ex22 to utf-8
2024-11-19 12:56:43 -07:00
Charlton, Scott R.
4507e96f79
Re-encoded ex22 to utf-8
2024-11-19 12:56:43 -07:00
Darth Vader
0014b5b0a5
Merge commit '3e1c0d11a21bedfeb288ed4a8737d0a9287e2e7f'
2024-11-19 01:18:44 +00: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
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.
2c3c7334b7
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
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
72075d5afb
Merge commit '21df9497a0c5083f8e6add67e29601662ff47598'
2024-11-18 21:29:52 +00:00
Darth Vader
02d8641328
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
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
David Parkhurst
fd438d3e1f
slight changes to Release.txt
2024-11-16 14:41:37 -07:00
David Parkhurst
ef355d8376
tweak to Release.txt
2024-11-16 12:31:29 -07:00
David Parkhurst
a75db3f65f
Merge branch 'master' into mix_error
2024-11-16 12:04:54 -07:00
David Parkhurst
44aaa0e612
updated Release.txt for diffuse layer error.
2024-11-16 12:00:50 -07: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
Charlton, Scott R
70e57ae2d7
Added PHREEQCI fix
2024-11-14 09:49:46 -07: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
90b9269e70
Merge commit '5f272b1fe3cfa93d5e5512461e41d049fc3a00be'
2024-11-14 01:39:23 +00:00
Darth Vader
e5c236a366
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
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
