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
|
54161f4ae3
|
reset for dlls
|
2020-09-29 10:27:55 -06: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
|
9319c9daf8
|
Merge commit '5b816fa1fd82eb94e2702b6bd9df6066fb71267b'
|
2020-09-17 06:10:18 +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
|
d8c638fba3
|
Merge remote-tracking branch 'origin/master' into gtest
|
2020-09-07 22:25:59 -06:00 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|