From d7ae1da711647efa283e423957a4c5f9169a66f5 Mon Sep 17 00:00:00 2001 From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv> Date: Wed, 5 Apr 2017 11:18:23 +0200 Subject: [PATCH] v1.0.6.4 DataAltiExtrapolation_Valery code improved #4521 --- DESCRIPTION | 2 +- R/DataAltiExtrapolation_Valery.R | 3 +-- R/ErrorCrit_KGE2.R | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 25865eb3..3033d5ed 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.0.6.3 +Version: 1.0.6.4 Date: 2017-04-05 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), diff --git a/R/DataAltiExtrapolation_Valery.R b/R/DataAltiExtrapolation_Valery.R index 397b2de5..a3f05c96 100644 --- a/R/DataAltiExtrapolation_Valery.R +++ b/R/DataAltiExtrapolation_Valery.R @@ -453,8 +453,7 @@ DataAltiExtrapolation_Valery <- function(DatesR, LayerPrecip_df <- LayerPrecip_df / rowMeans(LayerPrecip_df) * Precip LayerPrecip_df[is.nan(LayerPrecip_df)] <- 0 } - LayerPrecip <- - lapply(seq_len(ncol(LayerPrecip_df)), function(x) LayerPrecip_df[, x]) + LayerPrecip <- as.list(LayerPrecip_df) } diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R index da8c6ce8..42d51116 100644 --- a/R/ErrorCrit_KGE2.R +++ b/R/ErrorCrit_KGE2.R @@ -65,7 +65,7 @@ ErrorCrit_KGE2 <- function(InputsCrit,OutputsModel, warnings = TRUE, verbose = T if(is.numeric(Crit) & is.finite(Crit)){ SubCritValues[iCrit] <- Crit; } -##SubErrorCrit_____KGE_gama______________________ +##SubErrorCrit_____KGE_gamma______________________ iCrit <- iCrit+1; SubCritNames[iCrit] <- paste(CritName," cv(sim)/cv(obs) =", sep = "") SubCritValues[iCrit] <- NA; -- GitLab