David Parkhurst
|
f1dda6c53b
|
Fixed problem with exchange-related when exchanger is defined as CaX2
|
2020-08-23 15:57:54 -06:00 |
|
Darth Vader
|
75f4ab0ba6
|
Merge commit 'b138ed208df65cd4653ea7a2e07332a3d3e1c8b2'
|
2020-08-20 02:38:58 +00:00 |
|
Darth Vader
|
b138ed208d
|
Merge commit '20daad41c8999670f933430f1c705384cdfa6947'
|
2020-08-20 02:37:16 +00:00 |
|
David Parkhurst
|
20daad41c8
|
I guess cxxSurface::NO_EDL is correct
|
2020-08-18 15:21:08 -06:00 |
|
Darth Vader
|
57cf38ddb0
|
Merge commit '5631ce1e56cda328e8efac33a0ee998a7fd27489'
|
2020-08-18 19:59:27 +00:00 |
|
Darth Vader
|
5631ce1e56
|
Merge commit '801812ded3961b37ed264997211694bd0563d554'
|
2020-08-18 19:58:22 +00: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 |
|
Darth Vader
|
fb6c36a792
|
Merge commit '9d480bc124a4e9e979b4995476d086f90e3833e7'
|
2020-08-13 17:49:43 +00:00 |
|
Darth Vader
|
9d480bc124
|
Merge commit '2aef60aa6f00411ac4491e868c3cf2b6beab11ab'
|
2020-08-13 17:48:52 +00: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
|
24d69a0557
|
Merge commit 'ea21e58a8f9bd9ae4de057ca2422d8a4f399826c'
|
2020-07-23 16:02:57 +00:00 |
|
David Parkhurst
|
ea21e58a8f
|
Remove SetErrorFileOn from RunCellsNoPrint, RunStringThread, RunFileThread. Remove Set_error_on from IPreeqc::SetErrorFileOn.
|
2020-07-22 17:51:34 -06:00 |
|
Darth Vader
|
5d70f691d7
|
Merge commit '9029c2bcba781cba475c035d5fb81f83c8ec56fa'
|
2020-07-16 01:05:35 +00:00 |
|
Charlton, Scott R
|
9029c2bcba
|
added changes from email dated 2020-07-15
|
2020-07-15 18:56:06 -06:00 |
|
Darth Vader
|
a19f9e7e15
|
Merge commit '74b541d42e40ef1ed8df0bfba9826e55b046e9f0'
|
2020-06-01 18:21:57 +00:00 |
|
Darth Vader
|
74b541d42e
|
Merge commit 'a87cd1fee89cf0076aa06b9018e8ad3b44566516'
|
2020-06-01 18:21:16 +00:00 |
|
Darth Vader
|
a87cd1fee8
|
Merge commit '1871b026ca8487c23a025415dbc0b2eca01f9af4'
|
2020-06-01 18:21:09 +00: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 |
|
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 |
|
Darth Vader
|
bef8a01ca8
|
Merge commit '1c3edaa7473043f049372de76a3d622b45d3fed3'
|
2020-05-22 22:16:27 +00:00 |
|
Darth Vader
|
1c3edaa747
|
Merge commit 'e1465e33228a3f867bd822405fb100614d5f6d0c'
|
2020-05-22 22:15:37 +00: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 |
|
Darth Vader
|
c41548d30f
|
Merge commit '89ca3d279fed2341cf35bc240da008836972fc7e'
|
2020-02-22 03:19:15 +00:00 |
|
Darth Vader
|
89ca3d279f
|
Merge commit 'e18e1ec6be5107e051f99e41103638c907b1eaf5'
|
2020-02-22 03:17:53 +00: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
|
c7f9087c3b
|
Merge commit 'a208e3948a804c8fb689fa980739e341b6696a32'
|
2020-01-28 18:26:36 +00:00 |
|
Scott Charlton
|
a208e3948a
|
[phast3] Testing subtree merges
|
2020-01-28 11:20:25 -07:00 |
|
Darth Vader
|
fa9c36cf5d
|
Merge commit 'a4c582649b4aae5e535960843a7d71567ac3d12e'
|
2020-01-28 17:23:41 +00:00 |
|
Darth Vader
|
a4c582649b
|
Merge commit '44f077e8893ba3434c5a0feccfe42be7e9aa83db'
|
2020-01-28 17:19:54 +00:00 |
|
Darth Vader
|
44f077e889
|
Merge commit 'e68934133fc9cd45e7cccc397c55e13f7ee92e5b'
|
2020-01-28 17:19:30 +00:00 |
|
Darth Vader
|
939f7ed841
|
Merge commit '090f5e682b8b44251566a2624fe8189744f727c5'
|
2020-01-28 17:17:47 +00:00 |
|
Darth Vader
|
090f5e682b
|
Merge commit '4f34fd04ff34668494863eab5312157ce746d862'
|
2020-01-28 17:16:16 +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 |
|
Darth Vader
|
981dd81efa
|
Merge commit '9bcc875c9ed6ddb30a29500ca89de8f9281bac80'
|
2020-01-28 16:45:18 +00:00 |
|
Scott Charlton
|
9bcc875c9e
|
[phast3] Testing subtree merges
|
2020-01-28 09:37:24 -07:00 |
|
Darth Vader
|
1bd3f9582a
|
Merge commit '8e901d060dba068ab2390e9917de4cee52c4979c'
|
2020-01-27 23:58:00 +00:00 |
|
Darth Vader
|
8e901d060d
|
Merge commit '69c0bb3e62a7d3759d685b37652cac80373a58e7'
|
2020-01-27 23:55:04 +00:00 |
|
Darth Vader
|
40edae9330
|
Merge commit 'bb5bcbf15eb0ff4efe3dceb70b3682fd6a59f47f'
|
2020-01-27 23:54:30 +00:00 |
|
Scott Charlton
|
69c0bb3e62
|
fixed conflict on merge
|
2020-01-27 16:52:46 -07:00 |
|
Scott Charlton
|
bb5bcbf15e
|
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 |
|