From 1be66b1db982887fada59aa621b0efa1218ed356 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 21 Feb 2019 15:39:05 +0100
Subject: [PATCH] v1.1.3.8 UPDATE: ErrorCrit doc example with new varObs names
for discharge in CreateInputsCrit fun
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
man/ErrorCrit.Rd | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 46184d2f..6dec702c 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.3.7
+Version: 1.1.3.8
Date: 2019-02-21
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 bfd4e7ca..79d50a96 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.1.3.7 Release Notes (2019-02-21)
+### 1.1.3.8 Release Notes (2019-02-21)
diff --git a/man/ErrorCrit.Rd b/man/ErrorCrit.Rd
index 26c7bb3f..b856d496 100644
--- a/man/ErrorCrit.Rd
+++ b/man/ErrorCrit.Rd
@@ -82,7 +82,7 @@ OutputsModel <- RunModel_GR4J(InputsModel = InputsModel, RunOptions = RunOptions
InputsCritSingle <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE,
InputsModel = InputsModel, RunOptions = RunOptions,
obs = list(BasinObs$Qmm[Ind_Run]),
- varObs = "Qobs", transfo = "",
+ varObs = "Q", transfo = "",
weight = NULL)
str(ErrorCrit(InputsCrit = InputsCritSingle, OutputsModel = OutputsModel))
@@ -90,7 +90,7 @@ str(ErrorCrit(InputsCrit = InputsCritSingle, OutputsModel = OutputsModel))
InputsCritMulti <- CreateInputsCrit(FUN_CRIT = list(ErrorCrit_RMSE, ErrorCrit_NSE),
InputsModel = InputsModel, RunOptions = RunOptions,
obs = list(BasinObs$Qmm[Ind_Run], BasinObs$Qmm[Ind_Run]),
- varObs = list("Qobs", "Qobs"), transfo = list("", "sqrt"),
+ varObs = list("Q", "Q"), transfo = list("", "sqrt"),
weight = NULL)
str(ErrorCrit(InputsCrit = InputsCritMulti, OutputsModel = OutputsModel))
@@ -99,7 +99,7 @@ str(ErrorCrit(InputsCrit = InputsCritMulti, OutputsModel = OutputsModel))
InputsCritCompo <- CreateInputsCrit(FUN_CRIT = list(ErrorCrit_NSE, ErrorCrit_NSE),
InputsModel = InputsModel, RunOptions = RunOptions,
obs = list(BasinObs$Qmm[Ind_Run], BasinObs$Qmm[Ind_Run]),
- varObs = list("Qobs", "Qobs"), transfo = list("", "log"),
+ varObs = list("Q", "Q"), transfo = list("", "log"),
weight = list(0.4, 0.6))
str(ErrorCrit(InputsCrit = InputsCritCompo, OutputsModel = OutputsModel))
}
--
GitLab