From 5fe52d9466fada403aa819a0ced576818b389203 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 20 May 2019 15:25:00 +0200
Subject: [PATCH] v1.3.0.12 UPDATE: RunModel_CemaNeigeGR4H example uses
U2345030 dataset
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
man/RunModel_CemaNeigeGR4H.Rd | 32 +++++---------------------------
3 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 88ece528..49d81633 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.3.0.11
+Version: 1.3.0.12
Date: 2019-05-20
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 39808395..3e9edc07 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.3.0.11 Release Notes (2019-05-20)
+### 1.3.0.12 Release Notes (2019-05-20)
#### New features
diff --git a/man/RunModel_CemaNeigeGR4H.Rd b/man/RunModel_CemaNeigeGR4H.Rd
index c7ae7a7a..98ed0d8a 100644
--- a/man/RunModel_CemaNeigeGR4H.Rd
+++ b/man/RunModel_CemaNeigeGR4H.Rd
@@ -88,19 +88,18 @@ For further details on the argument structures and initialisation options, see \
library(airGR)
## loading catchment data
-data(L0123002)
-BasinObs$DatesR <- seq(from = BasinObs$DatesR[1L],
- length.out = length(BasinObs$DatesR),
- by = "hour")
+data(U2345030)
+
## preparation of the InputsModel object
InputsModel <- CreateInputsModel(FUN_MOD = RunModel_CemaNeigeGR4H, DatesR = BasinObs$DatesR,
Precip = BasinObs$P, PotEvap = BasinObs$E, TempMean = BasinObs$T,
- ZInputs = median(BasinInfo$HypsoData),
+ ZInputs = BasinInfo$ZInputs,
HypsoData = BasinInfo$HypsoData, NLayers = 5)
## run period selection
-Ind_Run <- 2193:5844
+Ind_Run <- seq(which(format(BasinObs$DatesR, format = "\%Y-\%m-\%d \%H:\%M")=="2004-03-01 00:00"),
+ which(format(BasinObs$DatesR, format = "\%Y-\%m-\%d \%H:\%M")=="2008-12-31 23:00"))
## ---- original version of CemaNeige
@@ -118,27 +117,6 @@ OutputsModel <- RunModel_CemaNeigeGR4H(InputsModel = InputsModel,
## results preview
#plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run])
-## efficiency criterion: Nash-Sutcliffe Efficiency
-InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel,
- RunOptions = RunOptions, Obs = BasinObs$Qmm[Ind_Run])
-OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel)
-
-
-## ---- version of CemaNeige with the Linear Hysteresis
-
-## preparation of the RunOptions object
-RunOptions <- CreateRunOptions(FUN_MOD = RunModel_CemaNeigeGR4H, InputsModel = InputsModel,
- IndPeriod_Run = Ind_Run, IsHyst = TRUE)
-
-## simulation
-Param <- c(X1 = 408.774, X2 = 2.646, X3 = 131.264, X4 = 1.174,
- CNX1 = 0.962, CNX2 = 2.249, CNX3 = 100, CNX4 = 0.4)
-OutputsModel <- RunModel_CemaNeigeGR4H(InputsModel = InputsModel,
- RunOptions = RunOptions, Param = Param)
-
-## results preview
-#plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run])
-
## efficiency criterion: Nash-Sutcliffe Efficiency
InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel,
RunOptions = RunOptions, Obs = BasinObs$Qmm[Ind_Run])
--
GitLab