diff --git a/.Rbuildignore b/.Rbuildignore
index 77d23ee2669ce32c8b6d62fa7b77eeeab4fe4660..7d148441692d2792a23ccbc094b837329e27aeb6 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -12,6 +12,7 @@
^docs
^vignettes/seinebasin
^man-roxygen
+^man-examples
^dev
^CRAN-SUBMISSION$
^cran-comments\.md$
diff --git a/R/Calibration.GRiwrmInputsModel.R b/R/Calibration.GRiwrmInputsModel.R
index ba60f54314da1cb7c653a7570cc424daa720782d..6f16b6bf02eb0c03fc438e21af3681e96682402d 100644
--- a/R/Calibration.GRiwrmInputsModel.R
+++ b/R/Calibration.GRiwrmInputsModel.R
@@ -229,7 +229,7 @@ calcSubBasinAreas <- function(IM) {
#' RunModel for a sub-network of ungauged nodes
#'
#' The function simulates a network with one set of parameters
-#' shared with ungauded nodes inside the basin.
+#' shared with ungauged nodes inside the basin.
#'
#' @details
#' The network should contains only one gauged station at downstream and other
@@ -239,7 +239,7 @@ calcSubBasinAreas <- function(IM) {
#' `InputsModel` is a *GRiwrmInputsModel* containing the network of ungauged nodes
#' and direct injection in the basin.
#'
-#' `Param` is adjusted for each sub-basin using the method developped by
+#' `Param` is adjusted for each sub-basin using the method developed by
#' Lobligeois (2014) for GR models.
#'
#' @references Lobligeois, Florent. Mieux connaître la distribution spatiale des
diff --git a/R/CreateGRiwrm.R b/R/CreateGRiwrm.R
index b0a8fd394a3047a7b8509aeb8cba930cedfd5aa0..b2b330b732817fcec2217e2f268072f0c47c4a4f 100644
--- a/R/CreateGRiwrm.R
+++ b/R/CreateGRiwrm.R
@@ -34,7 +34,7 @@
#'
#' @aliases GRiwrm
#' @export
-#' @inherit RunModel.GRiwrmInputsModel return examples
+#' @example man-examples/CreateGRiwrm.R
#'
CreateGRiwrm <- function(db,
cols = list(
diff --git a/R/plot.GRiwrm.R b/R/plot.GRiwrm.R
index de2057c2044b217467890d8b0c718c632234cf5b..1698a13cd3d740783e063e7c8ed1baa354c38109 100644
--- a/R/plot.GRiwrm.R
+++ b/R/plot.GRiwrm.R
@@ -15,13 +15,7 @@
#'
#' @export
#'
-#' @examples
-#' \dontrun{
-#' # Display diagram
-#' plot.GRiwrm(griwrm)
-#' # Is the same as
-#' DiagrammeR::mermaid(plot.GRiwrm(griwrm, display = FALSE), width = "100%", height = "100%")
-#' }
+#' @example man-examples/CreateGRiwrm.R
#'
plot.GRiwrm <- function(x,
display = TRUE,
diff --git a/man-examples/CreateGRiwrm.R b/man-examples/CreateGRiwrm.R
new file mode 100644
index 0000000000000000000000000000000000000000..f6604cf64688795f96235ff4adcfef9dffff54d4
--- /dev/null
+++ b/man-examples/CreateGRiwrm.R
@@ -0,0 +1,37 @@
+# Network of 2 nodes distant of 150 km:
+# - an upstream reservoir modelled as a direct flow injection (no model)
+# - a gauging station downstream a catchment of 360 km² modelled with GR4J
+db <- data.frame(id = c("Reservoir", "GaugingDown"),
+ length = c(150, NA),
+ down = c("GaugingDown", NA),
+ area = c(NA, 360),
+ model = c(NA, "RunModel_GR4J"),
+ stringsAsFactors = FALSE)
+griwrm_basic <- CreateGRiwrm(db)
+str(griwrm_basic)
+# Network diagram with direct flow node in red, intermediate sub-basin in green
+plot(griwrm_basic)
+
+# GR4J semi-distributed model of the Severn River
+data(Severn)
+nodes <- Severn$BasinsInfo
+nodes$model <- "RunModel_GR4J"
+str(nodes)
+# Mismatch column names are renamed to stick with GRiwrm requirements
+rename_columns <- list(id = "gauge_id",
+ down = "downstream_id",
+ length = "distance_downstream")
+griwrm_severn <- CreateGRiwrm(nodes, rename_columns)
+str(griwrm_severn)
+# Network diagram with upstream basin nodes in blue, intermediate sub-basin in green
+plot(griwrm_severn)
+
+# Same model with an ungauged station at nodes 54029 and 54001
+# By default the first gauged node at downstream is used for parameter calibration (54032)
+nodes_ungauged <- nodes
+nodes_ungauged$model[nodes_ungauged$gauge_id %in% c("54029", "54001")] <- "Ungauged"
+griwrm_ungauged <- CreateGRiwrm(nodes_ungauged, rename_columns)
+# The `donor` column define which node is used for parameter calibration
+griwrm_ungauged
+# Network diagram with gauged nodes of vivid color, and ungauged nodes of dull color
+plot(griwrm_ungauged)
diff --git a/man/CreateGRiwrm.Rd b/man/CreateGRiwrm.Rd
index 012eb41bf2db3c1464698d0f7126425eb954591f..f8cad7e94c4baec500071ecacb43f321fe04f09e 100644
--- a/man/CreateGRiwrm.Rd
+++ b/man/CreateGRiwrm.Rd
@@ -56,87 +56,41 @@ runoff model output (\link{character} column \code{model})
}
}
\examples{
-###################################################################
-# Run the `airGR::RunModel_Lag` example in the GRiwrm fashion way #
-# Simulation of a reservoir with a purpose of low-flow mitigation #
-###################################################################
-
-## ---- preparation of the InputsModel object
-
-## loading package and catchment data
-library(airGRiwrm)
-data(L0123001)
-
-## ---- specifications of the reservoir
-
-## the reservoir withdraws 1 m3/s when it's possible considering the flow observed in the basin
-Qupstream <- matrix(-sapply(BasinObs$Qls / 1000 - 1, function(x) {
- min(1, max(0, x, na.rm = TRUE))
-}), ncol = 1)
-
-## except between July and September when the reservoir releases 3 m3/s for low-flow mitigation
-month <- as.numeric(format(BasinObs$DatesR, "\%m"))
-Qupstream[month >= 7 & month <= 9] <- 3
-Qupstream <- Qupstream * 86400 ## Conversion in m3/day
-
-## the reservoir is not an upstream subcachment: its areas is NA
-BasinAreas <- c(NA, BasinInfo$BasinArea)
-
-## delay time between the reservoir and the catchment outlet is 2 days and the distance is 150 km
-LengthHydro <- 150
-## with a delay of 2 days for 150 km, the flow velocity is 75 km per day
-Velocity <- (LengthHydro * 1e3 / 2) / (24 * 60 * 60) ## Conversion km/day -> m/s
-
-# This example is a network of 2 nodes which can be describe like this:
+# Network of 2 nodes distant of 150 km:
+# - an upstream reservoir modelled as a direct flow injection (no model)
+# - a gauging station downstream a catchment of 360 km² modelled with GR4J
db <- data.frame(id = c("Reservoir", "GaugingDown"),
- length = c(LengthHydro, NA),
+ length = c(150, NA),
down = c("GaugingDown", NA),
- area = c(NA, BasinInfo$BasinArea),
+ area = c(NA, 360),
model = c(NA, "RunModel_GR4J"),
stringsAsFactors = FALSE)
-
-# Create GRiwrm object from the data.frame
-griwrm <- CreateGRiwrm(db)
-str(griwrm)
-
-# Formatting observations for the hydrological models
-# Each input data should be a matrix or a data.frame with the good id in the name of the column
-Precip <- matrix(BasinObs$P, ncol = 1)
-colnames(Precip) <- "GaugingDown"
-PotEvap <- matrix(BasinObs$E, ncol = 1)
-colnames(PotEvap) <- "GaugingDown"
-
-# Observed flows contain flows that are directly injected in the model
-Qobs = matrix(Qupstream, ncol = 1)
-colnames(Qobs) <- "Reservoir"
-
-# Creation of the GRiwrmInputsModel object (= a named list of InputsModel objects)
-InputsModels <- CreateInputsModel(griwrm,
- DatesR = BasinObs$DatesR,
- Precip = Precip,
- PotEvap = PotEvap,
- Qobs = Qobs)
-str(InputsModels)
-
-## run period selection
-Ind_Run <- seq(which(format(BasinObs$DatesR, format = "\%Y-\%m-\%d")=="1990-01-01"),
- which(format(BasinObs$DatesR, format = "\%Y-\%m-\%d")=="1999-12-31"))
-
-# Creation of the GriwmRunOptions object
-RunOptions <- CreateRunOptions(InputsModels,
- IndPeriod_Run = Ind_Run)
-str(RunOptions)
-
-# Parameters of the SD models should be encapsulated in a named list
-ParamGR4J <- c(X1 = 257.238, X2 = 1.012, X3 = 88.235, X4 = 2.208)
-Param <- list(`GaugingDown` = c(Velocity, ParamGR4J))
-
-# RunModel for the whole network
-OutputsModels <- RunModel(InputsModels,
- RunOptions = RunOptions,
- Param = Param)
-str(OutputsModels)
-
-# Compare Simulation with reservoir and observation of natural flow
-plot(OutputsModels, data.frame(GaugingDown = BasinObs$Qmm[Ind_Run]))
+griwrm_basic <- CreateGRiwrm(db)
+str(griwrm_basic)
+# Network diagram with direct flow node in red, intermediate sub-basin in green
+plot(griwrm_basic)
+
+# GR4J semi-distributed model of the Severn River
+data(Severn)
+nodes <- Severn$BasinsInfo
+nodes$model <- "RunModel_GR4J"
+str(nodes)
+# Mismatch column names are renamed to stick with GRiwrm requirements
+rename_columns <- list(id = "gauge_id",
+ down = "downstream_id",
+ length = "distance_downstream")
+griwrm_severn <- CreateGRiwrm(nodes, rename_columns)
+str(griwrm_severn)
+# Network diagram with upstream basin nodes in blue, intermediate sub-basin in green
+plot(griwrm_severn)
+
+# Same model with an ungauged station at nodes 54029 and 54001
+# By default the first gauged node at downstream is used for parameter calibration (54032)
+nodes_ungauged <- nodes
+nodes_ungauged$model[nodes_ungauged$gauge_id \%in\% c("54029", "54001")] <- "Ungauged"
+griwrm_ungauged <- CreateGRiwrm(nodes_ungauged, rename_columns)
+# The `donor` column define which node is used for parameter calibration
+griwrm_ungauged
+# Network diagram with gauged nodes of vivid color, and ungauged nodes of dull color
+plot(griwrm_ungauged)
}
diff --git a/man/plot.GRiwrm.Rd b/man/plot.GRiwrm.Rd
index 705507759a2ec303e10163c5ae75d933ccdf26bc..8d86edbfab337966d1b566769e29f1e07e099491 100644
--- a/man/plot.GRiwrm.Rd
+++ b/man/plot.GRiwrm.Rd
@@ -41,11 +41,41 @@ This function only works inside RStudio because the HTMLwidget produced by Diagr
is not handled on some platforms
}
\examples{
-\dontrun{
-# Display diagram
-plot.GRiwrm(griwrm)
-# Is the same as
-DiagrammeR::mermaid(plot.GRiwrm(griwrm, display = FALSE), width = "100\%", height = "100\%")
-}
+# Network of 2 nodes distant of 150 km:
+# - an upstream reservoir modelled as a direct flow injection (no model)
+# - a gauging station downstream a catchment of 360 km² modelled with GR4J
+db <- data.frame(id = c("Reservoir", "GaugingDown"),
+ length = c(150, NA),
+ down = c("GaugingDown", NA),
+ area = c(NA, 360),
+ model = c(NA, "RunModel_GR4J"),
+ stringsAsFactors = FALSE)
+griwrm_basic <- CreateGRiwrm(db)
+str(griwrm_basic)
+# Network diagram with direct flow node in red, intermediate sub-basin in green
+plot(griwrm_basic)
+
+# GR4J semi-distributed model of the Severn River
+data(Severn)
+nodes <- Severn$BasinsInfo
+nodes$model <- "RunModel_GR4J"
+str(nodes)
+# Mismatch column names are renamed to stick with GRiwrm requirements
+rename_columns <- list(id = "gauge_id",
+ down = "downstream_id",
+ length = "distance_downstream")
+griwrm_severn <- CreateGRiwrm(nodes, rename_columns)
+str(griwrm_severn)
+# Network diagram with upstream basin nodes in blue, intermediate sub-basin in green
+plot(griwrm_severn)
+# Same model with an ungauged station at nodes 54029 and 54001
+# By default the first gauged node at downstream is used for parameter calibration (54032)
+nodes_ungauged <- nodes
+nodes_ungauged$model[nodes_ungauged$gauge_id \%in\% c("54029", "54001")] <- "Ungauged"
+griwrm_ungauged <- CreateGRiwrm(nodes_ungauged, rename_columns)
+# The `donor` column define which node is used for parameter calibration
+griwrm_ungauged
+# Network diagram with gauged nodes of vivid color, and ungauged nodes of dull color
+plot(griwrm_ungauged)
}