From e49640d7d42178c17674457cc2e9265e1632f734 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@irstea.fr>
Date: Wed, 20 May 2020 17:26:37 +0200
Subject: [PATCH] feat: add run-off model in girop object
Refs #1
---
R/girop.R | 4 ++--
vignettes/01_First_network.Rmd | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/R/girop.R b/R/girop.R
index 9c439bf..7b6adde 100644
--- a/R/girop.R
+++ b/R/girop.R
@@ -8,8 +8,8 @@
#' @export
#'
#' @examples
-girop <- function(db, cols = c(id = "id", area = "area", params = "params"), keep_all = FALSE) {
- colsDefault <- list(id = "id", area = "area", params = "params")
+girop <- function(db, cols = c(id = "id", area = "area", model = "model", params = "params"), keep_all = FALSE) {
+ colsDefault <- list(id = "id", area = "area", model = "model", params = "params")
cols <- utils::modifyList(colsDefault, as.list(cols))
if(!any(names(db) == cols$params)) {
# Add missing params column in the database
diff --git a/vignettes/01_First_network.Rmd b/vignettes/01_First_network.Rmd
index de2b3df..0817edb 100644
--- a/vignettes/01_First_network.Rmd
+++ b/vignettes/01_First_network.Rmd
@@ -38,6 +38,9 @@ ginetSeine <- ginet(seine_nodes, list(id = "id_sgl", down = "id_aval", length =
Create the girop object
```{r}
+# Specify which run-off model to use
+seine_nodes$model = "RunModel_GR4J"
+# Generate girop object
giropSeine <- girop(seine_nodes, list(id = "id_sgl", area = "area"))
```
@@ -69,5 +72,3 @@ for(id in ginetSeine$id) {
gitsSeine <- merge(gitsSeine, gits(id, l[[id]], cols = list(date = "Date", Precip = "Ptot", PotEvap = "ETP", Qobs = "Qnat")))
}
```
-
-
--
GitLab