1949 Commits

Author SHA1 Message Date
Darth Vader
a68b8821e3 Merge commit '2e334cb417d144fb082c88cfcf5661ffa0cfacb8' 2021-04-27 14:00:27 +00:00
Darth Vader
2e334cb417 Merge commit '79956e3d9ffcae4885bb46b893d01f311100dca1' 2021-04-27 13:58:45 +00:00
David Parkhurst
eebc11b325 made tally_table a vector of class tally 2021-04-26 23:38:21 -06:00
David Parkhurst
7a2f8916aa made tally_table a vector of class tally 2021-04-26 23:38:21 -06:00
David Parkhurst
79956e3d9f made tally_table a vector of class tally 2021-04-26 23:38:21 -06:00
Darth Vader
f3e27fcb90 Merge commit 'aa62814aa6731a0b093267ec2d361d4837fa3ba9' 2021-04-23 20:15:50 +00:00
Darth Vader
aa62814aa6 Merge commit '58b0d1fccfc6763e569bee30f4ab5e4122963ede' 2021-04-23 20:14:47 +00:00
Darth Vader
58b0d1fccf Merge commit 'd77c11ec700085f19b76af6543013e23ee0739d3' 2021-04-23 20:14:07 +00:00
Scott R Charlton
63175ab743 [phreeqci] fixed header error with phast 2021-04-23 14:06:58 -06:00
Scott R Charlton
d77c11ec70 [phreeqci] fixed header error with phast 2021-04-23 14:06:58 -06:00
Darth Vader
b8563691d2 Merge commit '2efc74230a9105f21920ee93317781e1c56e34d1' 2021-04-22 21:39:02 +00:00
Darth Vader
2efc74230a Merge commit '0feb71507f3a246e8021a2c4781ab6c814c73e71' 2021-04-22 21:37:59 +00:00
Scott R Charlton
0feb71507f [phreeqci] fixed WINDOWS.H already included error on windows builds 2021-04-22 14:11:23 -06:00
Darth Vader
749cf8f4eb 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
1371228faf 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
Darth Vader
71ed896aac 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
08e7576bb6 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
a2974f3759 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
acf0a143a8 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
0abe01cab7 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
fd0bc3096f 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
c27e7010bb updated for classify branch 2021-04-08 11:15:55 -06:00
Scott R Charlton
35ea7ef7ba updated for classify branch 2021-04-08 11:15:55 -06:00
Darth Vader
7993336a9f 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
78223d9720 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
5c0e718999 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