From 8a62b29b226b78ffceaceb6e356aa1eac652ace0 Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Wed, 5 Apr 2017 15:03:18 +0200
Subject: [PATCH] v1.0.6.6 new warning message when when X1, X3 or X6 < 1e-2 in
RunModel* functions
---
R/RunModel_CemaNeigeGR4J.R | 4 ++--
R/RunModel_CemaNeigeGR5J.R | 4 ++--
R/RunModel_CemaNeigeGR6J.R | 6 +++---
R/RunModel_GR2M.R | 2 +-
R/RunModel_GR4H.R | 4 ++--
R/RunModel_GR4J.R | 4 ++--
R/RunModel_GR5J.R | 4 ++--
R/RunModel_GR6J.R | 6 +++---
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R
index 28151667..d07d98ed 100644
--- a/R/RunModel_CemaNeigeGR4J.R
+++ b/R/RunModel_CemaNeigeGR4J.R
@@ -18,11 +18,11 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
Param_X1X3_threshold <- 1e-2
if (Param[1L] < Param_X1X3_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[1L] <- Param_X1X3_threshold
}
if (Param[3L] < Param_X1X3_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[3L] <- Param_X1X3_threshold
}
diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R
index b99e4c2d..2661e01e 100644
--- a/R/RunModel_CemaNeigeGR5J.R
+++ b/R/RunModel_CemaNeigeGR5J.R
@@ -18,11 +18,11 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
Param_X1X3_threshold <- 1e-2
if (Param[1L] < Param_X1X3_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[1L] <- Param_X1X3_threshold
}
if (Param[3L] < Param_X1X3_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[3L] <- Param_X1X3_threshold
}
diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R
index fb7985d0..cd0b7958 100644
--- a/R/RunModel_CemaNeigeGR6J.R
+++ b/R/RunModel_CemaNeigeGR6J.R
@@ -18,15 +18,15 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
Param_X1X3X6_threshold <- 1e-2
if (Param[1L] < Param_X1X3X6_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
Param[1L] <- Param_X1X3X6_threshold
}
if (Param[3L] < Param_X1X3X6_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
Param[3L] <- Param_X1X3X6_threshold
}
if (Param[6L] < Param_X1X3X6_threshold) {
- warning(sprintf("Param[6] (X6: coefficient for emptying exponential store [mm]) < %.2f\n New X6 value: %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
+ warning(sprintf("Param[6] (X6: coefficient for emptying exponential store [mm]) < %.2f\n X6 set to %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
Param[6L] <- Param_X1X3X6_threshold
}
diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R
index cbefa5dd..d0b1784f 100644
--- a/R/RunModel_GR2M.R
+++ b/R/RunModel_GR2M.R
@@ -15,7 +15,7 @@ RunModel_GR2M <- function(InputsModel,RunOptions,Param){
Param_X1_threshold <- 1e-2
if (Param[1L] < Param_X1_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1_threshold, Param_X1_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1_threshold, Param_X1_threshold))
Param[1L] <- Param_X1_threshold
}
diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R
index 541d9dfc..76e57132 100644
--- a/R/RunModel_GR4H.R
+++ b/R/RunModel_GR4H.R
@@ -15,11 +15,11 @@ RunModel_GR4H <- function(InputsModel,RunOptions,Param){
Param_X1X3_threshold <- 1e-2
if (Param[1L] < Param_X1X3_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[1L] <- Param_X1X3_threshold
}
if (Param[3L] < Param_X1X3_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[3L] <- Param_X1X3_threshold
}
diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R
index a413ce93..b871d24a 100644
--- a/R/RunModel_GR4J.R
+++ b/R/RunModel_GR4J.R
@@ -15,11 +15,11 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param){
Param_X1X3_threshold <- 1e-2
if (Param[1L] < Param_X1X3_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[1L] <- Param_X1X3_threshold
}
if (Param[3L] < Param_X1X3_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[3L] <- Param_X1X3_threshold
}
diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R
index f7357c09..729e6108 100644
--- a/R/RunModel_GR5J.R
+++ b/R/RunModel_GR5J.R
@@ -15,11 +15,11 @@ RunModel_GR5J <- function(InputsModel,RunOptions,Param){
Param_X1X3_threshold <- 1e-2
if (Param[1L] < Param_X1X3_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[1L] <- Param_X1X3_threshold
}
if (Param[3L] < Param_X1X3_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
Param[3L] <- Param_X1X3_threshold
}
diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R
index 87800dec..23e234da 100644
--- a/R/RunModel_GR6J.R
+++ b/R/RunModel_GR6J.R
@@ -15,15 +15,15 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param){
Param_X1X3X6_threshold <- 1e-2
if (Param[1L] < Param_X1X3X6_threshold) {
- warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n New X1 value: %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
+ warning(sprintf("Param[1] (X1: production store capacity [mm]) < %.2f\n X1 set to %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
Param[1L] <- Param_X1X3X6_threshold
}
if (Param[3L] < Param_X1X3X6_threshold) {
- warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
+ warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n X3 set to %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
Param[3L] <- Param_X1X3X6_threshold
}
if (Param[6L] < Param_X1X3X6_threshold) {
- warning(sprintf("Param[6] (X6: coefficient for emptying exponential store [mm]) < %.2f\n New X6 value: %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
+ warning(sprintf("Param[6] (X6: coefficient for emptying exponential store [mm]) < %.2f\n X6 set to %.2f", Param_X1X3X6_threshold, Param_X1X3X6_threshold))
Param[6L] <- Param_X1X3X6_threshold
}
--
GitLab