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

Feature/move max iter grnd canopy #771

Merged
merged 13 commits into from
Jan 31, 2018

Conversation

dgergel
Copy link
Contributor

@dgergel dgergel commented Jan 16, 2018

Copy link
Member

@jhamman jhamman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. This looks pretty good. One change should be made before we merge.

MAX_ITER_GRND_CANOPY = 0;
if (!options.CLOSE_ENERGY) {
// if not closing energy balance, don't iterate
param.MAX_ITER_GRND_CANOPY = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we move this change to the parameters initialization? No need to reset this variable each timestep.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered doing that but moving it to vic/drivers/shared_all/src/initialize_parameters.c requires using the options struct in that routine, which we don't currently do - do you think that's fine?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I think that it probably cleanest.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated this as you suggested - I'll ping you once the tests pass and it's ready for another review.

@dgergel
Copy link
Contributor Author

dgergel commented Jan 19, 2018

@jhamman this is ready for another review.

@jhamman jhamman merged commit 7b8196a into UW-Hydro:develop Jan 31, 2018
@dgergel dgergel mentioned this pull request Feb 16, 2018
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants