Scott R Charlton
|
c07314c7e5
|
Merge commit '492a4d257f300b7a9e0b5dc7e212c8f85ecb7f6e'
|
2019-08-19 11:27:13 -06:00 |
|
Scott R Charlton
|
3deb6134eb
|
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
|
4e71fdc746
|
Merge commit '86c543395fda4a9fe20062975c117edfca880c9d'
|
2019-08-19 11:05:36 -06:00 |
|
Scott R Charlton
|
344150a4aa
|
Merge branch 'master' into 'master'
Closes coupled/IPhreeqc#5
Closes #5
See merge request coupled/IPhreeqc!9
|
2019-08-19 10:59:40 -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
|
f8a0737a56
|
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
|
a174361c5a
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
055c882d64
|
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
|
1f0471599a
|
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
|
b999fe9381
|
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 |
|
Scott R Charlton
|
4b29b0b03a
|
Merge commit 'a3fe841da4b8d496932b900bd127a59fb6719795'
|
2019-06-06 11:04:18 -06:00 |
|
David Parkhurst
|
1fef40e188
|
added implicit, max_mixf to internal copy
|
2019-06-06 09:27:46 -06:00 |
|
David Parkhurst
|
a3fe841da4
|
reran more examples that have additional cell prints for TRANSPORT
|
2019-06-06 08:42:16 -06:00 |
|
Scott R Charlton
|
f13343f14b
|
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
|
eb961c7946
|
Merge commit 'aa34ac11538c27f39c44c34938411f1e00afce19'
|
2019-06-05 20:44:38 -06:00 |
|
Scott R Charlton
|
06c06e2a98
|
Merge commit '4c3958e1da787453bad95f372f05130f6fabb61d'
|
2019-06-05 20:44:36 -06:00 |
|
Scott R Charlton
|
aa34ac1153
|
Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113'
|
2019-06-05 20:44:26 -06:00 |
|
David Parkhurst
|
4c3958e1da
|
Updated RELEASE.TXT
|
2019-06-05 20:31:49 -06:00 |
|
David Parkhurst
|
b3bf691b49
|
fixed > > in templates for gcc
|
2019-06-03 21:05:15 -06:00 |
|
Scott R Charlton
|
35bf17eb10
|
Merge commit 'cfc208b0123edf5c3fece6d9b9968780a7e2cd96'
|
2019-06-03 18:46:48 -06:00 |
|
Scott Charlton
|
cfc208b012
|
updated installer
|
2019-06-03 18:30:46 -06:00 |
|
David Parkhurst
|
c92911348b
|
Tony fix May 31
|
2019-06-01 10:32:24 -06:00 |
|
David Parkhurst
|
1327e93127
|
Implicit seems to be working with Tony's latest changes
|
2019-05-30 22:03:38 -06:00 |
|
David Parkhurst
|
55ea163dd0
|
Implicit seems to be working with Tony's latest changes
|
2019-05-30 22:03:38 -06:00 |
|
David Parkhurst
|
c7111f77b2
|
Sort of works, still bugs and serious errors compared to explicit
|
2019-05-28 17:05:02 -06:00 |
|
Scott R Charlton
|
d3898b545d
|
Merge commit '164b85d3e0a62fb0d24d5d79817ad9767cf799ad'
|
2019-05-06 15:44:31 -06:00 |
|
Scott R Charlton
|
91e66b4383
|
Merge commit '79c28e50c1ac44195f0aafc8279f601f1f40c836'
|
2019-05-06 15:44:30 -06:00 |
|
Scott R Charlton
|
79c28e50c1
|
Merge commit '600c7ee5728aa23c963828df22b6e0c94038a3ed'
|
2019-05-06 15:44:18 -06:00 |
|
David Parkhurst
|
164b85d3e0
|
Fixed some bugs with iso.dat inverse modeling, added test case. Still does not generate [13C](4) and [13C](-4) from SOLUTION
|
2019-05-06 15:22:52 -06:00 |
|
David Parkhurst
|
600c7ee572
|
Fixed some bugs with iso.dat inverse modeling, added test case. Still does not generate [13C](4) and [13C](-4) from SOLUTION
|
2019-05-06 15:22:52 -06:00 |
|
Scott R Charlton
|
e12f551bda
|
Merge commit '94155a63c62b057011f9c961e240e0e04721ca05'
|
2019-02-05 23:49:55 -07:00 |
|
Scott R Charlton
|
64dd31c30b
|
Merge commit 'd4070c8a4458d7b3d3d2416a27737297b10245e7'
|
2019-02-05 23:49:48 -07:00 |
|
Scott R Charlton
|
94155a63c6
|
Merge commit '2291700eebddc4374b8cd88d19fc0978ee84c7e9'
|
2019-02-05 23:49:21 -07:00 |
|