Commit 2b5c96c2 authored by unknown's avatar unknown
Browse files

v1.0.9.20 warning messages are more specifics in CreateIniStates

Showing with 6 additions and 6 deletions
+6 -6
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.9.19 Version: 1.0.9.20
Date: 2017-08-11 Date: 2017-08-11
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")), person("Laurent", "Coron", role = c("aut", "trl")),
......
...@@ -69,7 +69,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -69,7 +69,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
} }
} else if (!is.null(ExpStore)) { } else if (!is.null(ExpStore)) {
if (verbose) { 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 ExpStore <- Inf
} }
...@@ -77,13 +77,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -77,13 +77,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if (identical(FUN_MOD, RunModel_GR2M)) { if (identical(FUN_MOD, RunModel_GR2M)) {
if (!is.null(UH1)) { if (!is.null(UH1)) {
if (verbose) { 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) UH1 <- rep(Inf, UH1n)
} }
if (!is.null(UH2)) { if (!is.null(UH2)) {
if (verbose) { 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) UH2 <- rep(Inf, UH2n)
} }
...@@ -92,7 +92,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -92,7 +92,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if ((identical(FUN_MOD, RunModel_GR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J)) & !is.null(UH1)) { if ((identical(FUN_MOD, RunModel_GR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J)) & !is.null(UH1)) {
if (verbose) { 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) UH1 <- rep(Inf, UH1n)
} }
...@@ -105,7 +105,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -105,7 +105,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if(!"CemaNeige" %in% ObjectClass & if(!"CemaNeige" %in% ObjectClass &
(!is.null(GCemaNeigeLayers) | !is.null(eTGCemaNeigeLayers))) { (!is.null(GCemaNeigeLayers) | !is.null(eTGCemaNeigeLayers))) {
if (verbose) { 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 GCemaNeigeLayers <- Inf
eTGCemaNeigeLayers <- Inf eTGCemaNeigeLayers <- Inf
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment