Merge pull request #13 from KWB-R/dev

Prepare next release

Author: hsonne

.Rbuildignore

@@ -8,3 +8,4 @@
 ^README\.md$
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^data-raw$

.github/workflows/R-CMD-check.yaml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest, r: 'release'}
-          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-22.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
           - {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'oldrel'}
           - {os: windows-latest, r: 'release'}
@@ -51,14 +51,14 @@ jobs:
 
       - name: Cache R packages
         if: runner.os != 'Windows'
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ env.R_LIBS_USER }}
           key: ${{ runner.os }}-r-${{ matrix.config.r }}-3-${{ hashFiles('depends.Rds') }}
           restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-3-
 
       - name: Install system dependencies
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux (no, skip this!)'
         env:
           RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
         run: |

.github/workflows/pkgdown.yaml

@@ -30,7 +30,7 @@ jobs:
         shell: Rscript {0}
 
       - name: Cache R packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.R_LIBS_USER }}
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

.github/workflows/test-coverage.yaml

@@ -30,7 +30,7 @@ jobs:
         shell: Rscript {0}
 
       - name: Cache R packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ env.R_LIBS_USER }}
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

.gitignore

@@ -3,3 +3,4 @@
 .RData
 .Ruserdata
 docs
+kwb.rabimo.Rproj

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: kwb.rabimo
 Title: R Implementation of Water Balance Model Abimo
-Version: 1.0.1
+Version: 2.0.0
 Authors@R: c(
     person("Hauke", "Sonnenberg", , "hauke.sonnenberg@kompetenz-wasser.de", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9134-2871")),
@@ -15,17 +15,22 @@ URL: https://github.com/KWB-R/kwb.rabimo
 BugReports: https://github.com/KWB-R/kwb.rabimo/issues
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests: 
-    covr
+    ggplot2,
+    jsonlite,
+    plumber,
+    testthat (>= 3.0.0)
 Imports: 
     dplyr,
-    kwb.abimo,
-    kwb.utils,
+    kwb.utils (>= 0.15.0),
     magrittr,
-    methods,
     parallel,
-    xml2
+    rlang
 Remotes: 
-    github::kwb-r/kwb.abimo,
     github::kwb-r/kwb.utils
+Config/testthat/edition: 3
+Depends: 
+    R (>= 3.5.0)
+LazyData: true
+LazyDataCompression: xz

NAMESPACE

@@ -1,44 +1,34 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%>%")
-export(BERLIN_TYPES_TO_USAGE_YIELD_IRRIGATION)
-export(abimo_config_to_config)
-export(actual_evaporation_waterbody_or_pervious)
-export(call_with_data)
-export(get_potential_evaporation)
-export(get_precipitation)
+export(calculate_delta_w)
+export(data_to_natural)
+export(define_controls)
+export(generate_rabimo_area)
+export(get_measure_stats)
 export(get_soil_properties)
-export(get_usage_tuple)
-export(index_string_to_integers)
-export(list_to_data_frame_with_keys)
-export(prepare_input_data)
+export(read_column_info)
 export(real_evapo_transpiration)
 export(run_rabimo)
-export(yearly_height_to_volume_flow)
-importFrom(dplyr,left_join)
+export(run_rabimo_with_measures)
+export(test_plumber_api)
+export(triangle_of_fractions)
 importFrom(kwb.utils,catAndRun)
-importFrom(kwb.utils,catIf)
-importFrom(kwb.utils,checkForMissingColumns)
 importFrom(kwb.utils,createAccessor)
 importFrom(kwb.utils,defaultIfNULL)
 importFrom(kwb.utils,getAttribute)
-importFrom(kwb.utils,inRange)
-importFrom(kwb.utils,moveColumnsToFront)
-importFrom(kwb.utils,multiColumnLookup)
 importFrom(kwb.utils,printIf)
-importFrom(kwb.utils,removeColumns)
-importFrom(kwb.utils,removeElements)
 importFrom(kwb.utils,renameAndSelect)
 importFrom(kwb.utils,renameColumns)
-importFrom(kwb.utils,resetRowNames)
-importFrom(kwb.utils,safeRowBindAll)
 importFrom(kwb.utils,selectColumns)
 importFrom(kwb.utils,selectElements)
 importFrom(kwb.utils,stopFormatted)
 importFrom(kwb.utils,stringList)
 importFrom(magrittr,"%>%")
-importFrom(methods,formalArgs)
 importFrom(parallel,detectCores)
 importFrom(parallel,makeCluster)
 importFrom(parallel,parLapply)
 importFrom(parallel,stopCluster)
+importFrom(rlang,.data)
+importFrom(stats,approx)
+importFrom(utils,globalVariables)

NEWS.md

@@ -1,3 +1,19 @@
+# kwb.rabimo 2.0.0 (2025-05-20)
+
+- contains new data for Berlin in which road areas do not belong to blocks 
+  anymore but are blocks themselves
+- change in input format
+  - new (English) column names,
+  - partial areas are given as fractions instead of percentages or absolute 
+    areas
+  - columns with redundant information are removed
+  - potential evaporation is now part of the input data (was originally 
+    configured in the configuration file)
+  - model-internal parameters "land_type", "yield" (renamed to: "veg_class"), 
+    and "irrigation", originally determined from Berlin-specific block area 
+    usage and structure, are now explicitly given in the input data
+- supports stormwater management measures
+
 # kwb.rabimo 1.0.0 (2023-11-09)
 
 First release of kwb.rabimo. This version tries to simulate exactly what