Skip to content
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: Incorporate CatFIM flows into Sierra Test and add AHPS benchmark preprocessing scripts. #365

Merged
merged 28 commits into from
Apr 27, 2021

Conversation

TrevorGrout-NOAA
Copy link
Contributor

This PR addresses Tickets #341, #361, #357

Additions

  • Added preprocessing scripts:
    *preprocess_download_usgs_grids.py: Downloads data from USGS FIM studies
    *preprocess_ahps_usgs.py: Produces benchmark USGS datasets
    *preprocess_ahps_nws.py: Produces benchmark NWS datasets

The preprocessing scripts are meant to be run on the local workstation, not the VM, and require numerous file dependencies.

  • rating_curve_get_usgs_gages.py: added functionality to produce csv containing all categorical thresholds for each USGS gage site.
  • Added variables to .env.template associated with preprocessing ahps datasets.

Removals

Changes

-Updated rating_curve_comparison.py to ingest categorical threshold flows for each USGS gage site.

  • Updated eval_plots.py to produce individual plots in same directory instead of in nested subdirectories

Testing

  1. Preprocessing not functional on VM due to numerous file dependencies. It was tested and verified that it worked on the workstation connected to NWC network

  2. To run eval_plots with new individual setting:
    python3 eval_plots.py -m /path/to/all_official_versions.csv -v fim_3_0_15_2_ms -i -w /path/to/workspace
    image

  3. To run sierra test with new catfim flows
    python3 rating_curve_comparison.py -fim_dir /path/to/fimdir -output_dir /path/to/outputs -gages /path/to/usgs_rating_curves.csv -flows /path/to/nwm_recurr_flows -catfim /path/to/catfim_flows_cms.csv -j 10 -group 'location_id recurr_interval'

image

Screenshots

Notes

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Visually tested in supported browsers and devices (see checklist below 👇)
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist

Target Environment support

  • Windows
  • Linux
  • Browser

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

…values, add script to download usgs datasets, update .env file
…vidual plots in the same directory instead of nested in subdirectories
@TrevorGrout-NOAA
Copy link
Contributor Author

The preprocessing scripts were successfully run on local workstations at the NWC. Ryan Spies reviewed the original preprocessing scripts in January. This version of the preprocessing scripts were altered to account for WRDS updates and to update the analysis extent to have holes filled.

BrianAvant
BrianAvant previously approved these changes Apr 27, 2021
@TrevorGrout-NOAA
Copy link
Contributor Author

@nickchadwick-noaa @BradfordBates-NOAA this is ready to be merged in with dev.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants