From d76a0c3395f93823935fcf38149989da969d30e0 Mon Sep 17 00:00:00 2001 From: Ty Garber Date: Thu, 31 Oct 2024 16:30:25 -0700 Subject: [PATCH] fixes msf reporting w/ msp --- R/report_msf_chinook.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/report_msf_chinook.R b/R/report_msf_chinook.R index 0786a49..b814c77 100644 --- a/R/report_msf_chinook.R +++ b/R/report_msf_chinook.R @@ -7,7 +7,7 @@ #' msf_mortalities_chinook_ <- function(fram_db){ mortalities_ <- fram_db |> - fetch_table('Mortality') + msp_mortality() mortalities_ <- mortalities_ |> dplyr::select(.data$run_id:.data$time_step, dplyr::starts_with('msf_')) |> @@ -52,7 +52,7 @@ msf_mortalities_chinook_ <- function(fram_db){ msf_encounters_chinook_ <- function(fram_db){ encounters_ <- fram_db |> - fetch_table('Mortality') + msp_mortality() # ensure the correct rates are always used sublegal_mortality_rates <- DBI::dbGetQuery( @@ -95,7 +95,7 @@ msf_encounters_chinook_ <- function(fram_db){ #' msf_landed_catch_chinook_ <- function(fram_db){ landed_catch_ <- fram_db |> - fetch_table('Mortality') + msp_mortality() landed_catch <- landed_catch_ |> dplyr::select(.data$run_id, .data$stock_id, .data$fishery_id, .data$time_step, .data$msf_landed_catch, .data$msf_shaker) |>