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 |
|
David Parkhurst
|
044e0ea2c0
|
phreeqc_ptr bug in internal copy
|
2019-06-18 18:20:30 -06:00 |
|
Scott R Charlton
|
957b1211b9
|
Merge commit '67342a4d0414680313fce8eca4c7f81c67b49004'
|
2019-06-17 17:35:55 -06:00 |
|
Scott R Charlton
|
67342a4d04
|
Merge commit '59342977ed27c7b504432da94511229f5998437a'
|
2019-06-17 17:35:10 -06:00 |
|
Scott R Charlton
|
0b39297213
|
Merge commit '8412823930dd6ea12f1be8dbbe64c50354748df2'
|
2019-06-17 17:34:37 -06:00 |
|
Scott R Charlton
|
59342977ed
|
Merge commit '5c53fb207238bc0e846123a7e0d71a48bd9976ab'
|
2019-06-17 17:34:25 -06:00 |
|
Scott R Charlton
|
8412823930
|
Merge commit '5c53fb207238bc0e846123a7e0d71a48bd9976ab'
|
2019-06-17 17:34:25 -06:00 |
|
Scott R Charlton
|
5c53fb2072
|
Merge commit '1327e93127e40e7a55ec629dcc9dd91ec29e77fe'
|
2019-06-17 17:34:12 -06:00 |
|
David Parkhurst
|
c117e182f8
|
Tony fix of index error
|
2019-06-12 05:20:02 -06:00 |
|
David Parkhurst
|
b90ddb5651
|
Fixed Tony's fix, added implicit_as example
|
2019-06-11 15:52:10 -06:00 |
|
David Parkhurst
|
03acc3f78f
|
changed abs to fabs
|
2019-06-09 22:11:54 -06:00 |
|
David Parkhurst
|
1fef40e188
|
added implicit, max_mixf to internal copy
|
2019-06-06 09:27:46 -06:00 |
|
Scott R Charlton
|
7ff05ddca3
|
Merge commit '5a46f0d778ddd534e263fa93df8e4d0baab370a3'
|
2019-06-05 21:48:12 -06:00 |
|
Scott R Charlton
|
5a46f0d778
|
Merge commit '32939bae4bdfa4b8c6c448688524bc35d5ce6baa'
|
2019-06-05 21:29:40 -06:00 |
|
Scott R Charlton
|
32939bae4b
|
Merge commit '1327e93127e40e7a55ec629dcc9dd91ec29e77fe'
|
2019-06-05 20:59:15 -06:00 |
|
Scott R Charlton
|
5a43b70d11
|
Merge commit 'aa34ac11538c27f39c44c34938411f1e00afce19'
|
2019-06-05 20:44:38 -06:00 |
|
Scott R Charlton
|
aa34ac1153
|
Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113'
|
2019-06-05 20:44:26 -06:00 |
|
David Parkhurst
|
b3bf691b49
|
fixed > > in templates for gcc
|
2019-06-03 21:05:15 -06:00 |
|