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
|
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 |
|
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
|
9a6afb37c4
|
Merge commit 'd7188d25f30f33d2158082341224dda94f4bc1cc'
|
2019-11-19 09:40:14 -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
|
589d6ba5d6
|
Merge commit '679c637ed207c2a2418be64d4ee1ca140073ba90'
|
2019-11-18 22:29:45 -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
|
d7ab7115d4
|
Merge commit 'd8ba4ac6103d1c7c360f637fddab0625bc616878'
|
2019-10-30 11:14:54 -06: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
|
545e81ba3a
|
Merge commit '63108ac76d6fa7c378c21690b6342333c4cb446c'
|
2019-10-30 11:10:37 -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
|
82dc185a90
|
Merge commit '86888c465e9f7ff2ab6e5dfea003fc6ba73383b6'
|
2019-10-21 16:25:10 -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
|
a18a3a3b89
|
Merge commit '26c751fd7e74b54a4e51859b0fcb35dc5c059558'
|
2019-08-19 11:31:20 -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
|
cde1f9fabd
|
Merge commit 'd9a6717e802cbfebd983b9b2b2bca59508b732f6'
|
2019-08-19 11:23:46 -06:00 |
|
Scott R Charlton
|
d9a6717e80
|
Merge commit '81ca6334dc10ebd6f24a7f6a76358751524a7f0f'
|
2019-08-19 11:22:30 -06:00 |
|
Scott R Charlton
|
a83306d3cf
|
Merge commit '86c543395fda4a9fe20062975c117edfca880c9d'
|
2019-08-19 11:05:36 -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 |
|
Scott R Charlton
|
86c543395f
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|
Scott R Charlton
|
3a7b01f367
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|
Scott R Charlton
|
950fca2417
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
597bcd76a2
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
1b13e09db5
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
183eaeee52
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
e0e589f7c1
|
Merge commit '5b3379b947de79f9182a880a74500f50dc234f54'
|
2019-06-18 18:29:56 -06:00 |
|
Scott R Charlton
|
5b3379b947
|
Merge commit '044e0ea2c0337ab4d175f3303e1d6d192a451782'
|
2019-06-18 18:29:40 -06:00 |
|