diff --git a/DESCRIPTION b/DESCRIPTION index 0af67793dd44e3a957adf3deeaf7544f30b96bf1..d3c23ad46650fece144337f729ce1e3b8c8359d0 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.30 +Version: 1.2.12.31 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 ce2c00437fdc720a8f5ca686aedc964fb09c0ada..33511fbd9ad3e30d4575c127efc8900e3ba7d2d4 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.12.30 Release Notes (2019-04-01) +### 1.2.12.31 Release Notes (2019-04-01) diff --git a/vignettes/V04_cemaneige_hysteresis.Rmd b/vignettes/V04_cemaneige_hysteresis.Rmd index 289c9c9202b3100569824695018f42f1657fdfd6..5cdd867a883d92bea248414c5a2eb4f9973be634 100644 --- a/vignettes/V04_cemaneige_hysteresis.Rmd +++ b/vignettes/V04_cemaneige_hysteresis.Rmd @@ -107,8 +107,8 @@ InputsCrit_Cal <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6), BasinObs$SCA3[Ind_Cal], BasinObs$SCA4[Ind_Cal], BasinObs$SCA5[Ind_Cal]), - varObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"), - weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05)) + VarObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"), + Weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05)) InputsCrit_Val <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6), InputsModel = InputsModel, RunOptions = RunOptions_Val, @@ -118,8 +118,8 @@ InputsCrit_Val <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6), BasinObs$SCA3[Ind_Val], BasinObs$SCA4[Ind_Val], BasinObs$SCA5[Ind_Val]), - varObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"), - weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05)) + VarObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"), + Weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05)) ``` We can now calibrate the model. @@ -191,7 +191,7 @@ RunOptions_Val_NoHyst <- CreateRunOptions(FUN_MOD = RunModel_CemaNeigeGR4J, InputsCrit_Cal_NoHyst <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2, InputsModel = InputsModel, RunOptions = RunOptions_Cal_NoHyst, - Obs = BasinObs$Qmm[Ind_Cal], varObs = "Q") + Obs = BasinObs$Qmm[Ind_Cal], VarObs = "Q") ## preparation of CalibOptions object CalibOptions_NoHyst <- CreateCalibOptions(FUN_MOD = RunModel_CemaNeigeGR4J,