Darth Vader
|
589d88ff89
|
Merge commit 'f2023c4d83f55cbf4598ae8e308df3ef06b8f08c'
|
2020-09-29 22:12:01 +00:00 |
|
Charlton, Scott R
|
f4bf55d7bf
|
Merge branch 'gtest' into 'master'
Reset dllexport; fixed doxygen example tests
See merge request coupled/iphreeqc!19
|
2020-09-29 22:09:46 +00:00 |
|
Charlton, Scott R
|
f2023c4d83
|
Merge branch 'gtest' into 'master'
Reset dllexport; fixed doxygen example tests
See merge request coupled/iphreeqc!19
|
2020-09-29 22:09:46 +00:00 |
|
Charlton, Scott R
|
a28c241478
|
reset for dlls
|
2020-09-29 10:27:55 -06:00 |
|
Charlton, Scott R
|
54161f4ae3
|
reset for dlls
|
2020-09-29 10:27:55 -06:00 |
|
Darth Vader
|
e904f5b730
|
Merge commit '01c99a70a5baf72d53ae8e8f6db53948ddcd990c'
|
2020-09-24 04:29:35 +00:00 |
|
Charlton, Scott R
|
01c99a70a5
|
Merge remote-tracking branch 'github/master'
|
2020-09-23 22:25:35 -06:00 |
|
David Parkhurst
|
23f391743a
|
Merge remote-tracking branch 'scharlton2/master'
|
2020-09-23 15:49:19 -06:00 |
|
David Parkhurst
|
f6644e6e34
|
check for null pointer. Encoding for .out file
|
2020-09-23 15:47:05 -06:00 |
|
Darth Vader
|
e562e09e9a
|
Merge commit '9319c9daf8fe76ef24cf4d262081e8cd0c8fc3fe'
|
2020-09-17 06:11:12 +00:00 |
|
Darth Vader
|
9319c9daf8
|
Merge commit '5b816fa1fd82eb94e2702b6bd9df6066fb71267b'
|
2020-09-17 06:10:18 +00:00 |
|
Darth Vader
|
ea2c663c90
|
Merge commit '07717b1e931b4526f3c33921cd872577599410b6'
|
2020-09-17 06:09:05 +00:00 |
|
Charlton, Scott R
|
07717b1e93
|
added src/phreeqcpp/common/PHRQ_exports.h
|
2020-09-15 20:29:41 -06:00 |
|
Charlton, Scott R
|
5b816fa1fd
|
added src/phreeqcpp/common/PHRQ_exports.h
|
2020-09-15 20:29:41 -06:00 |
|
Charlton, Scott R
|
0b0fced395
|
added src/phreeqcpp/common/PHRQ_exports.h
|
2020-09-15 20:29:41 -06:00 |
|
Charlton, Scott R
|
d8c638fba3
|
Merge remote-tracking branch 'origin/master' into gtest
|
2020-09-07 22:25:59 -06:00 |
|
Charlton, Scott R
|
c8be5daebc
|
Merge remote-tracking branch 'origin/master' into gtest
|
2020-09-07 22:25:59 -06:00 |
|
Darth Vader
|
18e137ff55
|
Merge commit '87bbb6a6f08a3f6cf0e4122e9c080db4ef000344'
|
2020-09-06 04:13:56 +00:00 |
|
Charlton, Scott R
|
87bbb6a6f0
|
adjusted alignment for utf-8 strings
|
2020-09-05 21:06:50 -07:00 |
|
Darth Vader
|
3782d4420d
|
Merge commit '03bda166155a6b2ce652e4ad6aceaf807c3bc041'
|
2020-09-04 23:43:25 +00: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 |
|
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
|
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 |
|
Charlton, Scott R
|
46257e7349
|
added googletest and fixed some minor bugs
|
2020-08-25 12:27:15 -06:00 |
|
Charlton, Scott R
|
13ca055192
|
added googletest and fixed some minor bugs
|
2020-08-25 12:27:15 -06:00 |
|
Charlton, Scott R
|
2760ad0c36
|
added googletest and fixed some minor bugs
|
2020-08-25 12:27:15 -06:00 |
|
Charlton, Scott R
|
dd058e3bec
|
implemented Get/SetErrorOn
|
2020-08-25 12:17:54 -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
|
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
|
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
|
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 |
|
David Parkhurst
|
ea21e58a8f
|
Remove SetErrorFileOn from RunCellsNoPrint, RunStringThread, RunFileThread. Remove Set_error_on from IPreeqc::SetErrorFileOn.
|
2020-07-22 17:51:34 -06:00 |
|
Charlton, Scott R
|
9029c2bcba
|
added changes from email dated 2020-07-15
|
2020-07-15 18:56:06 -06: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
|
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
|
89ca3d279f
|
Merge commit 'e18e1ec6be5107e051f99e41103638c907b1eaf5'
|
2020-02-22 03:17:53 +00:00 |
|