Scott R Charlton
|
788a8426a0
|
Merge commit '1e4a2941b3b1d0cecacd0bba8c0252b87e74dca8'
|
2019-01-30 21:34:42 -07:00 |
|
Scott R Charlton
|
1e4a2941b3
|
Merge commit 'bd4fc256a6f168e127f6d2b783653c890c23a231'
|
2019-01-30 21:34:30 -07:00 |
|
David L Parkhurst
|
bd4fc256a6
|
Merge branch 'tony20190117' into 'master'
skipping restart
See merge request coupled/phreeqc3!21
|
2019-01-30 21:32:16 -07:00 |
|
David Parkhurst
|
71c994b6d4
|
skipping restart
|
2019-01-30 21:29:11 -07:00 |
|
Scott R Charlton
|
b38349aa36
|
Merge commit '3b7308661a560e4d0984da531dbeb155a2420d1a'
|
2019-01-30 18:36:43 -07:00 |
|
Scott R Charlton
|
3b7308661a
|
Merge commit '1257f8c7c984818ead2402595470f93d96db76ca'
|
2019-01-30 18:31:14 -07:00 |
|
Scott R Charlton
|
2431c5b33e
|
Merge commit 'f0c3701bdee8ef3901b9b50698eb46b61574d086'
|
2019-01-30 18:20:34 -07:00 |
|
Scott R Charlton
|
1257f8c7c9
|
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 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 R Charlton
|
f485cbe944
|
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 R Charlton
|
9cbf676df3
|
Merge commit 'fbde6453ae53afa9bd4910ff00b48ecccc1153b8'
|
2019-01-30 17:20:34 -07:00 |
|
Scott R Charlton
|
fbde6453ae
|
Merge branch 'issue-2' into 'master'
Issue 2
See merge request coupled/IPhreeqc!7
|
2019-01-30 17:12:46 -07:00 |
|
Scott R Charlton
|
7237eb267d
|
Merge branch 'issue-2' into 'master'
Issue 2
See merge request coupled/IPhreeqc!7
|
2019-01-30 17:12:46 -07:00 |
|
Scott Charlton
|
ce33478c29
|
Fixed -Wcatch-value warnings reported by CRAN
|
2019-01-29 16:04:01 -08:00 |
|
Scott Charlton
|
c88ff034bc
|
Fixed -Wcatch-value warnings reported by CRAN
|
2019-01-29 16:04:01 -08:00 |
|
Scott Charlton
|
e3ea51f8eb
|
Fixed -Wcatch-value warnings reported by CRAN
|
2019-01-29 16:04:01 -08:00 |
|
Scott R Charlton
|
d157977bcd
|
Merge commit '548aead510d42fd3998eb74be8a5f94396c69bea'
|
2019-01-29 11:10:59 -07:00 |
|
Scott R Charlton
|
548aead510
|
Merge commit '040fd95fadbc2cd62df3c056ef7a41e10c8b7a29'
|
2019-01-29 11:10:34 -07:00 |
|
David Parkhurst
|
040fd95fad
|
include restart, remove ex20_debug
|
2019-01-29 11:03:15 -07:00 |
|
Scott R Charlton
|
1eb3ed948a
|
Merge commit '12df06b34cba4744a36bf519bb7298caf98a320a'
|
2019-01-28 22:14:47 -07:00 |
|
Scott R Charlton
|
12df06b34c
|
Merge commit 'd57264d9733b6f5687d8b7d87f5e9a8aad7e7d71'
|
2019-01-28 22:14:36 -07:00 |
|
David Parkhurst
|
d57264d973
|
2. changes to solid solution numerical method
|
2019-01-28 22:08:04 -07:00 |
|
Scott R Charlton
|
1bbc004477
|
Merge commit '43386a0bc4d26c2891a23c27cfb2bae0f6cec9eb'
|
2019-01-28 21:20:43 -07:00 |
|
Scott R Charlton
|
43386a0bc4
|
Merge commit '3fd8155d566798e121a1f54418f901cdd0db5e6c'
|
2019-01-28 21:20:14 -07:00 |
|
David Parkhurst
|
3fd8155d56
|
changes to solid solution numerical method
|
2019-01-28 21:08:54 -07:00 |
|
Scott R Charlton
|
f56958652e
|
Merge commit 'f90fc5afeaa5347ef057416551bb406e8ce5d855'
|
2019-01-28 18:20:25 -07:00 |
|
Scott R Charlton
|
f90fc5afea
|
Merge commit '2b14a9475c1cb0c64d3adaf67a907b63ea454c9c'
|
2019-01-28 18:19:55 -07:00 |
|
David Parkhurst
|
2b14a9475c
|
Tony's changes 20190117
|
2019-01-28 17:24:59 -07:00 |
|
Scott R Charlton
|
9d51f5cf64
|
Added code to record git commit hash
|
2019-01-28 16:41:11 -07:00 |
|
Scott R Charlton
|
4c7946afb5
|
Added code to record git commit hash
|
2019-01-28 16:41:11 -07:00 |
|
Scott R Charlton
|
ad4fc43e3b
|
Merge commit '1a4422b8af0f7801aa8cfcff161804516ac50910'
|
2018-12-11 17:55:34 -07:00 |
|
Scott R Charlton
|
1a4422b8af
|
Merge commit 'ae6e8b05440ea1db35226a479daf5d3b4a05690a'
|
2018-12-11 17:54:50 -07:00 |
|
Scott R Charlton
|
6091a42e2b
|
Merge commit '1bfc9f49d032d42460c4e993f3aafc8a3f341625'
|
2018-12-11 17:50:24 -07:00 |
|
David L Parkhurst
|
1bfc9f49d0
|
Merge branch 'master' into 'master'
added modify methods for restart files
See merge request coupled/phast3!8
|
2018-12-11 17:35:17 -07:00 |
|
David Parkhurst
|
ae6e8b0544
|
added modify methods for restart files
|
2018-12-11 17:17:49 -07:00 |
|
David Parkhurst
|
fa7776b8fe
|
added modify methods for restart files
|
2018-12-11 17:17:49 -07:00 |
|
Scott R Charlton
|
8170cb9824
|
Merge commit '749c3e09ee53cd345d1375e72ebf3c10591581b2'
|
2018-12-06 13:54:54 -07:00 |
|
Scott R Charlton
|
749c3e09ee
|
Merge commit 'b500c5448b613a20c48a08237460c3b495d3d390'
|
2018-12-06 13:54:43 -07:00 |
|
Scott R Charlton
|
eefd6bfa78
|
Merge commit '1150a4a2aa4b6957fbf8bb2cf1d0c58ce8cf81d5'
|
2018-12-06 13:50:29 -07:00 |
|
David Parkhurst
|
b500c5448b
|
changed restart file to include UZ
|
2018-11-30 17:41:13 -07:00 |
|
David Parkhurst
|
1150a4a2aa
|
changed restart file to include UZ
|
2018-11-30 17:41:13 -07:00 |
|
Scott R Charlton
|
fdb8d13703
|
Merge commit 'c2dada993c2edb3f80f9bae636ace9b099073051'
|
2018-11-07 23:14:47 -07:00 |
|
Scott R Charlton
|
c2dada993c
|
Merge commit 'fffac6d359c01544c617aae6717678f0fd884193'
|
2018-11-07 23:14:22 -07:00 |
|
David Parkhurst
|
fffac6d359
|
another try for ex20_debug
|
2018-11-07 23:04:05 -07:00 |
|
Scott R Charlton
|
85c8d55a4b
|
Merge commit '4235170d91bbc77f6775c141ada27b130518329b'
|
2018-11-07 20:11:06 -07:00 |
|
Scott R Charlton
|
4235170d91
|
Merge commit 'fa5ee5049432867a5161fcd97aebe475854fffdb'
|
2018-11-07 20:10:00 -07:00 |
|
David Parkhurst
|
fa5ee50494
|
fix problem with ex20_debug
|
2018-11-07 20:03:36 -07:00 |
|
Scott R Charlton
|
a8730c6e95
|
Merge commit '65dbd2c15b866dd75bc66faab28f0761ebaf348d'
|
2018-11-07 16:21:51 -07:00 |
|
Scott R Charlton
|
65dbd2c15b
|
Merge commit 'd99390113028519f41895af04cedba4a43258336'
|
2018-11-07 16:20:41 -07:00 |
|
David Parkhurst
|
d993901130
|
encoding, limit.h
|
2018-11-07 15:41:07 -07:00 |
|