From 0109278c47677cf7d6d4419ccbda3ddeffb039d2 Mon Sep 17 00:00:00 2001 From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv> Date: Thu, 28 Sep 2017 16:23:13 +0200 Subject: [PATCH] v1.0.9.49 bug in CreateRunOptions fixed when QR1has been renamed QRExp in RunModel_*GR6J outputs --- DESCRIPTION | 4 ++-- R/CreateRunOptions.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 852ce590..ab7e37ad 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.48 -Date: 2017-09-13 +Version: 1.0.9.49 +Date: 2017-09-28 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), person("Charles", "Perrin", role = c("aut", "ths")), diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R index 16a5aa5b..ace69b1c 100644 --- a/R/CreateRunOptions.R +++ b/R/CreateRunOptions.R @@ -204,7 +204,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP "AExch1", "AExch2", "AExch", "QR", "QD", "Qsim"); } if(identical(FUN_MOD,RunModel_GR6J) | identical(FUN_MOD,RunModel_CemaNeigeGR6J)){ Outputs_all <- c(Outputs_all,"PotEvap", "Precip", "Prod", "Pn", "Ps", "AE", "Perc", "PR", "Q9", "Q1", "Rout", "Exch", - "AExch1", "AExch2", "AExch", "QR", "QR1", "Exp", "QD", "Qsim"); } + "AExch1", "AExch2", "AExch", "QR", "QRExp", "Exp", "QD", "Qsim"); } if(identical(FUN_MOD,RunModel_GR2M)){ Outputs_all <- c(Outputs_all,"PotEvap","Precip","AE","Perc","P3","Exch","Prod","Rout","Qsim"); } if(identical(FUN_MOD,RunModel_GR1A)){ -- GitLab