Fix to calculation of OUT_PREC for output files when LAKES=TRUE. #310
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
|
Going to add another commit in a minute... |
…es that top lake basin area matches veg tile area fraction even if VIC does any rescaling.
| @@ -167,6 +167,13 @@ lake_con_struct read_lakeparam(FILE *lakeparam, | |||
| sprintf(tmpstr, "Lake area fraction (%f) for cell (%d) specified in the lake parameter file must be a fraction between 0 and 1.", temp.Cl[0], soil_con.gridcel); | |||
| nrerror(tmpstr); | |||
| } | |||
| if(fabs(1-temp.Cl[0]/veg_con[temp.lake_idx].Cv) > 0.01) { | |||
There was a problem hiding this comment.
Can you run this through uncrustify first? The whitespace is inconsistent with what we use in the updated code. See here for info. Use the uncrustify_VIC_c.cfg as the confit file.
There was a problem hiding this comment.
Actually hold off on that - since 4.2 has not been reformatted anyway. @jhamman : Should this go on a hit fix branch first or can this go directly into master?
|
Also @tbohn, can you redirect this PR to the hotfix.4.2.c branch. |
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.
This addresses issue #308.