Darth Vader
a4109721f5
Merge commit 'bc33cd74844e5f14f8771f6cc85e6e89165ad2e9'
2025-01-07 21:05:42 +00:00
Charlton, Scott R
797e95aadd
Updated RELEASE.TXT for 3.8.6
2025-01-07 14:02:43 -07: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
444ba08cda
Merge commit '35f13a0f66449dd0d7f01732a52d2c2078728e2a'
2025-01-07 19:59:58 +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
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
David Parkhurst
4e89838154
Merge branch 'master' into mix_error
2025-01-04 13:16:42 -07:00
David Parkhurst
1777f2bc99
Merge branch 'mix_error' of github.com:dlparkhurst/phreeqc3-1 into mix_error
2025-01-04 13:16:36 -07:00
David Parkhurst
20d3a9e5e6
Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.
2025-01-04 13:13:06 -07:00
David Parkhurst
da8a610a66
Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.
2025-01-04 13:13:06 -07:00
Max Lübke
6e727e2f89
Merge branch 'ml/optional-redox' into 'poet'
...
feat: Optional redox states of species in solution
See merge request naaice/iphreeqc!27
2024-12-18 17:12:08 +01:00
Max Lübke
8ec2e55779
feat: Optional redox states of species in solution
2024-12-18 17:12:07 +01:00
Max Lübke
c6e14a0ce9
Merge branch 'ml/make-H0-O0-optional' into 'poet'
...
feat: add option to include H(0) and O(0) in PhreeqcMatrix constructor and related functions
See merge request naaice/iphreeqc!26
2024-12-18 17:10:49 +01:00
Max Luebke
2c8c311934
fix: remove H(0) and O(0) from SolutionWrapper getter/setter
2024-12-16 14:31:59 +01:00
Max Luebke
46e166c678
feat: add option to include H(0) and O(0) in PhreeqcMatrix constructor and related functions
2024-12-16 10:22:12 +01: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
584bb5a66f
Merge commit 'd3b4c500de84f4dd207eb30b3a612fac16db167d'
2024-12-06 16:50:05 +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
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
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
f9d9549bf3
Merge commit 'fc1d6ef789171ce6feef8a7ad5fe0ce298a2a4d9'
2024-12-06 00:27:54 +00:00
Darth Vader
7e74e00df1
Merge commit 'fc1d6ef789171ce6feef8a7ad5fe0ce298a2a4d9'
2024-12-06 00:27:54 +00:00
Darth Vader
bc21c20a34
Merge commit '3e3c06308338cfdb1eda420553ff9b6058a95643'
2024-12-06 00:27:53 +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
8f9acfc77c
Updated cmake_minimum_required and fixed surf_error test
2024-12-05 16:52:03 -07:00
Charlton, Scott R.
7d11ec3bc5
Merge pull request #66 from mwtoews/codespell
...
Fix typos
2024-12-05 16:34:32 -07:00
Max Lübke
e70be6388f
Merge branch 'ml/standalone-header' into 'poet'
...
refactor: reorganize includes and forward declarations in PhreeqcKnobs and PhreeqcMatrix
See merge request naaice/iphreeqc!25
2024-12-05 19:13:45 +01:00
Max Luebke
2cdfad0e9f
refactor: reorganize includes and forward declarations in PhreeqcKnobs and PhreeqcMatrix
2024-12-05 18:09:24 +00:00
Max Lübke
bdaea707ab
Merge branch 'ml/add_ignore_list_to_runner' into 'poet'
...
feat: add support for ignoring specified cells in simulation run
See merge request naaice/iphreeqc!23
2024-12-04 10:08:14 +01:00
Max Lübke
38268b4aad
feat: add support for ignoring specified cells in simulation run
2024-12-04 09:06:40 +00:00
Max Lübke
bf6dac4c3f
Merge branch '5-bump-to-upstream-version-3-8-5' into 'poet'
...
Resolve "Bump to upstream version 3.8.5"
Closes #5
See merge request naaice/iphreeqc!22
2024-12-04 09:14:19 +01:00
Max Lübke
163bb5ef7b
fix: variable names in transport.cpp
2024-12-04 08:11:45 +00:00
Max Lübke
52f61f6db0
test: update PhreeqcEngine tests to skip Charge, H(0), and O(0) values
2024-12-04 08:07:40 +00:00
Max Lübke
486fc6d3cc
bump version to 3.8.5 in CMakeLists.txt
2024-12-04 08:07:24 +00:00
Max Lübke
088e15b2c1
Merge tag 'v3.8.5' into 5-bump-to-upstream-version-3-8-5
2024-12-04 08:05:51 +00: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
Max Lübke
87e210752d
Merge branch 'mdl/fixRunner' into 'poet'
...
Mdl/fix runner
See merge request naaice/iphreeqc!18
2024-12-03 10:35:13 +01:00
