diff --git a/DESCRIPTION b/DESCRIPTION index 0d2dcb6af8efa31b4c4491cfac60e3ae605ac07b..caae987176d1956a5ad40df14f44f838921bef24 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.2.12.16 +Version: 1.2.12.17 Date: 2019-04-01 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 d5e8270f6edbeda9d63b295cc92c0d52fa6dc49f..3c122656113f12402d09beec03f247ec54c05392 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.12.16 Release Notes (2019-04-01) +### 1.2.12.17 Release Notes (2019-04-01) diff --git a/man/CreateInputsModel.Rd b/man/CreateInputsModel.Rd index bee9ad3ebaed1a34ead9c2fcac3da73aa21462dc..d5ddd9e4f8d5304cd0ac87185820e762a3cb21f1 100644 --- a/man/CreateInputsModel.Rd +++ b/man/CreateInputsModel.Rd @@ -78,15 +78,15 @@ InputsModel <- CreateInputsModel(FUN_MOD = RunModel_GR4J, DatesR = BasinObs$Date Precip = BasinObs$P, PotEvap = BasinObs$E) ## run period selection -Ind_Run <- seq(which(format(BasinObs$DatesR, format = "\%d/\%m/\%Y")=="01/01/1990"), - which(format(BasinObs$DatesR, format = "\%d/\%m/\%Y")=="31/12/1999")) +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")) ## preparation of the RunOptions object RunOptions <- CreateRunOptions(FUN_MOD = RunModel_GR4J, InputsModel = InputsModel, IndPeriod_Run = Ind_Run) ## simulation -Param <- c(734.568, -0.840, 109.809, 1.971) +Param <- c(X1 = 734.568, X2 = -0.840, X3 = 109.809, X4 = 1.971) OutputsModel <- RunModel(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param, FUN_MOD = RunModel_GR4J) @@ -97,7 +97,6 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) - } @@ -107,6 +106,6 @@ Laurent Coron \seealso{ -\code{\link{RunModel}}, \code{\link{CreateRunOptions}}, \code{\link{CreateInputsCrit}}, \code{\link{CreateCalibOptions}}, \code{\link{DataAltiExtrapolation_Valery}} +\code{\link{RunModel}}, \code{\link{CreateRunOptions}}, \code{\link{CreateInputsCrit}}, +\code{\link{CreateCalibOptions}}, \code{\link{DataAltiExtrapolation_Valery}} } -