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

3021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
c264989022 Merge commit '46d70ad27917611742964d636306edd2244ddfee' 2020-01-28 16:15:54 +00:00
Darth Vader
c8b7e74b77 Merge commit '0163f911a4a33619d6e0960c24b6707bc27f8c61' 2020-01-28 16:15:53 +00:00
Darth Vader
50a6aac410 Merge commit '294e42f67e61325d5037fa48c6dc0390cea0608f' 2020-01-28 16:15:51 +00:00
Scott Charlton
46d70ad279 [phreeqc] Testing subtree merges 2020-01-28 08:58:58 -07:00
Scott Charlton
0163f911a4 [phreeqc] Testing subtree merges 2020-01-28 08:58:58 -07:00
Scott Charlton
294e42f67e [phreeqc] Testing subtree merges 2020-01-28 08:58:58 -07:00
Darth Vader
c2ad12ee1d Merge commit '8e901d060dba068ab2390e9917de4cee52c4979c' 2020-01-27 23:58:00 +00:00
Darth Vader
8e901d060d Merge commit '69c0bb3e62a7d3759d685b37652cac80373a58e7' 2020-01-27 23:55:04 +00:00
Darth Vader
17388e741a Merge commit 'bb5bcbf15eb0ff4efe3dceb70b3682fd6a59f47f' 2020-01-27 23:54:30 +00:00
Scott Charlton
bb5bcbf15e fixed conflict on merge 2020-01-27 16:52:46 -07:00
Scott Charlton
69c0bb3e62 fixed conflict on merge 2020-01-27 16:52:46 -07:00
Darth Vader
55c4dbadb3 Merge commit 'b25fc5bdd48b6d3ab8d677f7d38ad3a462789500' 2020-01-27 22:32:58 +00:00
Darth Vader
81f0172c31 Merge commit '1d71804fa56f571cb1f4c2297503cde359ee9712' 2020-01-27 22:22:11 +00:00
Darth Vader
7808cd4afe Merge commit 'a9eadc26fb00e1a61b2acde31ee4ec0da1c77dd9' 2020-01-27 22:22:09 +00:00
Darth Vader
49340c85ac Merge commit '6d4acba199989882c9520ff3e723d756f765f382' 2020-01-27 22:09:40 +00:00
Darth Vader
1d71804fa5 Merge commit 'a400365a5e06a9cd2ac0aa6e2c51fa4797c631f8' 2020-01-27 22:09:39 +00:00
Darth Vader
e14ac93a1c Merge commit 'a400365a5e06a9cd2ac0aa6e2c51fa4797c631f8' 2020-01-27 22:09:39 +00:00
Darth Vader
a9eadc26fb Merge commit '206bd3e73665fb802ddb0b0ce9150353eb86b3cd' 2020-01-27 22:09:38 +00:00
Darth Vader
687973645f Merge commit '206bd3e73665fb802ddb0b0ce9150353eb86b3cd' 2020-01-27 22:09:38 +00:00
Scott Charlton
ca80be6e65 fixed conflict on merge 2020-01-27 15:05:40 -07:00
Scott Charlton
b25fc5bdd4 fixed conflict on merge 2020-01-27 15:05:40 -07:00
Scott Charlton
6d4acba199 [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Scott Charlton
a400365a5e [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Scott Charlton
206bd3e736 [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Scott Charlton
aec6f90be9 [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Scott Charlton
49a74a6ac3 [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Darth Vader
c4c224adf7 Merge commit '84865ad5ac30a9edb86c89ced4194d127ee896fd' 2020-01-27 21:15:10 +00:00
Darth Vader
0ed3d93e12 Merge commit '108755553045b7943d024ecd512cddb233ee9c63' 2020-01-27 02:31:12 +00:00
Darth Vader
1087555530 Merge commit '0bf4138d63cd63d9cb3cd2081c16e706b8c867d2' 2020-01-27 02:24:48 +00:00
Darth Vader
7d3c3ee5e7 Merge commit '92807718ee036df029c57351fdd15b4a456d4496' 2020-01-27 02:11:42 +00:00
Darth Vader
0bf4138d63 Merge commit '4a8727cecd9fefd1587485820e913c0e666b77d9' 2020-01-27 02:09:52 +00:00
Darth Vader
92807718ee Merge commit '4a8727cecd9fefd1587485820e913c0e666b77d9' 2020-01-27 02:09:52 +00:00
Darth Vader
4a8727cecd Merge commit '553875fa3799217dc937ee3ef6e9d874e545ccf5' 2020-01-27 02:09:23 +00:00
Darth Vader
77380716f2 Merge commit 'efbddbf6dc5b3bca3076b50d39c42a196ae551c8' 2020-01-27 02:06:21 +00:00
Darth Vader
553875fa37 Merge commit 'aab8bc12ea8be8aec5943e1c77a54b19d28168cb' 2020-01-27 02:03:24 +00:00
Darth Vader
efbddbf6dc Merge commit 'aab8bc12ea8be8aec5943e1c77a54b19d28168cb' 2020-01-27 02:03:24 +00:00
Darth Vader
04219bdb83 Merge commit '4296b15563ebe373ee20aeb471235b63aa8a698d' 2020-01-27 02:00:43 +00:00
Darth Vader
dc0af24510 Merge commit 'c6ecaadf4de18be2ac3e2c7a639994ad1bbbad41' 2020-01-27 02:00:41 +00:00
Darth Vader
4296b15563 Merge commit '0e8069e37275f23d47e04bd6b7873ec56dfdf088' 2020-01-27 01:59:40 +00:00
Darth Vader
c6ecaadf4d Merge commit '006fd2459d694c18c772996098d662960a35a628' 2020-01-27 01:59:36 +00:00
Darth Vader
aab8bc12ea Merge commit '84865ad5ac30a9edb86c89ced4194d127ee896fd' 2020-01-27 01:59:15 +00:00
David Parkhurst
0e8069e372 Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff 2020-01-26 18:55:23 -07:00
David Parkhurst
006fd2459d Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff 2020-01-26 18:55:23 -07:00
David Parkhurst
7bd02ff813 Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff 2020-01-26 18:55:23 -07:00
Scott Charlton
84865ad5ac Added .gitlab-ci.yml 2020-01-19 00:07:25 -07:00
Scott Charlton
fa7cbaf5e0 Added .gitlab-ci.yml 2020-01-18 23:57:55 -07:00
Scott Charlton
0f79fee46b Added .gitlab-ci.yml 2020-01-18 23:57:55 -07:00
Darth Vader
787c701637 Merge commit 'eed9de906915d10ceaf4ec3df3bf5ee3132ad80b' 2020-01-19 06:52:34 +00:00
Darth Vader
a84c347494 Merge commit 'a09a24b2bf0db0dff473666060e2aac4608b83f2' 2020-01-19 06:43:55 +00:00
Darth Vader
e35b7188a6 Merge commit '6a8d50887676fa8f5394b2f44b1a00d175b97fac' 2020-01-19 06:43:55 +00:00