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
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
51105d4518
Merge commit '5286d9779b0b7a7e46f43070248b68bb586fb6cc'
2024-11-21 00:30:07 +00: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
94d8708795
Merge commit '11997540b7baf54728361eab8f52495f61d84acb'
2024-11-21 00:30:05 +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
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
81f3c709a1
Merge commit 'b0adf3f16b2ec47984b51a737f38ce0bc5287672'
2024-11-18 21:27:30 +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
1f98a67f94
Merge commit '90cf51d443206ded5301a993908f2547259bbb70'
2024-11-14 19:23:41 +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
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
Darth Vader
0d529e8de7
Merge commit '777e6ee471ada761562a1fecaeaaa0d0f52d9e75'
2024-11-14 01:37:20 +00:00
Darth Vader
cb834cf03d
Squashed 'database/' changes from 1db6b42f..6ff8cfe3
...
6ff8cfe3 Added documentation for GAS_BINARY_PARAMETERS
a3cbc5d8 Made GAS_BINARY_PARAMETERS backward compatible
e5780c95 GAS_BINARY_PARAMETERS implemented. gas_binary_parameters test case
c1dd17c7 Tweaked H+ viscosity in databases, new test cases fig1 and H_HCl_HBr
git-subtree-dir: database
git-subtree-split: 6ff8cfe34150e60683b6ceb5c252ae07c211f976
2024-11-14 01:37:18 +00:00
Darth Vader
0a922542ef
Merge commit 'cb834cf03d9e5efdd62bc54e6eebf390b7b58a15'
2024-11-14 01:37:18 +00:00
Darth Vader
6a5562003f
Squashed 'phreeqc3-doc/' changes from 98fcfd3d..1cc308a1
...
1cc308a1 Added documentation for GAS_BINARY_PARAMETERS
1f0c405f Updated Release.txt with PhreeqcRM bug fix
09bf7c8c fixed ex22 for graphing. Updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: 1cc308a15bb182db55c2fa68b1455164cd27ac07
2024-11-14 01:37:09 +00:00
Darth Vader
004871b763
Merge commit '6a5562003f9141e564d4f38622b7640aa91b9130'
2024-11-14 01:37:09 +00:00
Darth Vader
8158e50421
Squashed 'phreeqc3-doc/' changes from c703f2f3..98fcfd3d
...
98fcfd3d [iphreeqc] Updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: 98fcfd3d56bd3774b057c02ef647c64f2b07e143
2024-10-25 18:14:35 +00:00
Darth Vader
20d2e26459
Merge commit '8158e50421c0838502da9e7a2c00da67d3d5517a'
2024-10-25 18:14:35 +00:00
Charlton, Scott R.
ded7f6f218
[iphreeqc] Updated RELEASE.TXT
2024-10-25 12:11:34 -06:00
Charlton, Scott R.
2b0f329c45
Updated unit tests for 3.8.3
2024-10-24 17:16:35 -06:00
Darth Vader
a0734a1d0c
Merge commit 'e5c4d819de6ffc5246306e4ed4301c69d9754efa'
2024-10-22 23:30:51 +00:00
Darth Vader
e5c4d819de
Squashed 'src/' changes from 74f96d02..2d390157
...
2d390157 Merge commit '5e9815843e3a0854497d8191449a21ed24ebac47'
5e981584 Squashed 'phreeqcpp/' changes from 455b49c..ccb9ba3
git-subtree-dir: src
git-subtree-split: 2d39015754412cba20b9023c8004500b99f7f748
2024-10-22 23:30:50 +00:00
Darth Vader
734c4b2cb8
Merge commit 'aa9d98adea8397aa2f047ceb93ccc18aa9e726a6'
2024-10-22 01:05:32 +00:00
Darth Vader
aa9d98adea
Squashed 'src/' changes from 1f19e989..74f96d02
...
74f96d02 Merge commit '301276613dd66ac3d604656ae135d9087e98ad69'
30127661 Squashed 'phreeqcpp/' changes from 8c0d001..455b49c
git-subtree-dir: src
git-subtree-split: 74f96d02a5434ba7c95660cd2fa8a2dac4c7a132
2024-10-22 01:05:31 +00:00
Darth Vader
5e09748847
Squashed 'phreeqc3-examples/' changes from c3e23100..4a6ad41a
...
4a6ad41a [phreeqc3] Updated outputs for 3.8.3
91b76cb4 Tony's changes for viscosity and heat in transport. ex13_impl failed in Release.
git-subtree-dir: phreeqc3-examples
git-subtree-split: 4a6ad41ab22a95803c115b7464ae27664f1ba9db
2024-10-22 01:03:15 +00:00
Darth Vader
1f4d25addd
Merge commit '5e097488473b575dc5098dbdd1fd5056f916fe06'
2024-10-22 01:03:15 +00:00
Darth Vader
12a6db0e2b
Squashed 'phreeqc3-doc/' changes from a8fd3b6a..c703f2f3
...
c703f2f3 [phreeqc3] Updated outputs for 3.8.3
46e71825 Tony's tweak to transport, updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: c703f2f3e055b9157a06a59f09926a5caba04764
2024-10-22 01:03:07 +00:00
Darth Vader
1425348495
Merge commit '12a6db0e2b11fc67c83c1ab4ae510f363754b527'
2024-10-22 01:03:07 +00:00
Darth Vader
59bd52a814
Merge commit '576b481d529b6a029304b8f6975042e138c6b4e3'
2024-10-12 01:16:51 +00:00
Darth Vader
576b481d52
Squashed 'phreeqc3-examples/' changes from aea752ac..c3e23100
...
c3e23100 Removed extraneous files (#81 )
git-subtree-dir: phreeqc3-examples
git-subtree-split: c3e2310011853bf7beee568fb1a14cb10d74f5fd
2024-10-12 01:16:50 +00:00
Darth Vader
2125cb3f92
Merge commit 'dfdd36142fe914b3e6b89a5c55abc2eb4df8e19e'
2024-10-11 19:14:04 +00:00
Darth Vader
dfdd36142f
Squashed 'src/' changes from 4f8c3967..1f19e989
...
1f19e989 Merge commit '9172a45eb2d9bc13d777272d8320ebda14e78937'
9172a45e Squashed 'phreeqcpp/' changes from ead498a..8c0d001
git-subtree-dir: src
git-subtree-split: 1f19e9893bfa82ff07a8df676ce70bb9e05702b4
2024-10-11 19:14:03 +00:00
Darth Vader
04e805fe8f
Squashed 'database/' changes from 9e8d773e..1db6b42f
...
1db6b42f Changed Lamda to Lambda, but retained backward compatibility
git-subtree-dir: database
git-subtree-split: 1db6b42f19ffebb2d6ecc3c557e68c92dc13ad82
2024-10-11 19:12:07 +00:00
