Charlton, Scott R
aea752acf5
Merge pull request #79 from dlparkhurst/mix_error
...
Mix error
2024-10-08 15:47:45 -06:00
David Parkhurst
919f611947
ex12b added to examples
2024-10-08 14:19:47 -06:00
Darth Vader
4c9657948b
Squashed 'phreeqc3-examples/' changes from 8d50b95a..757561b9
...
757561b9 Merge pull request #74 from mwtoews/fix-typos
bf3dc34a Fix typos
git-subtree-dir: phreeqc3-examples
git-subtree-split: 757561b99b22211b09448495a06c2478e5cb9ef1
2024-10-08 20:05:51 +00:00
Darth Vader
0f4e8b662f
Merge commit '4c9657948b0bce7ecbeb227d390394f35a61ef7f'
2024-10-08 20:05:51 +00:00
Darth Vader
d17a0c7767
Squashed 'database/' changes from 24d2c771..9e8d773e
...
9e8d773e Merge pull request #74 from mwtoews/fix-typos
dc8e003f Fix typos
git-subtree-dir: database
git-subtree-split: 9e8d773e18b9bbd8517b340061d6f509515fa019
2024-10-08 20:05:49 +00:00
Darth Vader
47d53a38ff
Merge commit 'd17a0c776778e40701141a52ce929a26ff0c2e98'
2024-10-08 20:05:49 +00:00
Darth Vader
7f683b4082
Merge commit '622bc5fb4cc8f67f9303e45c98397b97fe30822f'
2024-10-08 20:05:43 +00:00
Darth Vader
622bc5fb4c
Squashed 'src/' changes from ac393756..d6a74675
...
d6a74675 Merge commit '4e80a54467a084df3b666c7d6fc56a4798fd3301'
4e80a544 Squashed 'phreeqcpp/' changes from 7c7fafd..c876219
0209fdf9 Merge commit 'b537589773f4819fe97ff8e5322bcd38c54b63f7'
b5375897 Squashed 'phreeqcpp/' changes from e317dd0..7c7fafd
git-subtree-dir: src
git-subtree-split: d6a74675d73985977ceac1601b57463c1ee8c331
2024-10-08 20:05:43 +00:00
Darth Vader
ce28b59699
Merge commit '622bc5fb4cc8f67f9303e45c98397b97fe30822f'
2024-10-08 20:05:43 +00:00
Darth Vader
b6d35e21c7
Squashed 'phreeqc3-doc/' changes from 7bb51ae7..db48f0f6
...
db48f0f6 Fix typos
git-subtree-dir: phreeqc3-doc
git-subtree-split: db48f0f69e9b2ec1880a62418e598777bc79ddcf
2024-10-08 20:05:40 +00:00
Darth Vader
5589061192
Merge commit 'b6d35e21c7104a57e96316423cbc296179e02514'
2024-10-08 20:05:40 +00:00
Darth Vader
4e80a54467
Squashed 'phreeqcpp/' changes from 7c7fafd..c876219
...
c876219 Merge commit '64310ada821d1cc387af4507db7029fe3326784b'
64310ad Squashed 'common/' changes from 399aba2..648db22
git-subtree-dir: phreeqcpp
git-subtree-split: c876219b1b064ab7c17e0bc4ad8bff13e0aeb108
2024-10-08 20:05:00 +00:00
Darth Vader
d6a74675d7
Merge commit '4e80a54467a084df3b666c7d6fc56a4798fd3301'
2024-10-08 20:05:00 +00:00
Darth Vader
b537589773
Squashed 'phreeqcpp/' changes from e317dd0..7c7fafd
...
7c7fafd Merge pull request #78 from dlparkhurst/mix_error
eb0591c Merge pull request #74 from mwtoews/fix-typos
334df5e Tony's fix in heat transport
bf897a2 Marked old error in mix. Updated test case.
58566a6 Fix ah2o in adding a solution. Fixed bad_graph database.
75effd0 Merge branch 'viscosity' into mix_error
f4708df account for water mass in addition to mixing fractions
70954c6 mixing by water mass times mixing fraction
84b59ab Fix typos
git-subtree-dir: phreeqcpp
git-subtree-split: 7c7fafd686d7c41753132a978a1d55d4d25b601b
2024-10-08 20:04:33 +00:00
Darth Vader
0209fdf9c7
Merge commit 'b537589773f4819fe97ff8e5322bcd38c54b63f7'
2024-10-08 20:04:33 +00:00
Charlton, Scott R
9e8d773e18
Merge pull request #74 from mwtoews/fix-typos
...
Fix typos
2024-10-08 09:43:47 -06:00
Charlton, Scott R
757561b99b
Merge pull request #74 from mwtoews/fix-typos
...
Fix typos
2024-10-08 09:43:47 -06:00
Darth Vader
6dc784c5e9
Squashed 'phreeqc3-examples/' changes from 4a0d366e..8d50b95a
...
8d50b95a Updated output files for current version
git-subtree-dir: phreeqc3-examples
git-subtree-split: 8d50b95a9fe30f7fedc2d189b361c7849a68df01
2024-09-24 22:03:36 +00:00
Darth Vader
c97ce7fb50
Merge commit '6dc784c5e91beeb719846fcee40b21dcfde28f81'
2024-09-24 22:03:36 +00:00
Darth Vader
9f148afd1a
Squashed 'database/' changes from 5146dd68..24d2c771
...
24d2c771 Tony updated OH- viscosity
git-subtree-dir: database
git-subtree-split: 24d2c771f3830a122fc3f91d5f0b185c0128bdfb
2024-09-24 22:03:35 +00:00
Darth Vader
31bddef34c
Merge commit '9f148afd1a324939b329fef5a3c49fad2c08f5d5'
2024-09-24 22:03:35 +00:00
Darth Vader
0bd8217516
Merge commit 'ca6b882bcab9708f90c8761e0d4a4d572c57fce7'
2024-09-24 22:03:32 +00:00
Darth Vader
ca6b882bca
Squashed 'src/' changes from a0bffdbc..ac393756
...
ac393756 Merge commit 'c155685f6393b3cd780a56e72651eb79ea5f4bc1'
c155685f Squashed 'phreeqcpp/' changes from fdc0bb5..e317dd0
git-subtree-dir: src
git-subtree-split: ac393756092b60865e75432d9225f875331b9e25
2024-09-24 22:03:32 +00:00
Darth Vader
492f1d5a95
Merge commit 'ca6b882bcab9708f90c8761e0d4a4d572c57fce7'
2024-09-24 22:03:32 +00:00
Darth Vader
c155685f63
Squashed 'phreeqcpp/' changes from fdc0bb5..e317dd0
...
e317dd0 Guarded case with no points in curves for log axes. Added bad_graph test case.
git-subtree-dir: phreeqcpp
git-subtree-split: e317dd0e41bbfd18abd2255ab5f2cf3933cd4c69
2024-09-24 22:02:30 +00:00
Darth Vader
ac39375609
Merge commit 'c155685f6393b3cd780a56e72651eb79ea5f4bc1'
2024-09-24 22:02:30 +00:00
Charlton, Scott R
8d50b95a9f
Updated output files for current version
2024-09-20 14:36:02 -06:00
David Parkhurst
24d2c771f3
Tony updated OH- viscosity
2024-09-17 10:15:25 -06:00
Mike Taves
db48f0f69e
Fix typos
2024-09-13 22:35:11 +12:00
Mike Taves
dc8e003f6a
Fix typos
2024-09-13 22:35:11 +12:00
Mike Taves
bf3dc34a52
Fix typos
2024-09-13 22:35:11 +12:00
Max Lübke
e02969c891
Merge branch 'ml/remove-cpp20-api' into 'poet'
...
Improve interoperability with exclusive Cpp language features
See merge request naaice/iphreeqc!9
2024-09-10 18:18:56 +02:00
Max Luebke
e3c3e890df
refactor: Enable std::map::contains only when cpp >= 20 is defined
2024-09-10 18:09:51 +02:00
Marco De Lucia
9722151735
Selfcontained input in app/ipqEngine
2024-09-10 17:29:52 +02:00
Max Lübke
8c2e1ce8e8
refactor: Update printVectorsAsTable function in ipqEngine.cpp
...
- Added "Array Index" column to the table output
2024-09-10 15:18:49 +02:00
Max Lübke
e42c120518
Add 'app' directory from golem branch
2024-09-10 15:08:55 +02:00
Max Lübke
6fd2e96411
refactor: Update C++ standard to c++20 in IPhreeqcPOET target
2024-09-10 09:11:28 +02:00
Max Lübke
324810368e
feat: remove header dependency to c++20 features
2024-09-10 09:11:13 +02:00
Darth Vader
9fac273ef2
Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf'
2024-08-29 21:05:25 +00:00
Darth Vader
ce2280a77a
Squashed 'src/' changes from 7e60110c..a0bffdbc
...
a0bffdbc Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473'
8f7d206a Squashed 'phreeqcpp/' changes from c477ba1..fdc0bb5
git-subtree-dir: src
git-subtree-split: a0bffdbc3f8363587bb32c8441d6d8352ae3dba6
2024-08-29 21:05:25 +00:00
Darth Vader
0d2010720b
Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf'
2024-08-29 21:05:25 +00:00
Darth Vader
8f7d206a80
Squashed 'phreeqcpp/' changes from c477ba1..fdc0bb5
...
fdc0bb5 fixed nullptr for pre-c++11
git-subtree-dir: phreeqcpp
git-subtree-split: fdc0bb51869877771df528f727fe577f58877c7d
2024-08-29 21:04:42 +00:00
Darth Vader
a0bffdbc3f
Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473'
2024-08-29 21:04:42 +00:00
Darth Vader
ead288422b
Squashed 'phreeqc3-doc/' changes from ca3ebafd..7bb51ae7
...
7bb51ae7 Whitespace adjustments
git-subtree-dir: phreeqc3-doc
git-subtree-split: 7bb51ae783708bb9f004cc9ba6985ffc95df3ce8
2024-08-29 19:54:50 +00:00
Darth Vader
bf0b9c1685
Merge commit 'ead288422b20c854408e7b5f3e0cfeb42560fc00'
2024-08-29 19:54:50 +00:00
Charlton, Scott R
7bb51ae783
Whitespace adjustments
2024-08-29 13:48:49 -06:00
Darth Vader
672e854d0e
Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6'
2024-08-29 19:03:35 +00:00
Darth Vader
9782e02486
Squashed 'src/' changes from f627828f..7e60110c
...
7e60110c Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9'
45befa71 Squashed 'phreeqcpp/' changes from faf8144..c477ba1
git-subtree-dir: src
git-subtree-split: 7e60110c311f80186965599d128e225096bcb1c3
2024-08-29 19:03:35 +00:00
Darth Vader
709f644f8d
Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6'
2024-08-29 19:03:35 +00:00
Darth Vader
45befa7108
Squashed 'phreeqcpp/' changes from faf8144..c477ba1
...
c477ba1 Converted to utf-8
53b14b4 Tony fixed latest viscosity bug in surface calculations
2375f7b fixed mismatched ifdef
84ad1ce Tony's changes. [200~Added variable viscos_DDL in EDL(viscos_DDL, surface_name) to give the viscosity of a Donnan layer on a surface in BASIC. Note that the surface_name should not contain an underscore _, the Donnan properties are for the surface, not for surface charge, thus use the surface name Hfo, not Hfo_w. If surface_name is omitted, the viscosity is given for the first surface in the alphabetical order.
git-subtree-dir: phreeqcpp
git-subtree-split: c477ba119a0ecfa4361b88f0b49523847a1a03bc
2024-08-29 19:02:04 +00:00
