Darth Vader
|
ab72db8a7d
|
Merge commit 'd4261840c7f7720e5a76a941790ce48d40480097'
|
2020-08-31 03:46:03 +00:00 |
|
Darth Vader
|
d4261840c7
|
Merge commit 'fc8fe3e98fb3f1e42482636938537ed6028b3ee6'
|
2020-08-31 03:45:31 +00:00 |
|
Charlton, Scott R
|
fc8fe3e98f
|
re-added src/ZedGraph.dll
|
2020-08-30 21:42:00 -06:00 |
|
Darth Vader
|
4eed6ebce4
|
Merge commit '6e7023f8428a4bfde82f7dc83287ae95b38f1d6b'
|
2020-08-31 01:56:04 +00:00 |
|
Darth Vader
|
6e7023f842
|
Merge commit 'fbae3e92947cf79c1d615e657192eb8d5c78b9e9'
|
2020-08-31 01:55:19 +00: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 |
|
Darth Vader
|
4ef7ef9cf1
|
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
|
0dd7946849
|
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 |
|
Darth Vader
|
c04e8fbb5c
|
Merge commit 'f1ddd8af3b3c9428a2434bbfb38049025671d16e'
|
2020-08-18 19:58:04 +00:00 |
|
David Parkhurst
|
801812ded3
|
Tony's changes to implicit Nernst-Planck calculation
|
2020-08-17 14:40:41 -06:00 |
|
David Parkhurst
|
f1ddd8af3b
|
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
|
3524b835a4
|
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
|
093a1e5b49
|
Merge commit '9d480bc124a4e9e979b4995476d086f90e3833e7'
|
2020-08-13 17:49:43 +00:00 |
|
Darth Vader
|
704f8e7c33
|
Merge commit '5c3f67fc1d92af9cfba35f2b57aa767f69600f9e'
|
2020-08-13 17:49:41 +00:00 |
|
Darth Vader
|
9d480bc124
|
Merge commit '2aef60aa6f00411ac4491e868c3cf2b6beab11ab'
|
2020-08-13 17:48:52 +00:00 |
|
David Parkhurst
|
5c3f67fc1d
|
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
|
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 |
|
Charlton, Scott R
|
e349521504
|
Merge branch 'issue-8' into 'master'
Closes issue #8
Closes #8
See merge request coupled/iphreeqc!15
|
2020-07-24 19:23:03 +00:00 |
|
Scott Charlton
|
b62d3ec3d4
|
changed failing tests to use phreeqc.dat.old
|
2020-07-24 13:11:03 -06:00 |
|
Scott Charlton
|
1618bdfcab
|
renamed old databases
|
2020-07-24 11:50:44 -06:00 |
|
Darth Vader
|
719e939008
|
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
|
f0bdd44c92
|
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
|
c70d64fdfc
|
Merge commit '8be6ec5facfc7082a37facbf5b376ceb4b27435d'
|
2020-07-15 23:36:09 +00:00 |
|
Darth Vader
|
87f43ba66d
|
Merge commit 'e69e150acd5dc587b4e43309baaaea1671944e13'
|
2020-07-15 23:36:06 +00:00 |
|
David Parkhurst
|
8be6ec5fac
|
update to charlton master
|
2020-06-10 08:00:13 -06:00 |
|
David Parkhurst
|
e69e150acd
|
Documented change for Kinniburgh to allow strings in selected output under all conditions
|
2020-06-10 07:43:26 -06:00 |
|
Darth Vader
|
c4547400ec
|
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
|
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 |
|
Darth Vader
|
302bfb4730
|
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 |
|
Scott R Charlton
|
5728339070
|
removed no longer existing frezchem URL
|
2020-05-11 12:10:50 -06:00 |
|
Scott R Charlton
|
4bcab80d04
|
commented out (make check) - seems broken starting at build 580
|
2020-05-11 11:50:52 -06:00 |
|
Charlton, Scott R
|
8e6b961e32
|
Merge branch 'master' into 'master'
Updated for doxygen 1.8
See merge request coupled/iphreeqc!14
|
2020-02-24 19:24:37 +00:00 |
|
Charlton, Scott R
|
850a37c68c
|
Updated for doxygen 1.8
|
2020-02-24 19:24:37 +00:00 |
|
Darth Vader
|
2b8849fe36
|
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 |
|