1180 Commits

Author SHA1 Message Date
Darth Vader
0bf4138d63 Merge commit '4a8727cecd9fefd1587485820e913c0e666b77d9' 2020-01-27 02:09:52 +00:00
Darth Vader
553875fa37 Merge commit 'aab8bc12ea8be8aec5943e1c77a54b19d28168cb' 2020-01-27 02:03:24 +00:00
Darth Vader
aab8bc12ea Merge commit '84865ad5ac30a9edb86c89ced4194d127ee896fd' 2020-01-27 01:59:15 +00:00
David Parkhurst
7bd02ff813 Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff 2020-01-26 18:55:23 -07:00
Scott Charlton
84865ad5ac Added .gitlab-ci.yml 2020-01-19 00:07:25 -07:00
Scott Charlton
d398195036 Added .gitlab-ci.yml 2020-01-18 23:42:45 -07:00
Scott Charlton
40c2787c49 Added .gitlab-ci.yml 2020-01-18 23:37:32 -07:00
Scott Charlton
daf64a1447 Added .gitlab-ci.yml 2020-01-18 23:27:37 -07:00
David Parkhurst
ae06f3533d Fixed GFW bug on new elements in TRANSPORT 2020-01-02 19:12:39 -07:00
David Parkhurst
9cc783b02f added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no 2019-12-12 21:20:22 -07:00
David L Parkhurst
79f768a7bd Merge branch 'master' into 'master'
removed j = j in loop

See merge request coupled/phreeqc3!48
2019-12-03 13:25:21 -07:00
David Parkhurst
bd7634a8cc removed j = j in loop 2019-12-03 13:22:14 -07:00
Scott R Charlton
542394c95a IPhreeqc: ifdef'd out references to std::cerr and std::cout 2019-11-23 21:14:02 -07:00
David L Parkhurst
6067ce8ce5 Merge branch 'implicit3' into 'master'
Fixed more compile warnings. Removed andra_kin_ss from testing, results are...

See merge request coupled/phreeqc3!45
2019-11-19 19:45:58 -07:00
David Parkhurst
21bd20f567 Fixed more compile warnings. Removed andra_kin_ss from testing, results are inconsistent between Linux and Windows, presumably the ifs in RATES 2019-11-19 19:39:09 -07:00
David L Parkhurst
97b9c5848e Merge branch 'implicit3' into 'master'
Another Linux warning, lower tol on andra_kin_ss.

See merge request coupled/phreeqc3!44
2019-11-19 14:17:45 -07:00
David Parkhurst
45db5cf084 Another Linux warning, lower tol on andra_kin_ss. 2019-11-19 14:15:22 -07:00
David L Parkhurst
443be1cdb1 Merge branch 'implicit3' into 'master'
Last Linux compile warnings. Added more precision to andra_kin_ss.

See merge request coupled/phreeqc3!43
2019-11-19 12:36:06 -07:00
David Parkhurst
9a29aaf83d Last Linux compile warnings. Added more precision to andra_kin_ss. 2019-11-19 12:33:58 -07:00
David L Parkhurst
6dafd7d75e Merge branch 'implicit3' into 'master'
Fixing Linux compiler warnings, checking in new regression test files.

See merge request coupled/phreeqc3!42
2019-11-19 09:33:31 -07:00
David Parkhurst
fbde6338ec Fixing Linux compiler warnings, checking in new regression test files. 2019-11-19 09:31:10 -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
beadd0738b Merge commit '5947da90657d1cb8f832152b4573dca0bbefb49e' 2019-10-30 11:12:18 -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
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
c07314c7e5 Merge commit '492a4d257f300b7a9e0b5dc7e212c8f85ecb7f6e' 2019-08-19 11:27:13 -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
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
David Parkhurst
044e0ea2c0 phreeqc_ptr bug in internal copy 2019-06-18 18:20:30 -06:00
Scott R Charlton
59342977ed 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
32939bae4b Merge commit '1327e93127e40e7a55ec629dcc9dd91ec29e77fe' 2019-06-05 20:59:15 -06:00
David Parkhurst
b3bf691b49 fixed > > in templates for gcc 2019-06-03 21:05:15 -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
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
David Parkhurst
2291700eeb Fixed gas_phase_mix bug, added test case 2019-02-05 13:45:02 -07:00