Scott R Charlton
|
679c637ed2
|
Merge commit '22077113d63c5f086de917486dcf4df678a9c464'
|
2019-11-18 22:29:32 -07:00 |
|
Scott R Charlton
|
63108ac76d
|
Merge commit '6a49d41253c7705c0273262d0290389b18643d32'
|
2019-10-29 12:29:32 -06:00 |
|
Scott R Charlton
|
86888c465e
|
Merge commit '009aec74d1cae1a8fc361a5560d89f44173fd7ee'
|
2019-10-21 16:24:50 -06:00 |
|
Scott R Charlton
|
86c543395f
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|
Scott R Charlton
|
1b13e09db5
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
5b3379b947
|
Merge commit '044e0ea2c0337ab4d175f3303e1d6d192a451782'
|
2019-06-18 18:29:40 -06:00 |
|
Scott R Charlton
|
8412823930
|
Merge commit '5c53fb207238bc0e846123a7e0d71a48bd9976ab'
|
2019-06-17 17:34:25 -06:00 |
|
Scott R Charlton
|
aa34ac1153
|
Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113'
|
2019-06-05 20:44:26 -06:00 |
|
Scott R Charlton
|
79c28e50c1
|
Merge commit '600c7ee5728aa23c963828df22b6e0c94038a3ed'
|
2019-05-06 15:44:18 -06:00 |
|
Scott R Charlton
|
94155a63c6
|
Merge commit '2291700eebddc4374b8cd88d19fc0978ee84c7e9'
|
2019-02-05 23:49:21 -07:00 |
|
Scott R Charlton
|
51fbb3d5b0
|
Merge commit '035a4e0f7db61f7256e63659b0e7853dd299263e'
|
2019-02-04 21:19:21 -07:00 |
|
Scott R Charlton
|
1e4a2941b3
|
Merge commit 'bd4fc256a6f168e127f6d2b783653c890c23a231'
|
2019-01-30 21:34:30 -07:00 |
|
Scott R Charlton
|
f0c3701bde
|
Merge branch 'issue-3' into 'master'
Fixed -Wcatch-value warnings reported by CRAN
Closes #3
See merge request coupled/IPhreeqc!8
|
2019-01-30 18:12:57 -07:00 |
|
Scott Charlton
|
c88ff034bc
|
Fixed -Wcatch-value warnings reported by CRAN
|
2019-01-29 16:04:01 -08:00 |
|
Scott R Charlton
|
548aead510
|
Merge commit '040fd95fadbc2cd62df3c056ef7a41e10c8b7a29'
|
2019-01-29 11:10:34 -07:00 |
|
Scott R Charlton
|
12df06b34c
|
Merge commit 'd57264d9733b6f5687d8b7d87f5e9a8aad7e7d71'
|
2019-01-28 22:14:36 -07:00 |
|
Scott R Charlton
|
43386a0bc4
|
Merge commit '3fd8155d566798e121a1f54418f901cdd0db5e6c'
|
2019-01-28 21:20:14 -07:00 |
|
Scott R Charlton
|
f90fc5afea
|
Merge commit '2b14a9475c1cb0c64d3adaf67a907b63ea454c9c'
|
2019-01-28 18:19:55 -07:00 |
|
David Parkhurst
|
fa7776b8fe
|
added modify methods for restart files
|
2018-12-11 17:17:49 -07:00 |
|
David Parkhurst
|
1150a4a2aa
|
changed restart file to include UZ
|
2018-11-30 17:41:13 -07:00 |
|
Scott R Charlton
|
c2dada993c
|
Merge commit 'fffac6d359c01544c617aae6717678f0fd884193'
|
2018-11-07 23:14:22 -07:00 |
|
Scott R Charlton
|
4235170d91
|
Merge commit 'fa5ee5049432867a5161fcd97aebe475854fffdb'
|
2018-11-07 20:10:00 -07:00 |
|
Scott R Charlton
|
65dbd2c15b
|
Merge commit 'd99390113028519f41895af04cedba4a43258336'
|
2018-11-07 16:20:41 -07:00 |
|
Scott R Charlton
|
6e92ecf9ef
|
Merge commit '92c81f9fdd43f175d302028b56e7edbab81a7d06'
|
2018-11-07 15:29:36 -07:00 |
|
Scott R Charlton
|
dbefc44f31
|
Merge commit '3cc84da8ceac5d4a819fc0a6779b7ca361c17226'
|
2018-11-07 14:39:33 -07:00 |
|
Scott R Charlton
|
c83e4bf78e
|
Merge commit '56b5bf3f438e0b99c7a35b79ad169be36c2fa352'
|
2018-11-06 16:49:45 -07:00 |
|
Scott R Charlton
|
c4fa021ec1
|
Merge commit '2977db4424a04e3643bb02d356984c7aa78d1fde'
|
2018-10-19 20:14:33 -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
|
7b836dd6cf
|
Merge commit '9285985dc0222cf6fde33c32625027d376159b3b'
|
2018-08-22 16:44:20 -06:00 |
|
Scott Charlton
|
67d807ccf7
|
[IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
|
2018-08-14 19:55:28 -07:00 |
|
Scott Charlton
|
af408f7c9a
|
removed register keywords and updated for misc clang warnings
|
2018-08-14 16:11:36 -07:00 |
|
Scott Charlton
|
b447434d70
|
[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
|
98d075d472
|
Merge commit '9152ca292e2ea2a042a654b6393b6fcd9160e0d4'
|
2018-08-02 22:24:30 -06:00 |
|
Scott R Charlton
|
78b05b072c
|
Merge commit 'ebc4f69cd45b414f2fce86455cd025a2eb762134'
|
2018-08-02 19:37:18 -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
|
e8ae8322eb
|
gammas finished, working on reactants
|
2018-08-01 21:32:10 -06:00 |
|
Scott R Charlton
|
311fa04fe1
|
Merge commit '53148278fc5456fddfcffc2d46aa7ccb7fff0ee9'
|
2018-08-01 18:27:17 -06:00 |
|
Scott R Charlton
|
83e3b8c063
|
Merge commit '4271ca42adb6957392c22a564d82baf99933b166'
|
2018-08-01 15:38:18 -06:00 |
|
Scott R Charlton
|
ae5624d5df
|
Merge commit '2e390fd5ab713c0c135208931dd015935da01f19'
|
2018-08-01 13:25:21 -06:00 |
|
Scott Charlton
|
1d5c59a175
|
Add 'phreeqcpp/' from commit 'da9d06b423a87ed5eae503c0faf779ac11c96027'
git-subtree-dir: phreeqcpp
git-subtree-mainline: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
git-subtree-split: da9d06b423a87ed5eae503c0faf779ac11c96027
|
2018-07-31 16:56:09 -06:00 |
|