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

4189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
v0.1 		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
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
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
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
f5b9d3f0a9 Squashed 'phreeqc3-examples/' changes from 2d7d1bca..4a0d366e 
4a0d366e Updated examples with latest viscosity branch

git-subtree-dir: phreeqc3-examples
git-subtree-split: 4a0d366eef6b8e55e4109ef4bd3824a10d482038
 2024-08-29 19:01:30 +00:00
Darth Vader
0c070e5710 Merge commit 'f5b9d3f0a9df756ddee8322eab1cdb4581044f8c' 2024-08-29 19:01:30 +00:00
Darth Vader
e4059956a8 Squashed 'phreeqc3-doc/' changes from cfaa0d9a..ca3ebafd 
ca3ebafd updated release.txt with Tony's viscosity updates. Updated EDL Basic function documentation in HTML.

git-subtree-dir: phreeqc3-doc
git-subtree-split: ca3ebafda0fc09ea9b95a8ce4ee7890b6755b93b
 2024-08-29 19:01:22 +00:00
Darth Vader
0db9072455 Merge commit 'e4059956a82bb8d8d18ea3ce31ae39265af80e8e' 2024-08-29 19:01:22 +00:00
Max Lübke
bd1cbceb2c Merge branch 'ml/kinetic-names' into 'poet' 
refactor: Comment out unused code in KineticWrapper::names(), leading to name duplication

See merge request naaice/iphreeqc!8
 2024-08-29 08:46:47 +02:00
Max Lübke
48e65d87ad refactor: Comment out unused code in KineticWrapper::names(), leading to doubling of names 2024-08-29 08:25:14 +02:00
Max Lübke
fead98ad38 Merge branch 'ml/fix-cpp-standard' into 'poet' 
Set C++23 standard for IPhreeqcPOET target

See merge request naaice/iphreeqc!6
 2024-08-26 11:22:51 +02:00