-
Notifications
You must be signed in to change notification settings - Fork 30
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
[1pt] PR: Updating modules with new AEP (NWM V3) #1198
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code changes here look good. A couple of things:
- There are 3 other files in the repo that reference "nwm21" that should probably also get updated to "v3": two are usage (
tools/composite_inundation.py
andtools/inundate_nation.py
) and one is a pytest (unit_tests/inundate_gms_params.json
). - Please merge with the current
dev
branch.
Pytest is going away shortly. The whole unit tests system will disappear with the new docker image update PR coming soon. |
Thanks Matt! I updated those files. |
Sorry, one more thing. There are a few files that have the old path ( |
I found three files with the old path. Two of them are in the unit tests, which Rob mentioned will be removed next week. The other file is |
Hey Zahra - can you paste in a few of your alpha eval comparison plots? It's helpful to have them in the PR in case we ever need to look back. |
Do we have the new high water mark flow files as well? I would like to include that file to this PR addition to the recurrence intervals. |
Yes, they are in |
Hi Zahra, can you please merge dev in again and check in. I can see via the change log that it is fairly out of sync. |
Merge remote-tracking branch 'origin/dev' into dev-update-aep
Rob made a quick fix to the changelog file
Merge remote-tracking branch 'origin/dev' into dev-update-aep
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
This PR updates scripts that use the recurrence flow files and high water thresholds. The new flow files (NWM V3) are in
/inputs/rating_curve/nwm_recur_flows/
and the new high water threshold is in/inputs/rating_curve/bankfull_flows/nwm3_high_water_threshold_cms.csv
.This PR also incorporates Manning numbers for Alaska feature ids, needed for calibration. The new Manning dataset is available on dev1 here:
/dev_fim_share/foss_fim/outputs/ali_alaska_calib/mannings_global_nwm3.csv
Addresses #1189
Changes
src/bash_variables.env
: high water threshold and recurrence flows CSV files were updated into new NWM v3 flow files. Also, a new Manning numbers file created from the new NWM v3 dataset was used.src/src_adjust_ras2fim_rating.py
: 100 year recurrence was removed since it is not included in the new AEP.src/src_adjust_usgs_rating_trace.py
: 100 year recurrence was removed since it is not included in the new AEP.tools/rating_curve_comparison.py
: 100 year recurrence was removed since it is not included in the new AEP. Also, the name of recurrence flow CSV file was updated.tools/composite_inundation.py
tools/inundate_nation.py
Testing
Also, made a successful FIM run on Alaska HUC 19020302 using the new Manning number file (based on NWM V3 feature ids which now include Alaska feature ids). The run successfully applied the calibration from a USGS gage within the HUC. Plot below shows a typical change in SRC for one of HydroIDs:
Alpha test results below confirm validity of the above calibration:
Issuer Checklist (For developer use)
You may update this checklist before and/or after creating the PR. If you're unsure about any of them, please ask, we're here to help! These items are what we are going to look for before merging your code.
[_pt] PR: <description>
dev
branch (the default branch), you have a descriptive Feature Branch name using the format:dev-<description-of-change>
(e.g.dev-revise-levee-masking
)dev
branchpre-commit
hooks were run locally/foss_fim/
, run:pytest unit_tests/
)4.x.x.x
Merge Checklist (For Technical Lead use only)