From fbe8fd2df1be6adbab3277900b465aeae938b2ea Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@irstea.fr>
Date: Mon, 1 Jun 2020 22:45:09 +0200
Subject: [PATCH] feat(vignette): add plot of calibrated run
Refs #3
---
vignettes/V03_First_Calibration.Rmd | 30 +++++++++++++++++++++++++++++
vignettes/v02_First_run.Rmd | 6 +++---
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/vignettes/V03_First_Calibration.Rmd b/vignettes/V03_First_Calibration.Rmd
index 2c470e6..c0c4f90 100644
--- a/vignettes/V03_First_Calibration.Rmd
+++ b/vignettes/V03_First_Calibration.Rmd
@@ -44,4 +44,34 @@ str(CalibOptions)
OutputsCalib <- Calibration(InputsModel, RunOptions, InputsCrit, CalibOptions)
```
+```{r}
+save(OutputsCalib, file = "_cache/V03.RData")
+```
+
+
+## Run model with Michel calibration
+
+```{r}
+giropMichel <- girop
+for(id in giropMichel$id) {
+ giropMichel$params[giropMichel$id == id] <- list(OutputsCalib[[id]]$Param)
+}
+
+OutputsModels <- RunModel(
+ InputsModel = InputsModel,
+ RunOptions = RunOptions,
+ girop = giropMichel
+)
+```
+
+## Plot the result for each basin
+
+```{r, fig.height = 5, fig.width = 8}
+htmltools::tagList(lapply(
+ names(OutputsModels),
+ function(x) {
+ plot(OutputsModels[[x]], Qobs = gits[[x]]$Qobs[RunOptions[[x]]$IndPeriod_Run] , main = x)
+ }
+))
+```
diff --git a/vignettes/v02_First_run.Rmd b/vignettes/v02_First_run.Rmd
index ae3050f..67ca6f0 100644
--- a/vignettes/v02_First_run.Rmd
+++ b/vignettes/v02_First_run.Rmd
@@ -104,7 +104,7 @@ RunOptions <- CreateRunOptions(
## Run the SD model for the whole basin
```{r}
-OutputsModels <- RunModel(
+OutputsModelsClimAware <- RunModel(
InputsModel = InputsModel,
RunOptions = RunOptions,
girop
@@ -121,9 +121,9 @@ save(RunOptions, file = "_cache/V02.RData")
```{r, fig.height = 5, fig.width = 8}
htmltools::tagList(lapply(
- names(OutputsModels),
+ names(OutputsModelsClimAware),
function(x) {
- plot(OutputsModels[[x]], Qobs = gits[[x]]$Qobs[IndPeriod_Run] , main = x)
+ plot(OutputsModelsClimAware[[x]], Qobs = gits[[x]]$Qobs[IndPeriod_Run] , main = x)
}
))
```
--
GitLab