From c32f5782b909e254c372021f1d6ad4457490374d Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Tue, 17 Oct 2017 09:38:28 +0200
Subject: [PATCH] v1.0.9.50 minor revision of Param_Sets_GR4J example
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
man/Param_Sets_GR4J.Rd | 11 ++++++++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index ab7e37ad..54a4a42f 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.0.9.49
-Date: 2017-09-28
+Version: 1.0.9.50
+Date: 2017-10-17
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")),
diff --git a/NEWS.rmd b/NEWS.rmd
index b34afa84..742b289b 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.9.47 Release Notes (2017-09-13)
+### 1.0.9.50 Release Notes (2017-10-17)
#### New features
diff --git a/man/Param_Sets_GR4J.Rd b/man/Param_Sets_GR4J.Rd
index c267c276..2998a4fe 100644
--- a/man/Param_Sets_GR4J.Rd
+++ b/man/Param_Sets_GR4J.Rd
@@ -67,9 +67,12 @@ Ind_Cal <- seq(which(format(BasinObs$DatesR, format = "\%d/\%m/\%Y \%H:\%M")=="0
RunOptions_Cal <- CreateRunOptions(FUN_MOD = RunModel_GR4J,
InputsModel = InputsModel, IndPeriod_Run = Ind_Cal)
-## simulation and efficiency criterion (Nash-Sutcliffe Efficiency) with all generalist parameter sets on the calibration period
+## simulation and efficiency criterion (Nash-Sutcliffe Efficiency)
+## with all generalist parameter sets on the calibration period
OutputsCrit_Loop <- apply(Param_Sets_GR4J, 1, function(Param) {
- OutputsModel_Cal <- RunModel_GR4J(InputsModel = InputsModel, RunOptions = RunOptions_Cal, Param = Param)
+ OutputsModel_Cal <- RunModel_GR4J(InputsModel = InputsModel,
+ RunOptions = RunOptions_Cal,
+ Param = Param)
InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel,
RunOptions = RunOptions_Cal, Qobs = BasinObs$Qmm[Ind_Cal])
OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel_Cal)
@@ -91,7 +94,9 @@ RunOptions_Val <- CreateRunOptions(FUN_MOD = RunModel_GR4J,
InputsModel = InputsModel, IndPeriod_Run = Ind_Val)
## simulation with the best parameter set on the validation period
-OutputsModel_Val <- RunModel_GR4J(InputsModel = InputsModel, RunOptions = RunOptions_Val, Param = Param_Best)
+OutputsModel_Val <- RunModel_GR4J(InputsModel = InputsModel,
+ RunOptions = RunOptions_Val,
+ Param = Param_Best)
## results preview of the simulation with the best parameter set on the validation period
plot(OutputsModel_Val, Qobs = BasinObs$Qmm[Ind_Val])
--
GitLab