Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove extra line from time dimension in history file. #86

Merged
merged 2 commits into from
Feb 24, 2016

Conversation

lizaclark
Copy link
Contributor

Fixes issue #85. _out_data_i has 0 as its initial value, so the time dimension does not need + 1 in the indexing of the out file.

@jhamman
Copy link
Member

jhamman commented Feb 12, 2016

@lizaclark - this looks good. Can you handle the merge conflicts (merge in upstream/develop) then I'll merge into develop.

Thanks!

@lizaclark
Copy link
Contributor Author

@jhamman: I finally resolved the merge conflicts. That kdiff3 sure is handy.

@jhamman
Copy link
Member

jhamman commented Feb 24, 2016

Thanks @lizaclark - merging now.

jhamman pushed a commit that referenced this pull request Feb 24, 2016
Remove extra line from time dimension in history file.
@jhamman jhamman merged commit b7ec3a6 into UW-Hydro:develop Feb 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants