Fix wetland yearly and average annual outputs#181
Open
leonard-bernard-jannin wants to merge 2 commits intoswat-model:mainfrom
Open
Fix wetland yearly and average annual outputs#181leonard-bernard-jannin wants to merge 2 commits intoswat-model:mainfrom
leonard-bernard-jannin wants to merge 2 commits intoswat-model:mainfrom
Conversation
Collaborator
|
Looks good to me. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Two bugs in
wetland_output.f90caused incorrectflo_inandflo_outvalues in the yearly (wetland_yr) and average annual (wetland_aa) outputs:Yearly output (
wetland_yr):flo_inandflo_outwere incorrectly divided by 12 before being written. Additionally, the yearly accumulators (wet_in_y,wet_out_y,wet_wat_y) were not reset after writing, causing values to carry over into subsequent years.Average annual output (
wetland_aa):flo_inandflo_outwere averaged using the yearly accumulator (wet_in_y,wet_out_y) instead of the simulation-long accumulator (wet_in_a,wet_out_a), producing wrong average annual values.