From 0c4503262c332f782ec8882ef49e3f6e73c16e89 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 22 Oct 2018 17:37:28 +0200
Subject: [PATCH] v1.1.2.4 UPDATE: ErrorCrit_RMSE compatible with new
InputsCrit objects
---
DESCRIPTION | 2 +-
R/ErrorCrit_RMSE.R | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 858d0eb3..b8c2def1 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.3
+Version: 1.1.2.4
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_RMSE.R b/R/ErrorCrit_RMSE.R
index e15d48ae..201a1197 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -36,7 +36,7 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
##Data_preparation_______________________________
- VarObs <- InputsCrit$Qobs
+ VarObs <- InputsCrit$obs
VarObs[!InputsCrit$BoolCrit] <- NA
VarSim <- OutputsModel$Qsim
VarSim[!InputsCrit$BoolCrit] <- NA
@@ -120,7 +120,7 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
##Verbose______________________________________
if (verbose) {
- message("Crit. ", CritName, " = ", sprintf("%.4f", CritValue))
+ message("Crit. ", CritName, " = ", sprintf("%.4f", CritValue), "\n")
}
--
GitLab