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.

Sign up for GitHub

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

Issue544 #545

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Issue544 #545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3976547
fix #544
smnorris Jul 11, 2024
84620f2
Merge branch 'main' into issue544
smnorris Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions model/01_access/sql/model_access_bt.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ obs_upstr as
false,
20 -- a large tolerance to discard observations at more or less the same location as the barrier (within 20m)
)
-- do not bother counting observations upstream of barriers that have been noted as barriers in the user control table
left outer join bcfishpass.user_barriers_definite_control bc
on b.blue_line_key = bc.blue_line_key and abs(b.downstream_route_measure - bc.downstream_route_measure) < 1
where o.species_code in ('BT','CH','CM','CO','PK','SK','ST')
and bc.barrier_ind is null
),

obs_upstr_n as
Expand Down
Loading