Merge pull request #96 from FLARE-forecast/main

Pulling in updates from main to dev branch
FLARE-forecast · Nov 22, 2024 · c0b38da · c0b38da
2 parents 0eb7608 + 4760f5e
commit c0b38da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -5,6 +5,7 @@ on:
     branches: [main, master]
   pull_request:
     branches: [main, master]
+  workflow_dispatch:
 
 name: R-CMD-check.yaml
 

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -5,6 +5,7 @@ on:
     branches: [main, master]
   pull_request:
     branches: [main, master]
+  workflow_dispatch:
 
 name: test-coverage.yaml
 

diff --git a/R/create_flow_files.R b/R/create_flow_files.R
@@ -38,6 +38,8 @@ create_flow_files <- function(flow_forecast_dir = NULL,
 
   lake_name_code <- site_id
 
+  round_level <- 10
+
   # set locations of flow drivers (s3 or local)
   if (!is.null(flow_forecast_dir) & !is.null(flow_historical_dir)) {
     if (use_s3) {
@@ -173,7 +175,7 @@ create_flow_files <- function(flow_forecast_dir = NULL,
           tidyr::pivot_wider(names_from = variable, values_from = prediction) |>
           dplyr::rename(time = datetime) |>
           dplyr::select(dplyr::all_of(variables)) |>
-          dplyr::mutate_if(where(is.numeric), list(~round(., 4)))
+          dplyr::mutate_if(where(is.numeric), list(~round(., round_level)))
 
         # generate the historical period
         hist_ens <- hist_df |>
@@ -184,7 +186,7 @@ create_flow_files <- function(flow_forecast_dir = NULL,
           tidyr::pivot_wider(names_from = variable, values_from = prediction) |>
           dplyr::rename(time = datetime) |>
           dplyr::select(dplyr::all_of(variables)) |>
-          dplyr::mutate_if(where(is.numeric), list(~round(., 4)))
+          dplyr::mutate_if(where(is.numeric), list(~round(., round_level)))
 
         # combine to single df
         flow <- dplyr::bind_rows(hist_ens,
@@ -235,7 +237,7 @@ create_flow_files <- function(flow_forecast_dir = NULL,
           tidyr::pivot_wider(names_from = variable, values_from = prediction) |>
           dplyr::rename(time = datetime) |>
           dplyr::select(dplyr::all_of(variables)) |>
-          dplyr::mutate_if(where(is.numeric), list(~round(., 4)))
+          dplyr::mutate_if(where(is.numeric), list(~round(., round_level)))
 
 
         flow <- hist_ens |>
@@ -282,7 +284,7 @@ create_flow_files <- function(flow_forecast_dir = NULL,
           tidyr::pivot_wider(names_from = variable, values_from = prediction) |>
           dplyr::rename(time = datetime) |>
           dplyr::select(dplyr::all_of(variables)) |>
-          dplyr::mutate_if(where(is.numeric), list(~round(., 4)))
+          dplyr::mutate_if(where(is.numeric), list(~round(., round_level)))
 
 
         flow <- future_ens |>