diff --git a/DESCRIPTION b/DESCRIPTION index 81f3d9a217974be8e9bad75516218da2215fd867..858d0eb3ab052290a1664f2a17b27e4eb35b2a8f 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.1.2.2 +Version: 1.1.2.3 Date: 2018-10-22 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R index d3adc5a39c9876c5fd52ef721634bcf588b5b757..6d694c5a3e8186fce6e6b368831d8ecf5bcd97e4 100644 --- a/R/ErrorCrit_NSE.R +++ b/R/ErrorCrit_NSE.R @@ -5,6 +5,10 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T if (!inherits(InputsCrit, "InputsCrit")) { stop("InputsCrit must be of class 'InputsCrit' \n") return(NULL) + } + if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) { + stop("InputsCrit must be of class 'Single' \n") + return(NULL) } if (!inherits(OutputsModel, "OutputsModel")) { stop("OutputsModel must be of class 'OutputsModel' \n") @@ -36,7 +40,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Data_preparation_______________________________ - VarObs <- InputsCrit$Qobs + VarObs <- InputsCrit$obs VarObs[!InputsCrit$BoolCrit] <- NA VarSim <- OutputsModel$Qsim VarSim[!InputsCrit$BoolCrit] <- NA @@ -124,7 +128,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T ##Verbose______________________________________ if (verbose) { - message("Crit. ", CritName, " = ", sprintf("%.4f", CritValue)) + message("Crit. ", CritName, " = ", sprintf("%.4f", CritValue), "\n") }