2935 Commits

Author SHA1 Message Date
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
06959712bf 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
f57eb04ca0 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
ae3954ec33 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
b4c9cbda02 [IPhreeqc] added parens for clang++ -Wlogical-op-parentheses 2018-08-14 19:55:28 -07:00
Scott R Charlton
8d2549415e 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
8f8e4af4ef 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
43ecba6aaa 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 R Charlton
be80efbc8c Merge branch 'cran-warnings' into 'master'
removed register keywords and updated for misc clang warnings

See merge request coupled/IPhreeqc!5
2018-08-14 17:21:17 -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
7f3b3f7fab 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
08d6c796a9 Merge branch 'cran-license' into 'master'
[IPhreeqc] Changed license

See merge request coupled/IPhreeqc!4
2018-08-13 19:04:23 -06:00
Scott R Charlton
2e210e2a86 [IPhreeqc] Changed license 2018-08-13 18:56:56 -06:00
Scott R Charlton
98fb1bc5fa Merge branch 'squash-cran-3.4.7' into 'master'
[iphreeqc] fixed makefile examples for R

See merge request coupled/IPhreeqc!3
2018-08-09 13:50:00 -06:00
Scott R Charlton
718f801af7 [iphreeqc] fixed makefile examples 2018-08-09 13:48:27 -06:00
Scott R Charlton
2bd5ca634d Merge commit '487accaf235b9930e001d227ea7a3a8639f77f55' 2018-08-09 13:20:20 -06:00
Scott R Charlton
487accaf23 Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388' 2018-08-09 13:17:35 -06:00
Scott R Charlton
4552507a70 Merge commit 'b447434d70ec2b8dac6087b17a0bd4dfaee0240f' 2018-08-09 13:00:16 -06:00
Scott R Charlton
4f72d9fb4d Merge branch 'squash-cran-3.4.7' into 'master'
[iphreeqc] Changes for CRAN 3.4.7

See merge request coupled/IPhreeqc!2
2018-08-09 12:45:39 -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 Charlton
3e57c50456 [iphreeqc] Changes for CRAN 3.4.7 2018-08-09 12:42:50 -06:00
Scott R Charlton
ed9af14319 Merge commit 'b48944232055d481aa15138b4802159ad321495b' 2018-08-06 14:29:34 -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
68d20a18a1 Merge commit 'ca5e069a50badc82a2034ac805badf3d0d81e0b6' 2018-08-02 23:25:23 -06:00
Scott R Charlton
3541672f18 Merge branch 'issue-1' into 'master'
Closes #1

Closes #1

See merge request coupled/IPhreeqc!1
2018-08-02 23:19:10 -06:00
Scott R Charlton
ca5e069a50 Closes #1 2018-08-02 23:18:10 -06:00
Scott R Charlton
4ea53c4409 Closes #1 2018-08-02 23:18:10 -06:00
Scott R Charlton
9162598cad Merge commit '98d075d472c5d31b1be2626e1b861ec31324a81d' 2018-08-02 22:24:43 -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
26c0a12733 Merge commit '78b05b072cfbc390ad9fa525872dfe5ff4ba99cf' 2018-08-02 19:37:30 -06:00
Scott R Charlton
e3da23912a Merge commit 'dd597b1187b6cbfbb271fa39575dea62c2f7247e' 2018-08-02 19:37:29 -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
dd597b1187 Fixed bug where 1W was interpreted as an isotope 2018-08-02 19:29:07 -06:00
David Parkhurst
97a0cec3fe Fixed bug where 1W was interpreted as an isotope 2018-08-02 19:29:07 -06:00