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

Fix OUTPUT_FORCE option. #307

Merged
merged 3 commits into from
Dec 10, 2015
Merged

Fix OUTPUT_FORCE option. #307

merged 3 commits into from
Dec 10, 2015

Conversation

tbohn
Copy link
Contributor

@tbohn tbohn commented Nov 15, 2015

This addresses the requirement that initialize_atmos() have information about the number of veg tiles in the grid cell to know how to read the forcing files (if they contain timeseries of LAI, vegcover, or albedo). Previously VIC wasn't reading the veg lib/param files when in OUTPUT_FORCE mode, which resulted in segmentation faults when trying to access veg_lib or veg_param data structures. Now VIC reads those files even in OUTPUT_FORCE mode.

This addresses issue #305.

…ze_atmos() have information about the number of veg tiles in the grid cell to know how to read the forcing files (if they contain timeseries of LAI, vegcover, or albedo). Previously VIC wasn't reading the veg lib/param files when in OUTPUT_FORCE mode, which resulted in segmentation faults when trying to access veg_lib or veg_param data structures. Now VIC reads those files even in OUTPUT_FORCE mode.
@jhamman
Copy link
Member

jhamman commented Nov 16, 2015

Thanks @tbohn -

Can you show a comparison of VIC 4.1.2 with OUTPUT_FORCE on vs this branch?

@tbohn
Copy link
Contributor Author

tbohn commented Nov 16, 2015

You mean plot the outputs?

On Mon, Nov 16, 2015 at 9:49 AM, Joe Hamman notifications@github.com
wrote:

Thanks @tbohn https://github.com/tbohn -

Can you show a comparison of VIC 4.1.2 with OUTPUT_FORCE on vs this
branch?


Reply to this email directly or view it on GitHub
#307 (comment).

@jhamman
Copy link
Member

jhamman commented Nov 16, 2015

Yes - I think a test either plotting the outputs or numerical comparison is all we need to move on here.

@tbohn
Copy link
Contributor Author

tbohn commented Nov 16, 2015

I just ran the two versions on a test grid cell and the results were
exactly the same - I did a diff of the files. Is my telling you this
sufficient?

On Mon, Nov 16, 2015 at 10:04 AM, Joe Hamman notifications@github.com
wrote:

Yes - I think a test either plotting the outputs or numerical comparison
is all we need to move on here.


Reply to this email directly or view it on GitHub
#307 (comment).

@jhamman
Copy link
Member

jhamman commented Dec 5, 2015

@bartnijssen - This is ready for your review.

}
if(NF>1) veg_hist[rec][v].LAI[NR] = sum / (float)NF;
sum += veg_hist[rec][v].LAI[i];
Copy link
Member

Choose a reason for hiding this comment

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

Fix indentation on this line

@bartnijssen
Copy link
Member

1 indentation fix. @jhamman : After that, please go ahead and merge.

@jhamman
Copy link
Member

jhamman commented Dec 9, 2015

@tbohn - this just needs one update and a rebase. Then 4.2.c is good to go.

@tbohn
Copy link
Contributor Author

tbohn commented Dec 9, 2015

Can you be more specific about what I need to do (which github actions do I
need to take, on which branches)?

On Wed, Dec 9, 2015 at 9:12 AM, Joe Hamman notifications@github.com wrote:

@tbohn https://github.com/tbohn - this just needs one update and a
rebase. Then 4.2.c is good to go.


Reply to this email directly or view it on GitHub
#307 (comment).

@jhamman
Copy link
Member

jhamman commented Dec 9, 2015

@tbohn -

This branch has merge conflicts that you need to resolve. You can do that by merging upstream/master into this branch or by rebasing against the current upstream/master?

@tbohn
Copy link
Contributor Author

tbohn commented Dec 10, 2015

@jhamman OK, I believe I've resolved the merge conflicts. If you can look it over and let me know what you think, that would be great.

jhamman pushed a commit that referenced this pull request Dec 10, 2015
@jhamman jhamman merged commit f08daac into UW-Hydro:hotfix/4.2.c Dec 10, 2015
@jhamman
Copy link
Member

jhamman commented Dec 10, 2015

Looks good. Thanks @tbohn.

@jhamman jhamman added this to the 4.2.c milestone Dec 10, 2015
@tbohn tbohn deleted the hotfix/4.2.c branch January 19, 2016 06:08
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.

3 participants