bug fix: units of RUNSRF in Catchment #535
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
gmao-rreichle
added
0 diff
…esult from previous commit)
- clarified units of surface runoff, infiltration, and throughfall in subroutines interc(), rzdrain(), srunof() - moved subroutine rzdrain() to lsm_routines.F90 (identical for Catchment and CatchmentCN)
gmao-rreichle
removed
the
Non 0-diff
gmao-rreichle
commented
Feb 6, 2022
| THRUL = THRUL_VOL ! introduced *_VOL variables for clarity | ||
| THRUC = THRUC_VOL | ||
|
|
||
| RUNSRF = RUNSRF * DTSTEP ! convert input surface runoff from flux to "volume" units |
There was a problem hiding this comment.
For reference, the first of two computational changes is here.
gmao-rreichle
commented
Feb 6, 2022
| IF(CATDEF(N) .LT. 0.) THEN | ||
| ! bug fix: RUNSRF in flux units [kg m-2 s-1] for consistency with partition() | ||
| ! reichle, 6 Feb 2022 | ||
| RUNSRF(N)=RUNSRF(N)-CATDEF(N)/DTSTEP |
There was a problem hiding this comment.
For reference, the second of two computational changes is here.
gmao-rreichle
removed
the
Contingent - DNA
rdkoster
approved these changes
Feb 7, 2022
|
Tests summary:
|
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.
[Edited 6 Feb 2022, ~2:45pm, by Reichle]
Problem:
Water fluxes in catchment() are in units of kg m-2 s-1 except RUNSRF:
RUNSRF is in [kg m-2 s-1] into and out of subroutine partition().
Next, RUNSRF is assumed to be in "volume" units [kg m-2] into and out of subroutine rzdrain().
Finally, RUNSRF units going into subroutine srunoff() are [kg m-2] but returned in [kg m-2 s-1].
Also, subroutine interc() has precipitation inputs in flux units [kg m-2 s-1] and returns throughfall in as "volume" [kg m-2].
See attached Word docx for notes.
Also, identical copies of subroutine rzdrain() are included in catchment.F90 and catchmentCN.F90.
WATER_FLUXES_UNITS_IN_CATCHMENT.docx
Solution:
This PR changes the units of RUNSRF for all input and output arguments to be in flux units [kg m-2 s-1], for consistency with the units of all other water fluxes. The calculations within subroutine srunoff() remain in volume units.
The RUNSRF changes are zero-diff (initial tests with GEOSldas passed successfully).
I also tested changing the units of throughfall in the argument lists of interc() and srunoff(), but the result was not 0-diff owing to the additional divisions and multiplications. Rather than deal with a non-zero-diff change, I decided to keep the "volume" units of throughfall and added clarifying comments.
Finally, rzdrain() was moved to lsm_routines.F90. Unfortunately, the move obscures the bug fix needed in rzdrain(). The inline comments below point out the computational changes. All other changes are simply for wiring or cosmetic.
cc: @biljanaorescanin @rdkoster @sdrabenh