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
|
faa792ee53
|
added new features, inverse and copy
|
2018-08-22 10:57:21 -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
|
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 |
|