max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,163 Commits 6 Branches 4 Tags
Commit Graph

4163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco De Lucia
7eebc462f9 Update CMakeLists.txt to reflect version 3.8.2 2024-11-06 11:29:38 +01: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
Max Lübke
ed095fcb28 Merge branch 'ml/cleanup' into 'poet' 
chore: remove unused app directory

See merge request naaice/iphreeqc!13
v0.2 		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
Max Lübke
017d6bd69d Merge branch 'ml/add_h0_o0' into 'poet' 
feat: add H(0) and O(0) to solution list

See merge request naaice/iphreeqc!11
 2024-10-23 13:08:28 +02:00
Max Lübke
fd32253456 feat: add test for negative time step 2024-10-23 13:06:32 +02:00
Max Lübke
ef887290cb test: Add PhreeqcEngine tests 
fix: Handle reordering of Equilibrium components by Phreeqc
 2024-10-23 13:04:50 +02:00
Max Lübke
5478ade84e feat: add function to query wether a cell id exists 2024-10-23 11:06:33 +02:00
Max Lübke
20333ced36 build: replace deprecated call to FetchContent_Populate 2024-10-23 10:40:30 +02:00
Max Lübke
14195b45dc ci: Use ninja as build system 2024-10-23 10:29:54 +02:00
Max Lübke
32aa5527df test: Load databases and scripts during runtime 2024-10-23 10:28:28 +02:00
Max Lübke
26f6e11177 feat: add H(0) and O(0) to solution list 
refactor: Remove knowledge on "fixed" solution entries from non-wrapper functions
 2024-10-23 10:01:49 +02: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
Marco De Lucia
9061e210e6 Merge branch 'ml/improve-API' into 'poet' 
Improve usability outside POET

See merge request naaice/iphreeqc!10
 2024-10-17 14:19:42 +02:00
Max Lübke
c046e907b4 WIP: fix solution heterogeneity 2024-10-16 14:59:24 +02:00
Max Luebke
ee940d20e4 Improve usability outside POET 2024-10-16 14:43:01 +02: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
Darth Vader
69d1bab8d5 Merge commit '04e805fe8f6958546ef47554b182f37a6b41b06f' 2024-10-11 19:12:07 +00:00
Darth Vader
67e3b79829 Squashed 'phreeqc3-doc/' changes from db48f0f6..a8fd3b6a 
a8fd3b6a Changed Lamda to Lambda, but retained backward compatibility

git-subtree-dir: phreeqc3-doc
git-subtree-split: a8fd3b6a191f62885c8f2e31915410bbff840a2d
 2024-10-11 19:11:57 +00:00
Darth Vader
44e39ee3b8 Merge commit '67e3b798298c0e31980c39f25bcd828c4202ea93' 2024-10-11 19:11:57 +00:00
Darth Vader
e39aae3a9e Squashed 'phreeqc3-examples/' changes from 757561b9..aea752ac 
aea752ac Merge pull request #79 from dlparkhurst/mix_error
919f6119 ex12b added to examples

git-subtree-dir: phreeqc3-examples
git-subtree-split: aea752acf573194e6e7fa816ac0c0e89fbcdab60
 2024-10-08 22:02:50 +00:00
Darth Vader
268af62ea6 Merge commit 'e39aae3a9e6936b6da0bce51b9103524a426a247' 2024-10-08 22:02:50 +00:00
Darth Vader
469feff0c5 Merge commit 'c27bfc7b64e0b47c6bde0ea233919dfa87808993' 2024-10-08 22:02:45 +00:00
Darth Vader
c27bfc7b64 Squashed 'src/' changes from d6a74675..4f8c3967 
4f8c3967 Merge commit '792cdda06002b1ebc354b23ca1af4edcdbd24c26'
792cdda0 Squashed 'phreeqcpp/' changes from c876219..ead498a

git-subtree-dir: src
git-subtree-split: 4f8c3967aa7d3c52017c1cba326ef0eb95befac9
 2024-10-08 22:02:44 +00: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
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
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