3705 Commits

Author SHA1 Message Date
Darth Vader
46932e799e Merge commit '4ae649449235703be5a460fae083169e1d7a10e8' 2021-04-22 18:07:58 +00:00
Darth Vader
4ae6494492 Merge commit '123cc8a5f5b095cfebea092a1e49a8872fc676d4' 2021-04-22 18:07:25 +00:00
Scott R Charlton
123cc8a5f5 [phreeqci] fixed _ASSERTE error on linux builds 2021-04-22 12:00:09 -06:00
Darth Vader
eb4003029d Merge commit '4a848dccec5e555fd493c1565b6cc1e0707caf05' 2021-04-22 16:58:51 +00:00
Darth Vader
4a848dccec Merge commit '22c4a624a98244cf2706842b9d989e0edc3b91e2' 2021-04-22 16:58:09 +00:00
Scott R Charlton
22c4a624a9 [phreeqci] struct to class changes 2021-04-22 10:50:27 -06:00
Charlton, Scott R
6d12dec390 [iphreeqc] Closes coupled/iphreeqc#9 2021-04-20 20:22:38 -06:00
Darth Vader
cb53e55a50 Merge commit '8080cbce1e8b54fa33d4e86c2f10f8e443419bd9' 2021-04-19 23:24:17 +00:00
Darth Vader
8080cbce1e Merge commit '4cee19d768863d8f09b3629ee36a11e1a6030f33' 2021-04-19 23:23:32 +00:00
Darth Vader
4cee19d768 Merge commit '2d8ca2d0f37d13ad67be582208a4e65edfcf702f' 2021-04-19 23:23:24 +00:00
Scott R Charlton
2d8ca2d0f3 [phreeqci] added 'new' debugging 2021-04-19 17:17:02 -06:00
Scott R Charlton
d0c821238d [phreeqci] added 'new' debugging 2021-04-19 17:17:02 -06:00
Darth Vader
45ca5bdd69 Merge commit 'abacccd0ee631ddcaf427f200ced4db1d0cf626f' 2021-04-12 17:11:21 +00:00
Darth Vader
abacccd0ee Merge commit '9661feab0a6da6876e32a18565ac4e79eaec2634' 2021-04-12 17:10:15 +00:00
David Parkhurst
9661feab0a tokadd_heading leak 2021-04-12 10:02:27 -06:00
Darth Vader
dd6768e8ed Merge commit '2537a2c376658ea64bfaf37bc9738b76d71a787b' 2021-04-11 23:26:18 +00:00
Darth Vader
2537a2c376 Merge commit '4565c5d894d2a9f58577183783ba1969cbc680ea' 2021-04-11 23:25:37 +00:00
David Parkhurst
4565c5d894 catching upMerge remote-tracking branch 'origin/master' into classify 2021-04-10 16:04:38 -06:00
David Parkhurst
c22d792cb9 fix notab leak 2021-04-10 16:03:44 -06:00
Darth Vader
ca2238c95a Merge commit '4b9b99267b55b2c9ee5cbf96c4dff2cc1d946c40' 2021-04-10 17:29:17 +00:00
Darth Vader
4b9b99267b Merge commit '6d2b45a8e168aa9e55ee677afe52367857e8140d' 2021-04-10 17:28:30 +00:00
Charlton, Scott R
6d2b45a8e1 Merge remote-tracking branch 'usgs-coupled/master' 2021-04-10 11:24:14 -06:00
David Parkhurst
38cfe18613 memory leak user_print, pitz/sit store, add uphill_NPa, remove TESTINT 2021-04-09 21:35:05 -06:00
Darth Vader
976e3f725d Merge commit 'bd0962591257268d0726bf54db1bbdc39f691ced' 2021-04-08 17:27:39 +00:00
Darth Vader
bd09625912 Merge commit '24f9bf72f092f0c9edcb18d959cb174f74f96c10' 2021-04-08 17:27:00 +00:00
Scott R Charlton
24f9bf72f0 removed TESTING definition 2021-04-08 11:24:03 -06:00
Scott R Charlton
1b28b511a0 removed TESTING definition 2021-04-08 11:24:03 -06:00
Scott R Charlton
d77dff5739 removed TESTING definition 2021-04-08 11:24:03 -06:00
Scott R Charlton
c4de8f2504 updated for TESTING define 2021-04-08 11:21:52 -06:00
Scott R Charlton
35ea7ef7ba updated for classify branch 2021-04-08 11:15:55 -06:00
Scott R Charlton
2ea9dd1405 updated for classify branch 2021-04-08 11:15:55 -06:00
Darth Vader
8c84982254 Merge commit '2697dc958cee10b7a5fedeec8b98fbb2aa30f62a' 2021-04-08 15:12:48 +00:00
Darth Vader
2697dc958c Merge commit 'e2ce92882c5f21ac206e180cf38812d976025717' 2021-04-08 15:12:06 +00:00
David Parkhurst
e2ce92882c Tony agreed with change for all_cells, new test case 2021-04-08 08:09:17 -06:00
Darth Vader
c1cf1c5372 Merge commit '0479fc1adaec4ef03f9d3755219119c118afc531' 2021-04-08 13:50:54 +00:00
Darth Vader
0479fc1ada Merge commit 'd2a5d63f30d0e3e2fddfeba7058caf8e8401de78' 2021-04-08 13:49:54 +00:00
David Parkhurst
d2a5d63f30 reset all_cells in all cases 2021-04-07 20:51:08 -06:00
Darth Vader
4539c33933 Merge commit '0aa30d21ac10b0ea13ad3cb1f701e7e3cac7eda7' 2021-04-07 19:26:57 +00:00
Darth Vader
0aa30d21ac Merge commit 'e3c0d61bc7acc87be515f9923da3a68e14e20880' 2021-04-07 19:26:20 +00:00
David Parkhurst
e3c0d61bc7 initialize aphi 2021-04-07 13:04:39 -06:00
Scott R Charlton
c960e059fb builds on vs2005; still needs to initialize class pitz_param* aphi 2021-04-07 12:35:35 -06:00
David Parkhurst
71dc944c9d cl1mp, bad initialization 2021-04-07 11:10:28 -06:00
Darth Vader
8c32ad1adb Merge commit '639490d0610cc02b8618567d95ff30833eafd6c2' 2021-04-07 14:28:05 +00:00
Darth Vader
639490d061 Merge commit '2e5f255c794096790125293dcc3af274bed7a61a' 2021-04-07 14:27:20 +00:00
David Parkhurst
2e5f255c79 fixed errors/warnings from ming and intel 2021-04-06 23:58:52 -06:00
David Parkhurst
369733e9b5 converted to classes 2021-04-06 22:21:54 -06:00
Darth Vader
633c12917b Merge commit 'b1efa4f251731679e57d36e20579687b2d1efce2' 2021-04-06 16:06:24 +00:00
Darth Vader
b1efa4f251 Merge commit '7961b1686b4e064ec4ec886e76543074d060129f' 2021-04-06 16:04:54 +00:00
Darth Vader
c69a5bce5e Merge commit '481eedd9fbb079c0adef13419abbbec0af61d3ff' 2021-04-06 16:03:38 +00:00
David Parkhurst
481eedd9fb release.txt, couple size_t 2021-04-06 09:18:25 -06:00