diff --git a/DESCRIPTION b/DESCRIPTION index 82cf4730a893dfbd68ca5a723f18697a3ab83917..89d570e43d7e0e341ea200bc85c50b4865b6d2af 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.7 +Version: 1.3.0.8 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 81ac9d51f8d25cc9aff667df924678c3210885ee..910b4a19ceb8140a6e9c9e65e8e50a4036f5b660 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.3.0.7 Release Notes (2019-05-20) +### 1.3.0.8 Release Notes (2019-05-20) #### New features diff --git a/man/RunModel_CemaNeigeGR4H.Rd b/man/RunModel_CemaNeigeGR4H.Rd index decf15470424b44452e5c162a443403f6ce7761a..f7fe04ed2a3feffc625d4910180ec8c6de7ab021 100644 --- a/man/RunModel_CemaNeigeGR4H.Rd +++ b/man/RunModel_CemaNeigeGR4H.Rd @@ -89,6 +89,9 @@ library(airGR) ## loading catchment data data(L0123002) +BasinObs$DatesR <- seq(from = as.POSIXct("1984-01-01", tz = "UTC"), + to = as.POSIXct("1984-01-01", tz = "UTC") + length(BasinObs$DatesR), + by = "hour") ## preparation of the InputsModel object InputsModel <- CreateInputsModel(FUN_MOD = RunModel_CemaNeigeGR4H, DatesR = BasinObs$DatesR, @@ -97,8 +100,7 @@ InputsModel <- CreateInputsModel(FUN_MOD = RunModel_CemaNeigeGR4H, DatesR = Basi HypsoData = BasinInfo$HypsoData, NLayers = 5) ## 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")) +Ind_Run <- 2193:5844 ## ---- original version of CemaNeige @@ -114,7 +116,7 @@ OutputsModel <- RunModel_CemaNeigeGR4H(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) ## results preview -plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) +#plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, @@ -135,7 +137,7 @@ OutputsModel <- RunModel_CemaNeigeGR4H(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) ## results preview -plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) +#plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel,