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: v4.5.0.0 bug fixes #1150

Merged
merged 12 commits into from May 9, 2024
Merged

[1pt] PR: v4.5.0.0 bug fixes #1150

merged 12 commits into from May 9, 2024

Conversation

mluck
Copy link
Contributor

@mluck mluck commented May 7, 2024

Fixes two bugs discovered in v4.5.0.0:

  1. echo missing in bash command
  2. raster resolution of dem_meters.tif has now been explicitly set in gdalwarp.

Closes #1131 and closes #1148 and closes #1153.

Changes

  • src/
    • add_crosswalk.py: fixed stream order if max > max_order
    • bash_variables.env: added res environment variable for default raster cell size
    • delineate_hydros_and_produce_HAND.sh: added missing echo
    • heal_bridges_osm.py: fixed raster resolution and number of rows/columns
    • run_unit_wb.sh: added -tr to gdalwarp when generating dem_meters.tif; removed extraneous Tcount

Testing

Ran fim_pipeline.sh and verified that no errors occurred and the dem_meters.tif raster resolutions is exactly 10 meters.

Deployment Plan (For developer use)

How does the changes affect the product?

  • Code only?
  • Require new or adjusted data inputs. Does it have start, end and duration code (in UTC)?
  • If new or updated data updates, has FIM related code been updated and tested?
  • Require new pre-clip set?
  • Has new or updated python packages?
  • If applicable, is the deployment plan be calculated and work with Deployment person/team?

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.

  • Informative and human-readable title, using the format: [_pt] PR: <description>
  • Links are provided if this PR resolves an issue, or depends on another other PR
  • If submitting a PR to the 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)
  • Changes are limited to a single goal (no scope creep)
  • The feature branch you're submitting as a PR is up to date (merged) with the latest dev branch
  • pre-commit hooks were run locally
  • Any change in functionality is tested
  • Passes all unit tests locally (inside interactive Docker container, at /foss_fim/, run: pytest unit_tests/)
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • CHANGELOG updated with template version number, e.g. 4.x.x.x
  • Reviewers requested
  • Add yourself as an assignee in the PR as well as the FIM Technical Lead

Merge Checklist (For Technical Lead use only)

  • Update CHANGELOG with latest version number and merge date
  • Update the Citation.cff file to reflect the latest version number in the CHANGELOG
  • If applicable, update README with major alterations

@mluck mluck added the bug Something isn't working label May 7, 2024
@mluck mluck requested a review from RobHanna-NOAA May 7, 2024 17:27
@mluck mluck self-assigned this May 7, 2024
@mluck mluck linked an issue May 7, 2024 that may be closed by this pull request
@mluck
Copy link
Contributor Author

mluck commented May 7, 2024

I added res=10 as an environment variable in bash_variables.env. For now, it's only used in the gdalwarp command that creates dem_meters.tif from the VRT.

There are other places where those environment variables should replace hardcoded resolutions (e.g., inundate_nation.py, acquire_and_preprocess_3dep_dems.py, and likely others) but that will be addressed in a separate issue.

RobHanna-NOAA
RobHanna-NOAA previously approved these changes May 8, 2024
@CarsonPruitt-NOAA CarsonPruitt-NOAA merged commit 45a0430 into dev May 9, 2024
1 check passed
@CarsonPruitt-NOAA CarsonPruitt-NOAA deleted the dev-fix-alaska-bridges branch May 9, 2024 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
3 participants