From b83c2821f5f6bec535ac6a66bf6c9efb500c6c5b Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Mon, 22 Aug 2022 08:11:02 +0200
Subject: [PATCH] fix(vignettes): crash seine basin vignette
- manipulating griwrm object directly needs to handle "donor" column
Refs #92
---
vignettes/seinebasin/V01_First_network.Rmd | 2 +-
vignettes/seinebasin/V04_Open-loop_influenced_flow.Rmd | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/vignettes/seinebasin/V01_First_network.Rmd b/vignettes/seinebasin/V01_First_network.Rmd
index b982781..840e342 100644
--- a/vignettes/seinebasin/V01_First_network.Rmd
+++ b/vignettes/seinebasin/V01_First_network.Rmd
@@ -94,7 +94,7 @@ InputsModel <- CreateInputsModel(griwrm, DatesR, Precip, PotEvap)
```{r save}
dir.create("_cache", showWarnings = FALSE)
-save(griwrm, InputsModel, file = "_cache/V01.RData")
+save(seine_nodes, griwrm, InputsModel, file = "_cache/V01.RData")
```
# References
diff --git a/vignettes/seinebasin/V04_Open-loop_influenced_flow.Rmd b/vignettes/seinebasin/V04_Open-loop_influenced_flow.Rmd
index b91cd76..a8aa3d0 100644
--- a/vignettes/seinebasin/V04_Open-loop_influenced_flow.Rmd
+++ b/vignettes/seinebasin/V04_Open-loop_influenced_flow.Rmd
@@ -181,10 +181,13 @@ reservoir_connections$length <- reservoir_connections$length / 1000
reservoir_connections$model <- NA
reservoir_connections$area <- NA
load("_cache/V01.RData")
-griwrm2 <- rbind(griwrm, reservoir_connections[, names(griwrm)])
+seine_nodes <- seine_nodes[, c("id_sgl", "distance_aval", "id_aval", "model", "area")]
+names(seine_nodes)[1:3] <- names(reservoir_connections)[1:3]
+seine_nodes2 <- rbind(seine_nodes, reservoir_connections)
# Insert PANNEC_R between CHAUM_07 and GURGY_02
-griwrm2$down[griwrm2$id == "CHAUM_07"] <- "PANNEC_R"
-griwrm2$length[griwrm2$id == "CHAUM_07"] <- 0
+seine_nodes2$down[seine_nodes2$id == "CHAUM_07"] <- "PANNEC_R"
+seine_nodes2$length[seine_nodes2$id == "CHAUM_07"] <- 0
+griwrm2 <- CreateGRiwrm(seine_nodes2)
plot(griwrm2)
```
--
GitLab