diff --git a/DESCRIPTION b/DESCRIPTION index 06b07de5e36708305a39cddd60ba0e7b1c2eb408..54a0a35136114299674583cb46510feff414df3c 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.27 +Version: 1.2.12.28 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 e75e773c35084014b8a3222afb35994aa768e24d..415c21c372650f48fe99fb4460a10a0a2daf8aab 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.12.27 Release Notes (2019-04-01) +### 1.2.12.28 Release Notes (2019-04-01) diff --git a/man/ErrorCrit.Rd b/man/ErrorCrit.Rd index 81e6c396815d2da0b98ac5ad24f69aeb079bcb7f..c399eb9a90112669dddb2afea300a741bf8d8590 100644 --- a/man/ErrorCrit.Rd +++ b/man/ErrorCrit.Rd @@ -83,7 +83,7 @@ OutputsModel <- RunModel_GR4J(InputsModel = InputsModel, InputsCritSingle <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, RunOptions = RunOptions, Obs = list(BasinObs$Qmm[Ind_Run]), - varObs = "Q", transfo = "", + VarObs = "Q", transfo = "", weight = NULL) str(ErrorCrit(InputsCrit = InputsCritSingle, OutputsModel = OutputsModel)) @@ -91,7 +91,7 @@ str(ErrorCrit(InputsCrit = InputsCritSingle, OutputsModel = OutputsModel)) InputsCritMulti <- CreateInputsCrit(FUN_CRIT = list(ErrorCrit_RMSE, ErrorCrit_NSE), InputsModel = InputsModel, RunOptions = RunOptions, Obs = list(BasinObs$Qmm[Ind_Run], BasinObs$Qmm[Ind_Run]), - varObs = list("Q", "Q"), transfo = list("", "sqrt"), + VarObs = list("Q", "Q"), transfo = list("", "sqrt"), weight = NULL) str(ErrorCrit(InputsCrit = InputsCritMulti, OutputsModel = OutputsModel)) @@ -100,7 +100,7 @@ str(ErrorCrit(InputsCrit = InputsCritMulti, OutputsModel = OutputsModel)) InputsCritCompo <- CreateInputsCrit(FUN_CRIT = list(ErrorCrit_NSE, ErrorCrit_NSE), InputsModel = InputsModel, RunOptions = RunOptions, Obs = list(BasinObs$Qmm[Ind_Run], BasinObs$Qmm[Ind_Run]), - varObs = list("Q", "Q"), transfo = list("", "log"), + VarObs = list("Q", "Q"), transfo = list("", "log"), weight = list(0.4, 0.6)) str(ErrorCrit(InputsCrit = InputsCritCompo, OutputsModel = OutputsModel)) }