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
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
Charlton, Scott R
48e4f32315
[phreeqc3] Updated outputs for 3.8.4
2024-11-13 18:19:41 -07:00
David Parkhurst
6ff8cfe341
Added documentation for GAS_BINARY_PARAMETERS
2024-11-11 10:39:19 -07:00
David Parkhurst
1cc308a15b
Added documentation for GAS_BINARY_PARAMETERS
2024-11-11 10:39:19 -07:00
David Parkhurst
a3cbc5d8cd
Made GAS_BINARY_PARAMETERS backward compatible
2024-11-11 09:16:50 -07:00
David Parkhurst
e5780c953e
GAS_BINARY_PARAMETERS implemented. gas_binary_parameters test case
2024-11-09 10:27:38 -07:00
Marco De Lucia
b6f312f0d0
Merge branch 'ml/add-desctructor' into 'poet'
...
refactor: add default destructor for PhreeqcMatrix class
See merge request naaice/iphreeqc!16
2024-11-08 12:48:48 +01:00
Max Lübke
969a4cbefd
refactor: add default destructor for PhreeqcMatrix class
2024-11-08 12:46:59 +01:00
David Parkhurst
1f0c405f3f
Updated Release.txt with PhreeqcRM bug fix
2024-11-07 21:44:36 -07:00
Max Lübke
61214a01ad
Merge branch 'ml/glic' into 'poet'
...
Code refactoring to allow better support for older compilers & using C=++ features for type-safety and disadvantages of using preprocessor macros
See merge request naaice/iphreeqc!15
2024-11-07 14:21:49 +01:00
Max Lübke
7bb4852cab
refactor: replace preprocessor constants by constexpr for type-safety and other problems
2024-11-07 14:07:33 +01:00
Max Lübke
fc9057c2f9
refactor: change ESSENTIALS array type to const char* for better backward compatibility with gcc 11
2024-11-07 13:41:34 +01:00
Max Lübke
aba7bc2543
Merge branch 'delucia-poet-patch-51492' into 'poet'
...
Update CMakeLists.txt to reflect version 3.8.2
See merge request naaice/iphreeqc!14
2024-11-06 11:44:44 +01:00
Marco De Lucia
7eebc462f9
Update CMakeLists.txt to reflect version 3.8.2
2024-11-06 11:29:38 +01:00
David Parkhurst
ae35abae47
fixed ex22 for graphing. Updated RELEASE.TXT
2024-11-01 17:14:06 -06:00
David Parkhurst
09bf7c8cb1
fixed ex22 for graphing. Updated RELEASE.TXT
2024-11-01 17:14:06 -06:00
David Parkhurst
c1dd17c7b2
Tweaked H+ viscosity in databases, new test cases fig1 and H_HCl_HBr
2024-11-01 15:59:36 -06:00
David Parkhurst
6dbd486499
Tony's changes to example 22
2024-11-01 09:05:00 -06: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
98fcfd3d56
[iphreeqc] Updated RELEASE.TXT
2024-10-25 12:11:34 -06: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
Max Lübke
ed095fcb28
Merge branch 'ml/cleanup' into 'poet'
...
chore: remove unused app directory
See merge request naaice/iphreeqc!13
2024-10-23 13:47:28 +02:00
Max Lübke
62a8f687a1
chore: remove unused app directory
2024-10-23 13:45:52 +02:00
Max Lübke
054c1cb72e
Merge branch 'ml/bump-3.8.2' into 'poet'
...
Bump Phreecq to version 3.8.2
See merge request naaice/iphreeqc!12
2024-10-23 13:43:30 +02:00
Max Lübke
7cc00e335a
Bump Phreecq to version 3.8.2
2024-10-23 13:43:30 +02:00
