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

Release/vic.5.0.0 --> master #626

Merged
merged 73 commits into from
Sep 2, 2016
Merged

Release/vic.5.0.0 --> master #626

merged 73 commits into from
Sep 2, 2016

Conversation

jhamman
Copy link
Member

@jhamman jhamman commented Sep 1, 2016

No description provided.

Joe Hamman and others added 30 commits August 18, 2016 08:41
* update docs for vic5

* doc fixes
    - Updated VP forcing variable name in all image driver global
      parameter files (from `shum` to `vp`) to be consistent with image
driver VP unit change in the code
    - Remove sample global parameter files under `sample` directory -
      only keep a single sample global parameter file version under
`VIC_sample_data` repository
Update image driver VP forcing name and remove sample global files
consistent with classic driver forcing units
Updated vic_force in image driver - now input forcing units are consistent with classic driver
…_documentation

added documentation for image driver forcing file
Add templates for github issues and pull requests
Fixed a link to the parameter conversion notebook in the image driver documentation.
Fixed a broken link in image driver documentation
remove all instances of ErrorString
add faq about VIC timestep scheme
Joe Hamman and others added 28 commits August 31, 2016 20:44
* add time bounds to image driver output, timestamp in history files is not the begining of the aggregation window.

* update FAQ docs

* update OutputFormatting docs for time bounds change

* update assert_nan_equal to handle comparison of variables that do not have the spatial dimensions in the domain mask

* respond to code review from @bartnijssen
* fixed typos and other issues in documentation

* removed accidental adding of soil params table

* update with changes from code review
the change in VIC code regarding to shifting the output state file
timestamp to the end of a certain model timestep
fix user warning in setting plotting backend
Conflicts:
	vic/drivers/shared_all/src/vic_time.c
#627)

* fixed discrepancy in directory structure between multiprocessing snotel comparison plotting function and ftp server

* fixed discrepancy in directory structure in fluxnet plotting function

* resolve further directory structure conflicts in plotting scripts
Fixed NYEARS frequency when there are leap years
@jhamman jhamman merged commit 3f377e9 into master Sep 2, 2016
@jhamman jhamman deleted the release/VIC.5.0.0 branch September 2, 2016 20:53
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.

4 participants