max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,198 Commits 6 Branches 4 Tags
Commit Graph

3198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
7ac39104c5 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
a22beccc3d 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
b390aae363 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
21ba8a0b80 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
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