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,181 Commits 6 Branches 4 Tags
Commit Graph

4181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
81f3c709a1 Merge commit 'b0adf3f16b2ec47984b51a737f38ce0bc5287672' 2024-11-18 21:27:30 +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
1f98a67f94 Merge commit '90cf51d443206ded5301a993908f2547259bbb70' 2024-11-14 19:23:41 +00: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
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
e5c236a366 Merge commit '5f272b1fe3cfa93d5e5512461e41d049fc3a00be' 2024-11-14 01:39:23 +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
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
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
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