Scott Charlton
|
49a74a6ac3
|
[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 |
|
Darth Vader
|
c4c224adf7
|
Merge commit '84865ad5ac30a9edb86c89ced4194d127ee896fd'
|
2020-01-27 21:15:10 +00:00 |
|
Darth Vader
|
eff757c8ed
|
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
|
22ec3a55fd
|
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
|
d5e6c6b7e5
|
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
|
aab8bc12ea
|
Merge commit '84865ad5ac30a9edb86c89ced4194d127ee896fd'
|
2020-01-27 01:59:15 +00: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 |
|
Darth Vader
|
d48de197c3
|
Merge commit 'eed9de906915d10ceaf4ec3df3bf5ee3132ad80b'
|
2020-01-19 06:52:34 +00:00 |
|
Scott Charlton
|
d398195036
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott Charlton
|
eed9de9069
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott Charlton
|
5f6538350d
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott Charlton
|
40c2787c49
|
Added .gitlab-ci.yml
|
2020-01-18 23:37:32 -07:00 |
|
Scott Charlton
|
b69210254f
|
Added .gitlab-ci.yml
|
2020-01-18 23:37:32 -07:00 |
|
Scott Charlton
|
3b6ce6c142
|
Added .gitlab-ci.yml
|
2020-01-18 23:27:37 -07:00 |
|
Scott Charlton
|
daf64a1447
|
Added .gitlab-ci.yml
|
2020-01-18 23:27:37 -07:00 |
|
Scott R Charlton
|
918da84d83
|
Merge commit '757927da596446462e8daceb57b20bba2c591f33'
|
2020-01-02 19:25:18 -07:00 |
|
Scott R Charlton
|
757927da59
|
Merge commit 'ae06f3533db376699e82c3b0b183fb2bdd43721a'
|
2020-01-02 19:25:04 -07:00 |
|
David Parkhurst
|
ae06f3533d
|
Fixed GFW bug on new elements in TRANSPORT
|
2020-01-02 19:12:39 -07:00 |
|
Scott R Charlton
|
bc0a05ccfd
|
Merge commit 'aa963a9cae20b9634b4c41e7b6387a2b22b28445'
|
2019-12-13 10:24:37 -07:00 |
|
Scott R Charlton
|
aa963a9cae
|
Merge commit '9cc783b02f8bc437a0572eb32d523f69344724bf'
|
2019-12-13 10:24:26 -07:00 |
|
Scott R Charlton
|
c5ff247765
|
Merge commit '0366caf10b0748d78cb718898c714e1397a008b4'
|
2019-12-13 10:20:33 -07:00 |
|
David Parkhurst
|
9cc783b02f
|
added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no
|
2019-12-12 21:20:22 -07:00 |
|
David Parkhurst
|
0366caf10b
|
added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no
|
2019-12-12 21:20:22 -07:00 |
|
Scott R Charlton
|
49681a22db
|
Merge commit 'd97736a3a718c05c91a3aa6eb567c18538464436'
|
2019-12-03 13:29:35 -07:00 |
|
Scott R Charlton
|
d97736a3a7
|
Merge commit '79f768a7bd6c88e064ba25a33880cb84cfd1489f'
|
2019-12-03 13:29:23 -07:00 |
|
David L Parkhurst
|
79f768a7bd
|
Merge branch 'master' into 'master'
removed j = j in loop
See merge request coupled/phreeqc3!48
|
2019-12-03 13:25:21 -07:00 |
|
David Parkhurst
|
bd7634a8cc
|
removed j = j in loop
|
2019-12-03 13:22:14 -07:00 |
|
Scott R Charlton
|
1016398534
|
Merge commit 'd0e5bac5843adf417da9a722e8f8ae8405442d26'
|
2019-11-24 20:24:45 -07:00 |
|
Scott R Charlton
|
d0e5bac584
|
Merge commit '542394c95add8bc99c697c8dc33887efe2b1ae20'
|
2019-11-24 20:24:28 -07:00 |
|
Scott R Charlton
|
542394c95a
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
9d49905cd2
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
6fe5c0e2cd
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
f6023203e2
|
Merge commit 'e5bf8b0aa61996d6b4ee40820a7b7f79cb649444'
|
2019-11-19 19:50:40 -07:00 |
|
Scott R Charlton
|
e5bf8b0aa6
|
Merge commit '6067ce8ce599b9cbfaf012c0abc377f20e616b42'
|
2019-11-19 19:49:57 -07:00 |
|
David L Parkhurst
|
6067ce8ce5
|
Merge branch 'implicit3' into 'master'
Fixed more compile warnings. Removed andra_kin_ss from testing, results are...
See merge request coupled/phreeqc3!45
|
2019-11-19 19:45:58 -07:00 |
|
David Parkhurst
|
21bd20f567
|
Fixed more compile warnings. Removed andra_kin_ss from testing, results are inconsistent between Linux and Windows, presumably the ifs in RATES
|
2019-11-19 19:39:09 -07:00 |
|
Scott R Charlton
|
077fbf97fb
|
Merge commit 'fd242bd33f1f6b3b91cd6d4f5a5336db0edfa81e'
|
2019-11-19 14:20:33 -07:00 |
|
Scott R Charlton
|
fd242bd33f
|
Merge commit '97b9c5848ee2b8ae6413ffa09e0b79be7d739ef8'
|
2019-11-19 14:19:21 -07:00 |
|
David L Parkhurst
|
97b9c5848e
|
Merge branch 'implicit3' into 'master'
Another Linux warning, lower tol on andra_kin_ss.
See merge request coupled/phreeqc3!44
|
2019-11-19 14:17:45 -07:00 |
|
David Parkhurst
|
45db5cf084
|
Another Linux warning, lower tol on andra_kin_ss.
|
2019-11-19 14:15:22 -07:00 |
|
Scott R Charlton
|
1ab3235e68
|
Merge commit '3049467b561ef8176c81341b76b883b2179380f2'
|
2019-11-19 12:41:28 -07:00 |
|
Scott R Charlton
|
3049467b56
|
Merge commit '443be1cdb1adce5a8da310d883bf4d97fc661576'
|
2019-11-19 12:40:34 -07:00 |
|