Commit 2d51884f authored by unknown's avatar unknown
Browse files

v0.1.11.1 CalCrit argument value of CalGR function changed in all examples

Showing with 5 additions and 5 deletions
+5 -5
Package: airGRteaching Package: airGRteaching
Type: Package Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface) Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
Version: 0.1.11.0 Version: 0.1.11.1
Date: 2018-01-29 Date: 2018-01-29
Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb"))) Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
Depends: airGR (>= 1.0.9.43) Depends: airGR (>= 1.0.9.43)
......
...@@ -93,7 +93,7 @@ You can obviously define another objective function or warm-up period: ...@@ -93,7 +93,7 @@ You can obviously define another objective function or warm-up period:
The calibration algorithm has been developed by Claude Michel (`Calibration_Michel()` function in the `r airGR` package) . The calibration algorithm has been developed by Claude Michel (`Calibration_Michel()` function in the `r airGR` package) .
```{r, warning=FALSE} ```{r, warning=FALSE}
CAL <- CalGR(PrepGR = PREP, CalCrit = "KGE", CAL <- CalGR(PrepGR = PREP, CalCrit = "KGE2",
WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31")) WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31"))
``` ```
......
...@@ -60,7 +60,7 @@ BasinObs2 <- BasinObs[, c("DatesR", "P", "E", "Qmm", "T")] ...@@ -60,7 +60,7 @@ BasinObs2 <- BasinObs[, c("DatesR", "P", "E", "Qmm", "T")]
PREP <- PrepGR(ObsDF = BasinObs2, HydroModel = "GR4J", CemaNeige = TRUE) PREP <- PrepGR(ObsDF = BasinObs2, HydroModel = "GR4J", CemaNeige = TRUE)
## Calibration step ## Calibration step
CAL <- CalGR(PrepGR = PREP, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"), CAL <- CalGR(PrepGR = PREP, CalCrit = "KGE2",
WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31")) WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31"))
str(CAL) str(CAL)
} }
......
...@@ -72,7 +72,7 @@ PREP <- PrepGR(ObsDF = BasinObs2, HydroModel = "GR4J", CemaNeige = FALSE) ...@@ -72,7 +72,7 @@ PREP <- PrepGR(ObsDF = BasinObs2, HydroModel = "GR4J", CemaNeige = FALSE)
dyplot(PREP, main = "Observation") dyplot(PREP, main = "Observation")
## Calibration step ## Calibration step
CAL <- CalGR(PrepGR = PREP, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"), CAL <- CalGR(PrepGR = PREP, CalCrit = "KGE2",
WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31")) WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31"))
dyplot(CAL, main = "Calibration") dyplot(CAL, main = "Calibration")
......
...@@ -46,7 +46,7 @@ BasinObs2 <- BasinObs[, c("DatesR", "P", "E", "Qmm", "T")] ...@@ -46,7 +46,7 @@ BasinObs2 <- BasinObs[, c("DatesR", "P", "E", "Qmm", "T")]
PREP <- PrepGR(ObsDF = BasinObs2, HydroModel = "GR5J", CemaNeige = TRUE) PREP <- PrepGR(ObsDF = BasinObs2, HydroModel = "GR5J", CemaNeige = TRUE)
## Calibration step ## Calibration step
CAL <- CalGR(PrepGR = PREP, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"), CAL <- CalGR(PrepGR = PREP, CalCrit = "KGE2",
WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31")) WupPer = NULL, CalPer = c("1990-01-01", "1993-12-31"))
plot(CAL, which = "perf") plot(CAL, which = "perf")
plot(CAL, which = "ts") plot(CAL, which = "ts")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment