-
Notifications
You must be signed in to change notification settings - Fork 12
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
Feat sagehen domain #288
Merged
Merged
Feat sagehen domain #288
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
…f and PRMSSoilzone for non-dprst versions are working but seem wrong.
…unnian flow in drb and removed it before moving to sagehen
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #288 +/- ##
===========================================
- Coverage 75.70% 72.27% -3.44%
===========================================
Files 50 53 +3
Lines 6644 6839 +195
===========================================
- Hits 5030 4943 -87
- Misses 1614 1896 +282 ☔ View full report in Codecov by Sentry. |
… values < 999.0 because it wont work in the presence of dunnian flow
…e with adding __init__
…e with adding __init__
* the handle the fact that PRMSCanopy/intercept modifies pptmix * add time utils for day of month and test all time utils
* remove test_model in favor of test_model_above_snow and test_model_below_snow * add new forcing and yaml files for sagehen_5yr
…d sagehen_5yr to CI
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.
whats-new.rst
api.rst
or it's sub rsts?This PR adds the
sagehen_5yr
domain that will be used to test the addition of cascades to pywatershed. Thissagehen_5yr
domain is a HRU/polygon/unstructured domain. A sagehen gridded domain will be added later. The configuration of this domain differs from the NHM configuration implemented by pywatershed so far in several significant ways listed below. This PR includes the inclusion of the following functionality to support thesagehen_5yr
domain WITHOUT cascades:PRMSRunoff
,PRMSSoilzone
, andPRMSGroundwater
. The sagehen_5yr domain does not run depression storage. We note that the implement is a efficient but potentially bad/wrong and should/could be revisited to close redesign depression storage #280 and during the implementation/subclassing to add cascades. Thesagehen_5yr
CI tests cover these classes in addition to the tests added in PRMSRunoff working without depression storage #279 with the nhm_no_dprst.control configurations of thedrb_2yr
,ucb_2yr
, andhru_1
domains.dunnian_flow
is active in this domain whereas it is not in the NHM configurations/parameters becausesat_threshold
is set to 999 for NHM configurations.dunnian_flow
means thatsroff
is set by bothPRMSRunoff
andPRMSSoilzone
withsroff
being an input toPRMSSoilzone
. TheAdapterNetcdf
class handles modification of input just fine, as it passes the pointer around. Thetest_prms_runoff
is skipped when the minumum ofsat_threshold
is less than 999 because runoff maybe altered inPRMSSoilzone
which the test is not designed to cover. Additionally, the new testtest_prms_below_snow
verifies that dunnian flow is computed properly when it is active.pref_flow_den
is zero but it is active insagehen_5yr
. Thepref_flow_infil_frac
was missing from the metadata and has been added. All the code is now fully implemented for preferential with this PR and is tested in CI bysagehen_5yr
domain tests.PRMSCanopy
that setspptmix
to zero whenhru_snow
> 0 andnetsnow
<nearzero
. This apparently never happened with the NHM configuration. This is the modification of an input/AdapterNetcdf
, as in 2, wherepptmix
is aPRMSAtmosphere
variable and an input toPRMSCanopy
where it is altered.. The existingtest_prms_atmopshere
was easily modified to make the modifications topptmix
before checking the answers this should print a warning. The new testtest_prms_above_snow
checks thatpptmix
is calculated correctly and set in both processes.Bug fixes:
transp_on
in PRMSAtmosphere was improperly implemented but the bug was never triggered by the NHM configuration. This has been fixed.dprst_area_open
was incorrect in PRMSRunoff and was not being checked (it apparently has no affect on other variables). It has been fixed and is being checked.Features: