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 |
|
David Parkhurst
|
e18e1ec6be
|
Tony bug fix for TRANSPORT. Harmonic mean for boundary? Added Cub example.
|
2020-02-21 20:08:27 -07:00 |
|
Parkhurst, David L
|
88000a7d3b
|
Merge branch 'issue-7' into 'master'
Issue 7
Closes #7
See merge request coupled/iphreeqc!13
|
2020-01-30 23:14:06 +00:00 |
|
Scott R Charlton
|
ff660e7451
|
Fixed make for frezchem.dat
|
2020-01-30 12:20:42 -07:00 |
|
Scott R Charlton
|
1f074edce7
|
[iphreeqc] Added core10.dat, frezchem.dat, and Tipping_Hurley.dat to R distribution
|
2020-01-30 12:09:20 -07:00 |
|
Scott R Charlton
|
108fe635ec
|
updated urls; fixed jenkins-R-dist.sh
|
2020-01-30 10:44:35 -07:00 |
|
Darth Vader
|
bcccd4a362
|
Merge commit '4972f1d25730ba7ccb7c8916c8599677e613125d'
|
2020-01-29 23:09:53 +00:00 |
|
David Parkhurst
|
4972f1d257
|
Merge remote-tracking branch 'coupled/master'
|
2020-01-28 17:13:56 -07:00 |
|
David Parkhurst
|
1ea94aeb74
|
Noted bug fix in Fortran RM_RunString instance order for documentation
|
2020-01-28 17:13:30 -07:00 |
|
Scott R Charlton
|
e7b7a6d2a0
|
[iphreeqc] Added phreeqc manual 2 and 3 to distribution
|
2020-01-28 15:59:29 -07:00 |
|
Scott Charlton
|
946d8024df
|
[iphreeqc] Testing subtree merges
|
2020-01-28 11:50:21 -07:00 |
|
Darth Vader
|
e9720fd76b
|
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
|
a7e432f1c2
|
Merge commit 'ee7d1026e6dd8c5b372f9e24fb98111bd3c9fc16'
|
2020-01-28 17:57:19 +00:00 |
|
Darth Vader
|
52502bad19
|
Merge commit 'fae004f42baa79cb40476a1814ffbf1278871c5f'
|
2020-01-28 17:57:18 +00:00 |
|
Darth Vader
|
fd4937f7f4
|
Merge commit '7dade0c0a750da806f9de772e4b71086c66a18c6'
|
2020-01-28 17:57:17 +00:00 |
|
Scott Charlton
|
ee7d1026e6
|
[phreeqc] Testing subtree merges
|
2020-01-28 10:55:49 -07:00 |
|
Scott Charlton
|
fae004f42b
|
[phreeqc] Testing subtree merges
|
2020-01-28 10:55:49 -07:00 |
|
Scott Charlton
|
7dade0c0a7
|
[phreeqc] Testing subtree merges
|
2020-01-28 10:55:49 -07:00 |
|
Darth Vader
|
e2b5bf6de2
|
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
|
38f2d8f21c
|
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 |
|
Darth Vader
|
74fec83aeb
|
Merge commit 'a9303d1835693899838c430bb56555b32c986558'
|
2020-01-28 17:13:21 +00:00 |
|
Darth Vader
|
6dfe3e8603
|
Merge commit '2560903d250b5f29d474c2683c9ede0649bc4ddf'
|
2020-01-28 17:13:20 +00:00 |
|
Darth Vader
|
df6aaad959
|
Merge commit '001a6b42eccc66da2994b511e32e93f1ece0f98b'
|
2020-01-28 17:13:17 +00:00 |
|