Merge pull request #1 from KWB-R/dev

Dev

Author: mrustl

DESCRIPTION

@@ -1,11 +1,11 @@
 Package: kwb.BerlinWaterModel.public
 Title: R Package of Berlin Water Model
-Version: 0.1.0
+Version: 0.2.0
 Authors@R: c(
-    person("Daniel", "Wicke", , "daniel.wicke@kompetenz-wasser.de", role = "aut",
-           comment = c(ORCID = "0000-0002-5722-5433")),
     person("Michael", "Rustler", , "michael.rustler@kompetenz-wasser.de", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-0647-7726")),
+    person("Daniel", "Wicke", , "daniel.wicke@kompetenz-wasser.de", role = "aut",
+           comment = c(ORCID = "0000-0002-5722-5433")),
     person("IMPETUS", role = "fnd"),
     person("Kompetenzzentrum Wasser Berlin gGmbH (KWB)", role = "cph")
   )
@@ -36,7 +36,9 @@ Imports:
     units
 Suggests: 
     covr,
+    DT,
     knitr,
+    openxlsx, 
     rmarkdown
 VignetteBuilder: 
     knitr

NEWS.md

@@ -1,10 +1,15 @@
+# [kwb.BerlinWaterModel.public 0.2.0](https://github.com/KWB-R/kwb.BerlinWaterModel.public/releases/tag/v0.2.0) <small>2026-03-20</small>
+
+* Finalisation of example input dataset for year 2019 (including WW/WWTP flows) 
+
+
 # [kwb.BerlinWaterModel.public 0.1.0](https://github.com/KWB-R/kwb.BerlinWaterModel.public/releases/tag/v0.1.0) <small>2025-12-17</small>
 
-* first public version of kwb.BerlinWaterMode.public for data management plan of IMPETUS EU project (flow data for gallery abstraction
+* First public version of kwb.BerlinWaterMode.public for data management plan of IMPETUS EU project (flow data for gallery abstraction
 of water works and wastewater treatment plants preliminary set to 0, public data set in coordination by BWB and will be available soon)
 
 * Added a `NEWS.md` file to track changes to the package.
 
-* see https://style.tidyverse.org/news.html for writing a good `NEWS.md`
+* See https://style.tidyverse.org/news.html for writing a good `NEWS.md`
 
 

R/calculate_flow.R

@@ -51,12 +51,18 @@ calculate_flow <- function(df, input, shares_timeseries_wide = NULL, config, use
     shorten_ww_flow_id(col_flow_id = "target") %>%
     dplyr::pull(target)
 
-  missing_flow_ids <- !flow_ids[flow_ids != section_id_up] %in% names(input)
+  flow_ids_without_section_up <- flow_ids[flow_ids != section_id_up]
+
+  missing_flow_ids <- if(length(flow_ids_without_section_up) == 0) {
+    0
+    } else {
+      sapply(flow_ids_without_section_up, function(x) ! x %in% names(input))
+    }
 
   if (sum(missing_flow_ids) > 0) {
     stop(sprintf(
       "The following flow_ids are missing in the input dataset:\n%s",
-      paste0(flow_ids[missing_flow_ids], collapse = ", ")
+      paste0(names(missing_flow_ids[missing_flow_ids == TRUE]), collapse = ", ")
     ))
   }
 

R/config_read.R

@@ -1,7 +1,7 @@
 #' Configuration: Read
 #'
 #' @param config_dir directory with configuration files (default:
-#' system.file("extdata/config/network_complete", package = "kwb.BerlinWaterModel")). It is mandatory
+#' system.file("extdata/config/network_complete_mean-start-conc", package = "kwb.BerlinWaterModel")). It is mandatory
 #' that there are three files within this folder: "flows_in_out.csv", "outflows_multiple.csv"
 #' and "sections.csv"
 #' @param file_encoding encoding for reading the files (default: "UTF-8")
@@ -16,7 +16,7 @@
 #' @importFrom stats setNames
 #' @importFrom readr read_csv2 locale
 #' @importFrom stringr str_remove
-config_read <- function(config_dir = system.file("extdata/config/network_complete",
+config_read <- function(config_dir = system.file("extdata/config/network_complete_mean-start-conc",
                                                  package = "kwb.BerlinWaterModel.public"),
                         file_encoding = "UTF-8") {
 

R/dataset_cso.R

@@ -1,8 +1,9 @@
-#' Dataset: Combined Sewer Overflows (cso) for a few rainfall events simulated with Infoworks
+#' Dataset: Combined Sewer Overflows (cso) for one rainfall event simulated with Infoworks in 2019
 #'
-#' Dataset with combined sewer overflow events for a few rainfall events simulated with Infoworks
+#' Dataset with combined sewer overflow events for one rainfall rainfall event simulated with Infoworks
+#' in 2019
 #'
-#' @format A tibble with 336,672 rows and five columns
+#' @format A tibble with 12,096 rows and five columns
 #' \describe{
 #'   \item{file_name}{filename of data origin}
 #'   \item{datetime}{datetime}

R/dataset_evapo_p.R

@@ -2,7 +2,7 @@
 #'
 #' Daily potential evaporation based on DWD 1x1 km raster data.
 #'
-#' @format A tibble with 7,670 rows and 10 columns:
+#' @format A tibble with 365 rows and 10 columns:
 #' \describe{
 #'   \item{file}{Name of the file from the DWD https/ftp server}
 #'   \item{date}{Date}

R/dataset_inflows.R

@@ -1,8 +1,8 @@
-#' Dataset: Inflows
+load#' Dataset: Inflows
 #'
 #' Dataset with inflows
 #'
-#' @format A tibble with 398,840 rows and three columns
+#' @format A tibble with 21,170 rows and three columns
 #' \describe{
 #'   \item{date}{date}
 #'   \item{id}{id of inflow station}

R/dataset_rain.R

@@ -2,7 +2,7 @@
 #'
 #' Dataset with rainfall data (based on DWD station 0433)
 #'
-#' @format A tibble with 247,076 rows and two columns
+#' @format A tibble with 8,721 rows and two columns
 #' \describe{
 #'   \item{datetime}{datetime}
 #'   \item{DWD_0433}{hourly rainfall in mm for DWD rainstation 0433}

R/dataset_ww.R

@@ -2,7 +2,7 @@
 #'
 #' Dataset with waterworks abstractions per gallery
 #'
-#' @format A tibble with 17,141 rows and three columns
+#' @format A tibble with 828 rows and three columns
 #' \describe{
 #'   \item{date}{date}
 #'   \item{id}{id of WW gallery}

R/dataset_wwtp.R

@@ -2,7 +2,7 @@
 #'
 #' Dataset with WWTP inflows
 #'
-#' @format A tibble with 1,152 rows and three columns
+#' @format A tibble with 4015 rows and three columns
 #' \describe{
 #'   \item{date}{date}
 #'   \item{id}{id of WWTP}