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
9871f67154
Merge commit '8e12e1d9376b8f97abcb8301cd5f9995c1fbf22e'
2025-02-18 22:46:33 +00: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
81e380194a
Merge commit '4a6ec6151e2f155dd16dc438023b743fbc77e6ae'
2025-02-18 20:26:38 +00: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
6c58153c18
Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76'
2025-02-18 20:26:35 +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
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
Charlton, Scott R.
b0491191e7
Updated cran artifacts
2025-01-10 12:23:44 -07:00
Darth Vader
47ce8e0adb
Merge commit '1680cde7ab23a71e3b514013815ccf08498a0dc8'
2025-01-07 22:28:23 +00: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
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
7e74e00df1
Merge commit 'fc1d6ef789171ce6feef8a7ad5fe0ce298a2a4d9'
2024-12-06 00:27:54 +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
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
