diff --git a/DESCRIPTION b/DESCRIPTION index 2c78fa490118b60aafc2314561acad2320bbeaf1..a18cad10d4e944ddcdda41a65ba49a64b2b636ba 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.1.2.32 -Date: 2019-01-18 +Version: 1.1.2.3 +Date: 2019-01-29 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")), diff --git a/NEWS.rmd b/NEWS.rmd index d87af4ab87b7c2198595f25320d7bc3f9f9b64ab..c051d8f7c2188e96fe0b93806151a7bd068aa2a8 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.2.32 Release Notes (2019-01-18) +### 1.1.2.33 Release Notes (2019-01-29) diff --git a/man/ErrorCrit_KGE.Rd b/man/ErrorCrit_KGE.Rd index f15047e31fce3d9805f9848aa1a7f02715253212..3ba295f80e3b2e8b71cf642892d87e2c26267e40 100644 --- a/man/ErrorCrit_KGE.Rd +++ b/man/ErrorCrit_KGE.Rd @@ -90,9 +90,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE, InputsModel = InputsMod transfo = transfo) OutputsCrit <- ErrorCrit_KGE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) -## efficiency criterion: Kling-Gupta Efficiency above a threshold (q75\%) -BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run])); -BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE +## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%) +BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE) InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE, InputsModel = InputsModel, RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], BoolCrit = BoolCrit) diff --git a/man/ErrorCrit_KGE2.Rd b/man/ErrorCrit_KGE2.Rd index 3e3f1d06f6fb0cea97a3ac49fc36ff20c17a2914..2bba9b4b0c4bbfbfcadfaac34b6f2a18269a1e41 100644 --- a/man/ErrorCrit_KGE2.Rd +++ b/man/ErrorCrit_KGE2.Rd @@ -90,9 +90,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2, InputsModel = InputsMo transfo = transfo) OutputsCrit <- ErrorCrit_KGE2(InputsCrit = InputsCrit, OutputsModel = OutputsModel) -## efficiency criterion: Kling-Gupta Efficiency above a threshold (q75\%) -BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run])); -BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE +## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%) +BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE) InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2, InputsModel = InputsModel, RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], BoolCrit = BoolCrit) diff --git a/man/ErrorCrit_NSE.Rd b/man/ErrorCrit_NSE.Rd index 5a5cdcee287566b4935f77fb4719086e392f0a28..1d33a091a977baac387e705dc224c4b5c4e791b4 100644 --- a/man/ErrorCrit_NSE.Rd +++ b/man/ErrorCrit_NSE.Rd @@ -83,9 +83,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsMod transfo = transfo) OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) -## efficiency criterion: Nash-Sutcliffe Efficiency above a threshold (q75\%) -BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run])); -BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE +## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%) +BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE) InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], BoolCrit = BoolCrit) diff --git a/man/ErrorCrit_RMSE.Rd b/man/ErrorCrit_RMSE.Rd index d329edaa7f4d5df5d25a143ea729553b14c813e3..bba55c1b413f173122c76d6d47625b1e7b29e954 100644 --- a/man/ErrorCrit_RMSE.Rd +++ b/man/ErrorCrit_RMSE.Rd @@ -81,9 +81,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_RMSE, InputsModel = InputsMo transfo = transfo) OutputsCrit <- ErrorCrit_RMSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) -## efficiency criterion: root-mean-square error above a threshold (q75\%) -BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run])); -BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE +## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%) +BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE) InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_RMSE, InputsModel = InputsModel, RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], BoolCrit = BoolCrit)