From 2b5c96c21c5eeb96cdd2b087fb03dc05c81745bf Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Fri, 11 Aug 2017 15:37:26 +0200
Subject: [PATCH] v1.0.9.20 warning messages are more specifics in
CreateIniStates
---
DESCRIPTION | 2 +-
R/CreateIniStates.R | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 89b09984..e7e083d4 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.0.9.19
+Version: 1.0.9.20
Date: 2017-08-11
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R
index 756b095b..af764d46 100644
--- a/R/CreateIniStates.R
+++ b/R/CreateIniStates.R
@@ -69,7 +69,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
}
} else if (!is.null(ExpStore)) {
if (verbose) {
- warning("This 'FUN_MOD' does not require 'ExpStore'. Value set to NA")
+ warning(sprintf("'%s' does not require 'ExpStore'. Value set to NA", as.character(substitute(FUN_MOD))))
}
ExpStore <- Inf
}
@@ -77,13 +77,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if (identical(FUN_MOD, RunModel_GR2M)) {
if (!is.null(UH1)) {
if (verbose) {
- warning("This 'FUN_MOD' does not require 'UH1'. Values set to NA")
+ warning(sprintf("'%s' does not require 'UH1'. Values set to NA", as.character(substitute(FUN_MOD))))
}
UH1 <- rep(Inf, UH1n)
}
if (!is.null(UH2)) {
if (verbose) {
- warning("This 'FUN_MOD' does not require 'UH2'. Values set to NA")
+ warning(sprintf("'%s' does not require 'UH2'. Values set to NA", as.character(substitute(FUN_MOD))))
}
UH2 <- rep(Inf, UH2n)
}
@@ -92,7 +92,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if ((identical(FUN_MOD, RunModel_GR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J)) & !is.null(UH1)) {
if (verbose) {
- warning("This 'FUN_MOD' does not require 'UH1'. Values set to NA")
+ warning(sprintf("'%s' does not require 'UH1'. Values set to NA", as.character(substitute(FUN_MOD))))
}
UH1 <- rep(Inf, UH1n)
}
@@ -105,7 +105,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if(!"CemaNeige" %in% ObjectClass &
(!is.null(GCemaNeigeLayers) | !is.null(eTGCemaNeigeLayers))) {
if (verbose) {
- warning("This 'FUN_MOD' does not require 'GCemaNeigeLayers' and 'GCemaNeigeLayers'. Values set to NA")
+ warning(sprintf("'%s' does not require 'GCemaNeigeLayers' and 'GCemaNeigeLayers'. Values set to NA", as.character(substitute(FUN_MOD))))
}
GCemaNeigeLayers <- Inf
eTGCemaNeigeLayers <- Inf
--
GitLab