Merge pull request #8 from CVPIA-OSC/fix-diversion

Fix units in total diverted
CVPIA-OSC · Aug 5, 2021 · 05e4a85 · 05e4a85
2 parents 9aee0ae + b3ed9bd
commit 05e4a85
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/R/data.R b/R/data.R
@@ -78,7 +78,7 @@
 "mean_flow"
 
 #' Total Flow Diverted
-#' @description A dataset containing the diverted flow in cfs within watersheds for
+#' @description A dataset containing the diverted flow in cms within watersheds for
 #' use with the CVPIA SIT Salmon Population Model.
 #'
 #' @format a 31 by 12 by 21 array [watershed, month, year (1980-2000)]

diff --git a/data-raw/tranform_inputs_complete.R b/data-raw/tranform_inputs_complete.R
@@ -173,6 +173,7 @@ total_diverted <- temp_diver %>%
   select(date:`Cosumnes River`, `Mokelumne River`, `Merced River`:`San Joaquin River`) %>%
   filter(year(date) >= 1980, year(date) <= 2000) %>%
   gather(watershed, tot_diver, -date) %>%
+  mutate(tot_diver = DSMflow::cfs_to_cms(tot_diver)) %>%
   spread(date, tot_diver) %>%
   left_join(DSMflow::watershed_ordering) %>%
   mutate_all(~replace_na(., 0)) %>%

diff --git a/data/total_diverted.rda b/data/total_diverted.rda
diff --git a/man/total_diverted.Rd b/man/total_diverted.Rd