Merge hotfix/5.0.1 into master #676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
update command line usage docs
* Fixed image driver history file name timetamp - now is timstep-beginning * Added release notes about PR #635 (fixing image driver history filename timestamp)
Added an if statement so that when VIC is run on multiple nodes, only the master node will validate state file dimensions and coordinate variables.
Use multiple processors for image restart tests
Fixing a problem with image restarts when using multiple processors
* Fixed a bug when calculating steps of forcing to skip - should round to integer first before converting to int type to prevent possible 1-timestep wrong offset * Added bug fix release notes to PR#639
…er type (#645) * Added check to ensure mask varible in domain file is integer type * Cleaned up some printing lines * Added get_nc_var_type.c * Minor update of comments and ReleaseNotes * Added domain file description in docs * Small fix of table in docs * Added ncdump -h results for domain file in docs * Minor docs update
* Added check to ensure mask varible in domain file is integer type * Cleaned up some printing lines * Added get_nc_var_type.c * Minor update of comments and ReleaseNotes * Added domain file description in docs * Small fix of table in docs * Added ncdump -h results for domain file in docs * Minor docs update * The input arguments to function `make_lastday` are sometimes in a wrong order - fixed the bug * Added ReleaseNotes regarding PR#647
… the 2-D lats/lons were written as fill values to the state file rather than lats/lons
the same step as snow model step. Now the model does the correct check
… removed" This reverts commit ca3cad3.
fix deprecated options MIN_RAIN_TEMP and MAX_SNOW_TEMP
fix several typos in comments
fixed bug in writing statefile for 2-d lat/lon dimensions
Fixed a bug on forcing timestep checking - image driver
variables should be spatially distributed
output state file, image driver
Fix dz_node and node_depth in image statefile
this PR adds a release entry note to PR #652
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.
info into a separate function
Fix run_cell bug in image driver
fix location of github templates
Fix/tests
* Fixed time precision issue for long VIC runs * Added release note for the time precision bug fix * Minor release note update
Fixed a bug - `forceskip` should be reset to zero at the beginning of every year
Update version strings etc. for release 5.0.1
|
(this PR should NOT be merged with the "Squash and merge" option). |
|
@jhamman I guess Diana and I don't have permission to merge PR's into master - do you want to do it? |
jhamman
approved these changes
Feb 1, 2017
|
@yixinmao -- done. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.