1209 Commits

Author SHA1 Message Date
Charlton, Scott R
87bbb6a6f0 adjusted alignment for utf-8 strings 2020-09-05 21:06:50 -07:00
Charlton, Scott R
03bda16615 added write_banner to non-DOS and added UTF8 define 2020-09-03 13:11:57 -07:00
Charlton, Scott R
995de526c0 converted to utf-8 2020-09-03 12:54:51 -06:00
Charlton, Scott R
fc8fe3e98f re-added src/ZedGraph.dll 2020-08-30 21:42:00 -06:00
David Parkhurst
fbae3e9294 code change for extending porosity definition. Change to TonyLitharge2a 2020-08-30 15:40:08 -06:00
David Parkhurst
f1dda6c53b Fixed problem with exchange-related when exchanger is defined as CaX2 2020-08-23 15:57:54 -06:00
David Parkhurst
20daad41c8 I guess cxxSurface::NO_EDL is correct 2020-08-18 15:21:08 -06:00
David Parkhurst
801812ded3 Tony's changes to implicit Nernst-Planck calculation 2020-08-17 14:40:41 -06:00
David Parkhurst
6b4892cfc7 added Basic function DEBYE_LENGTH and test case zeta 2020-08-17 09:41:37 -06:00
David Parkhurst
921ab106b8 Changed tidy_exchange_min and tidy_exchange_kin to tidy only for new_def and n_user >= 0. Fixed bug if surf_charge not defined for NO_EDL. Added test MoreExchMix 2020-08-13 23:11:21 -06:00
David Parkhurst
2aef60aa6f Finished up surface and exchange related for cases where related phase or kinetic reaction was modified. Proportionality should now be maintained. Added test cases. 2020-08-11 09:30:32 -06:00
David Parkhurst
569e1e1377 Exchange related. Needed to update in case the related entity changed. 2020-08-10 14:34:06 -06:00
David Parkhurst
ea54e02aaf Free str in callback in PBasic 2020-08-05 16:05:52 -06:00
Darth Vader
a87cd1fee8 Merge commit '1871b026ca8487c23a025415dbc0b2eca01f9af4' 2020-06-01 18:21:09 +00:00
David Parkhurst
aa4d02340a fixed some c2011 warnings, added more info for -formula errors, fixed pressure llnl examples 2020-06-01 12:06:43 -06:00
David Parkhurst
1871b026ca fixed some c2011 warnings, added more info for -formula errors, fixed pressure llnl examples 2020-06-01 12:06:43 -06:00
Parkhurst, David L
e1465e3322 Commit from David's Email 2020-05-22; Implementing llnl-type databases with higher temperature nad pressure 2020-05-22 15:05:28 -06:00
David Parkhurst
e18e1ec6be Tony bug fix for TRANSPORT. Harmonic mean for boundary? Added Cub example. 2020-02-21 20:08:27 -07:00
Darth Vader
44f077e889 Merge commit 'e68934133fc9cd45e7cccc397c55e13f7ee92e5b' 2020-01-28 17:19:30 +00:00
Scott Charlton
e68934133f [phreeqci] Testing subtree merges 2020-01-28 10:05:51 -07:00
Scott Charlton
4f34fd04ff [phreeqci] Testing subtree merges 2020-01-28 10:05:51 -07:00
Scott Charlton
69c0bb3e62 fixed conflict on merge 2020-01-27 16:52:46 -07:00
Darth Vader
55c4dbadb3 Merge commit 'b25fc5bdd48b6d3ab8d677f7d38ad3a462789500' 2020-01-27 22:32:58 +00:00
Scott Charlton
b25fc5bdd4 fixed conflict on merge 2020-01-27 15:05:40 -07:00
Scott Charlton
ca80be6e65 fixed conflict on merge 2020-01-27 15:05:40 -07:00
Scott Charlton
49a74a6ac3 [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Scott Charlton
aec6f90be9 [phreeqc3] Testing subtree merges 2020-01-27 14:36:36 -07:00
Darth Vader
c4c224adf7 Merge commit '84865ad5ac30a9edb86c89ced4194d127ee896fd' 2020-01-27 21:15:10 +00:00
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
3b6ce6c142 Added .gitlab-ci.yml 2020-01-18 23:27:37 -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