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

Fix run_cell bug in image driver #662

Merged
merged 4 commits into from Jan 13, 2017

Conversation

Projects
None yet
3 participants
@yixinmao
Contributor

yixinmao commented Jan 5, 2017

Before this PR, active cell is controlled by mask variable in the domain file in image driver. Now after the fix in this PR, run_cell variable in the parameter file controls active cells. Specifically, we
re-organized get_global_domain function to:
1) use run_cellvariable from the parameter file to determine
active cell (instead of the mask variable in the domain file);
2) lat and lon coordinates loading is put into a separated function;
3) the step of checking whether the latlons in the parameter file
match the domain file is moved to early on in the get_global_domain
function.

Some docs updates related to this change is also incorporated. The Stehekin sample dataset is updated to be unambiguous in the VIC_sample_data repo (UW-Hydro/VIC_sample_data#16).

ymao added some commits Jan 4, 2017

ymao
Now run_cell controls active cells in the image driver. Specifically, we
re-organized `get_global_domain` function to:
    1) use `run_cell`variable from the parameter file to determine
active  cell (instead of the `mask` variable in the domain file);
    2) lat and lon coordinates loading is put into a separated function;
    3) the step of checking whether the latlons in the parameter file
match the domain file is moved to early on in the `get_global_domain`
function.
@yixinmao

This comment has been minimized.

Show comment
Hide comment
@yixinmao

yixinmao Jan 5, 2017

Contributor

@jhamman this PR is ready for review.

Contributor

yixinmao commented Jan 5, 2017

@jhamman this PR is ready for review.

@jhamman

jhamman approved these changes Jan 5, 2017

Looks good but I have a few small questions.

Show outdated Hide outdated vic/drivers/shared_image/src/get_global_domain.c Outdated
Show outdated Hide outdated vic/drivers/shared_image/src/get_global_domain.c Outdated
@bartnijssen

This comment has been minimized.

Show comment
Hide comment
@bartnijssen
Member

bartnijssen commented Jan 9, 2017

@yixinmao : Please address https://github.com/UW-Hydro/VIC/pull/662/files#r95245324 and I'll merge after that

@yixinmao

This comment has been minimized.

Show comment
Hide comment
@yixinmao

yixinmao Jan 10, 2017

Contributor

@bartnijssen I've made the change as you suggested. Should be able to merge.

Contributor

yixinmao commented Jan 10, 2017

@bartnijssen I've made the change as you suggested. Should be able to merge.

@bartnijssen bartnijssen merged commit 5862657 into UW-Hydro:hotfix/5.0.1 Jan 13, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment