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

Updates to rankings #558

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Updates to rankings #558

merged 3 commits into from
Aug 8, 2024

Conversation

andrewp-CWF
Copy link
Collaborator

Includes changes regarding model updates, elkr up/downstream rankings, creating the ranked list tables in the wcrp schemas, and a fix to an issue with barrier grouping

- replaced elkr with separate rankings for upstream and downstream elko dam
- fixed fwa_upstream calls to reference crossings table by alias
- barriers_anthropogenic_<species>_upstr_count -> barriers_anthropogenic_habitat_wcrp_upstr_count
- Added query to create the table for the specific wcrp by joining crossings_wcrp_vw fields with wcrp_ranked_barriers fields
- Fixed issue where barriers with no habitat immediately upstream were not included in ranking when habitat exists farther upstream beyond other barriers
Copy link
Owner

@smnorris smnorris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you resolve the minor conflicts?

@andrewp-CWF
Copy link
Collaborator Author

Conflicts should be fixed now

@smnorris smnorris merged commit 359e322 into main Aug 8, 2024
4 checks passed
@smnorris smnorris deleted the rankings branch August 8, 2024 15:45
smnorris added a commit that referenced this pull request Aug 8, 2024
* main:
  Added permission assignment to auto_rank.py (#561)
  Updates to rankings (#558)
  LNIC_Updates_2024-07-30 (#557)
  Thom/Shu trib review updates (#554)
smnorris added a commit that referenced this pull request Sep 29, 2024
* main: (49 commits)
  Horsefly updates 2024-09-26 (#569)
  fix #568 (#570)
  note that cwf param includes all salmon watersheds
  remove 'known habitat' from observations upstream of falls on Cayenne Creek that appear to be in error
  Ranking update (#562)
  re-order drops
  drop all fptwg reporting and manually restore after migration
  add missing migrate script
  Issue559 (#560)
  Added permission assignment to auto_rank.py (#561)
  Updates to rankings (#558)
  LNIC_Updates_2024-07-30 (#557)
  Thom/Shu trib review updates (#554)
  LNIC_Updates_2024-07-11 (#555)
  linear job execution
  fix #551
  to avoid data precision issues (where falls and observations are in much the same location) observed habitat must be 200m upstream of a natural barrier to cancel that barrier
  remove redundant fiss spawning point that cancels englishman falls, adjust PSF CO spawning to end below falls
  temp workaround for issue551, do not build modelled crossings (#552)
  Update auto_rank.py (#550)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants