David Parkhurst
|
f90446715b
|
revised lists to be cumulative for eq, gas, kin, ss
|
2018-08-23 16:37:14 -06:00 |
|
David Parkhurst
|
3a0292c695
|
revised lists to be cumulative for eq, gas, kin, ss
|
2018-08-23 16:37:14 -06:00 |
|
Scott R Charlton
|
da6660ae70
|
Merge commit '7b836dd6cffc6e52c29192e6ae7583044c27cadb'
|
2018-08-22 16:44:38 -06:00 |
|
Scott R Charlton
|
7b836dd6cf
|
Merge commit '9285985dc0222cf6fde33c32625027d376159b3b'
|
2018-08-22 16:44:20 -06:00 |
|
David Parkhurst
|
9285985dc0
|
merging coupled/master into copy
|
2018-08-22 16:39:26 -06:00 |
|
David Parkhurst
|
7c23b62594
|
Fixed string_duplicate memory error
|
2018-08-22 08:20:51 -06:00 |
|
David Parkhurst
|
2d5551a313
|
fixed sc7 for copy and initial time
|
2018-08-21 16:57:24 -06:00 |
|
David Parkhurst
|
4842d9efba
|
inverse iter 100000; finished copy operator; a bit more testing to go
|
2018-08-21 11:33:27 -06:00 |
|
David Parkhurst
|
4eefe43a5b
|
ex20_debug fix
|
2018-08-19 19:49:26 -06:00 |
|
David Parkhurst
|
78e39cdebc
|
still debugging copy
|
2018-08-19 13:15:43 -06:00 |
|
David Parkhurst
|
cee10e7ab9
|
fixing bugs in copy operator
|
2018-08-18 13:14:30 -06:00 |
|
David Parkhurst
|
ebab4bce42
|
fixing bugs in copy operator
|
2018-08-18 12:42:30 -06:00 |
|
David Parkhurst
|
5a35e0278b
|
Fixed Linux warnings, memory errors
|
2018-08-16 20:35:44 -06:00 |
|
David Parkhurst
|
b86f79386a
|
Beginning to test copy operator
|
2018-08-16 11:52:11 -06:00 |
|
Scott R Charlton
|
bda358e2d0
|
Merge commit 'b3e7b2eca602b628e05c15dd920a1cb470980736'
|
2018-08-14 21:27:22 -06:00 |
|
Scott R Charlton
|
b3e7b2eca6
|
Merge commit '5d40e69cc7fcc5bca0037ee70d9d64e4c370e5dd'
|
2018-08-14 21:25:47 -06:00 |
|
Scott R Charlton
|
d667690fcb
|
Merge commit 'ae05e0a661652f55323bd8f394a8907b01df36ad'
|
2018-08-14 21:22:25 -06:00 |
|
Scott R Charlton
|
ae05e0a661
|
Merge branch 'cran-warnings' into 'master'
[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
See merge request coupled/IPhreeqc!6
|
2018-08-14 21:02:41 -06:00 |
|
Scott R Charlton
|
a56973f604
|
Merge branch 'cran-warnings' into 'master'
[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
See merge request coupled/IPhreeqc!6
|
2018-08-14 21:02:41 -06:00 |
|
Scott Charlton
|
5d40e69cc7
|
[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
|
2018-08-14 19:55:28 -07:00 |
|
Scott Charlton
|
67d807ccf7
|
[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
|
2018-08-14 19:55:28 -07:00 |
|
Scott Charlton
|
e5a7fa638b
|
[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
|
2018-08-14 19:55:28 -07:00 |
|
Scott R Charlton
|
088f389c49
|
Merge commit '113fd9aa5ed6507dabd3364a831d8bcbc9cf17c4'
|
2018-08-14 20:22:00 -06:00 |
|
Scott R Charlton
|
113fd9aa5e
|
Merge commit '936de384743fe782f702ed0ab96e4a549ca3dd2e'
|
2018-08-14 20:20:33 -06:00 |
|
Scott R Charlton
|
0f7b19adc6
|
Merge commit '6894b4a7b1ef73cae9d582609173cb84f52e5b3c'
|
2018-08-14 20:15:46 -06:00 |
|
Scott R Charlton
|
6894b4a7b1
|
Merge commit 'd96f386211ad5fbace94d550ca371d9eacb3262f'
|
2018-08-14 20:11:05 -06:00 |
|
Scott R Charlton
|
c6865539f8
|
Merge commit 'd96f386211ad5fbace94d550ca371d9eacb3262f'
|
2018-08-14 20:11:05 -06:00 |
|
Scott R Charlton
|
d96f386211
|
Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388'
|
2018-08-14 20:10:12 -06:00 |
|
Scott Charlton
|
936de38474
|
removed register keywords and updated for misc clang warnings
|
2018-08-14 16:11:36 -07:00 |
|
Scott Charlton
|
af408f7c9a
|
removed register keywords and updated for misc clang warnings
|
2018-08-14 16:11:36 -07:00 |
|
Scott Charlton
|
f2e39872a4
|
removed register keywords and updated for misc clang warnings
|
2018-08-14 16:11:36 -07:00 |
|
David Parkhurst
|
ec9de4cfde
|
beginning of checking copy operation
|
2018-08-13 20:55:53 -06:00 |
|
Scott R Charlton
|
487accaf23
|
Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388'
|
2018-08-09 13:17:35 -06:00 |
|
Scott Charlton
|
b447434d70
|
[iphreeqc] Changes for CRAN 3.4.7
|
2018-08-09 12:42:50 -06:00 |
|
Scott Charlton
|
ebeddcde9d
|
[iphreeqc] Changes for CRAN 3.4.7
|
2018-08-09 12:42:50 -06:00 |
|
Scott R Charlton
|
b489442320
|
Merge commit '9592d6e8015707da5eb033f136590ba40015da61'
|
2018-08-06 14:29:22 -06:00 |
|
Scott R Charlton
|
9592d6e801
|
Merge branch 'dlpark-phreeqc3-TonyApr2018' into 'master'
Merge dlpark:TonyApr2018:967ce08e
See merge request coupled/phreeqc3!3
|
2018-08-06 14:23:38 -06:00 |
|
David Parkhurst
|
7c0fb65b72
|
[phreeqc3] needed to check gas phase type for same model, added test case
|
2018-08-06 14:04:12 -06:00 |
|
Scott R Charlton
|
ca5e069a50
|
Closes #1
|
2018-08-02 23:18:10 -06:00 |
|
Scott R Charlton
|
98d075d472
|
Merge commit '9152ca292e2ea2a042a654b6393b6fcd9160e0d4'
|
2018-08-02 22:24:30 -06:00 |
|
Scott R Charlton
|
9152ca292e
|
Closes #1
|
2018-08-02 22:00:47 -06:00 |
|
Scott R Charlton
|
78b05b072c
|
Merge commit 'ebc4f69cd45b414f2fce86455cd025a2eb762134'
|
2018-08-02 19:37:18 -06:00 |
|
Scott R Charlton
|
ebc4f69cd4
|
Merge branch 'dlpark-phreeqc3-TonyApr2018' into 'master'
Tony apr2018
See merge request coupled/phreeqc3!1
|
2018-08-02 19:36:01 -06:00 |
|
David Parkhurst
|
97a0cec3fe
|
Fixed bug where 1W was interpreted as an isotope
|
2018-08-02 19:29:07 -06:00 |
|
David Parkhurst
|
2deb4edc8c
|
added option -ddl to surface. Added test case
|
2018-08-02 19:24:21 -06:00 |
|
Scott R Charlton
|
9e316ab6ba
|
Merge commit 'df7d5debc6ce37c341b48ad123e4839ab409da38'
|
2018-08-01 22:51:51 -06:00 |
|
Scott R Charlton
|
df7d5debc6
|
Merge branch 'gammas' into 'master'
Gammas
See merge request coupled/phreeqcrm!1
|
2018-08-01 22:29:42 -06:00 |
|
Scott R Charlton
|
35d8d926ed
|
Merge branch 'gammas' into 'master'
Gammas
See merge request coupled/phreeqcrm!1
|
2018-08-01 22:29:42 -06:00 |
|
David Parkhurst
|
cf35bf3bf1
|
fixed some bugs in the reaction lists and got to the point that data is now all available in the phreeqcrm object once FindComponents is called.
|
2018-08-01 21:38:39 -06:00 |
|
David Parkhurst
|
34abb5b076
|
gammas finished, working on reactants
|
2018-08-01 21:32:10 -06:00 |
|