Darth Vader
|
4a8727cecd
|
Merge commit '553875fa3799217dc937ee3ef6e9d874e545ccf5'
|
2020-01-27 02:09:23 +00:00 |
|
Darth Vader
|
efbddbf6dc
|
Merge commit 'aab8bc12ea8be8aec5943e1c77a54b19d28168cb'
|
2020-01-27 02:03:24 +00:00 |
|
Darth Vader
|
553875fa37
|
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 |
|
Scott Charlton
|
eed9de9069
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott Charlton
|
d398195036
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott Charlton
|
daf64a1447
|
Added .gitlab-ci.yml
|
2020-01-18 23:27:37 -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
|
aa963a9cae
|
Merge commit '9cc783b02f8bc437a0572eb32d523f69344724bf'
|
2019-12-13 10:24:26 -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
|
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
|
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
|
6fe5c0e2cd
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -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
|
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
|
3049467b56
|
Merge commit '443be1cdb1adce5a8da310d883bf4d97fc661576'
|
2019-11-19 12:40:34 -07:00 |
|
David L Parkhurst
|
443be1cdb1
|
Merge branch 'implicit3' into 'master'
Last Linux compile warnings. Added more precision to andra_kin_ss.
See merge request coupled/phreeqc3!43
|
2019-11-19 12:36:06 -07:00 |
|
David Parkhurst
|
9a29aaf83d
|
Last Linux compile warnings. Added more precision to andra_kin_ss.
|
2019-11-19 12:33:58 -07:00 |
|
Scott R Charlton
|
d7188d25f3
|
Merge commit '6dafd7d75e3dc4b97ed0b5efa7424bf0630829e0'
|
2019-11-19 09:39:46 -07:00 |
|
David L Parkhurst
|
6dafd7d75e
|
Merge branch 'implicit3' into 'master'
Fixing Linux compiler warnings, checking in new regression test files.
See merge request coupled/phreeqc3!42
|
2019-11-19 09:33:31 -07:00 |
|
David Parkhurst
|
fbde6338ec
|
Fixing Linux compiler warnings, checking in new regression test files.
|
2019-11-19 09:31:10 -07:00 |
|
Scott R Charlton
|
679c637ed2
|
Merge commit '22077113d63c5f086de917486dcf4df678a9c464'
|
2019-11-18 22:29:32 -07:00 |
|
David L Parkhurst
|
22077113d6
|
Merge branch 'implicit3' into 'master'
Implicit3
See merge request coupled/phreeqc3!41
|
2019-11-18 22:21:38 -07:00 |
|
David Parkhurst
|
77e36a2394
|
Tony fixed some transport, revised colloid_U. New cases added to Makefile.
|
2019-11-18 22:08:46 -07:00 |
|
David Parkhurst
|
f07caf973b
|
Changed back print to allow incremental_reactions to work correctly
|
2019-11-18 20:32:46 -07:00 |
|
Scott R Charlton
|
d8ba4ac610
|
Merge commit 'beadd0738b548a8bebe9934e5de2497cd6e3a7e0'
|
2019-10-30 11:12:55 -06:00 |
|
Scott R Charlton
|
beadd0738b
|
Merge commit '5947da90657d1cb8f832152b4573dca0bbefb49e'
|
2019-10-30 11:12:18 -06:00 |
|
Scott R Charlton
|
63108ac76d
|
Merge commit '6a49d41253c7705c0273262d0290389b18643d32'
|
2019-10-29 12:29:32 -06:00 |
|
David Parkhurst
|
6a49d41253
|
changes to make related and mixing items independent of case. surface_mix test case.
|
2019-10-28 18:21:57 -06:00 |
|
David Parkhurst
|
5947da9065
|
initial Tony changes
|
2019-10-22 16:36:15 -06:00 |
|
David Parkhurst
|
8089c10273
|
initial Tony changes
|
2019-10-22 16:36:15 -06:00 |
|
Scott R Charlton
|
86888c465e
|
Merge commit '009aec74d1cae1a8fc361a5560d89f44173fd7ee'
|
2019-10-21 16:24:50 -06:00 |
|
David Parkhurst
|
009aec74d1
|
Merge remote-tracking branch 'coupled/master'
|
2019-10-20 12:40:56 -06:00 |
|
David Parkhurst
|
4676ee4de7
|
added more P-R gas paramteters
|
2019-10-20 12:27:48 -06:00 |
|
Scott R Charlton
|
26c751fd7e
|
Merge commit 'c07314c7e58a9e3fda0d3157863a3a8634864f02'
|
2019-08-19 11:30:53 -06:00 |
|
Scott R Charlton
|
c07314c7e5
|
Merge commit '492a4d257f300b7a9e0b5dc7e212c8f85ecb7f6e'
|
2019-08-19 11:27:13 -06:00 |
|
Scott R Charlton
|
d9a6717e80
|
Merge commit '81ca6334dc10ebd6f24a7f6a76358751524a7f0f'
|
2019-08-19 11:22:30 -06:00 |
|
Scott R Charlton
|
492a4d257f
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|
Scott R Charlton
|
81ca6334dc
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|