v1.0.5.26 warning message in RunModel_*() fixed when X1 and X3 < 1e-2

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.5.25
+Version: 1.0.5.26
 Date: 2017-03-15
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl")),

R/RunModel_CemaNeigeGR4J.R

@@ -22,7 +22,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (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 New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }
       

R/RunModel_CemaNeigeGR5J.R

@@ -22,7 +22,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (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 New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }
 

R/RunModel_CemaNeigeGR6J.R

@@ -22,7 +22,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (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 New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }
 

R/RunModel_GR4H.R

@@ -19,7 +19,7 @@ RunModel_GR4H <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (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 New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }
 

R/RunModel_GR4J.R

@@ -19,7 +19,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (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 New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }
 
@@ -54,7 +54,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param){
                      )
       RESULTS$Outputs[ round(RESULTS$Outputs ,3)==(-999.999)] <- NA;
       RESULTS$StateEnd[round(RESULTS$StateEnd,3)==(-999.999)] <- NA;
-
+print(head(RESULTS$Outputs[, c(3,9)]))
     ##Output_data_preparation
       IndPeriod2     <- (length(RunOptions$IndPeriod_WarmUp)+1):LInputSeries;
       ExportDatesR   <- "DatesR"   %in% RunOptions$Outputs_Sim;

R/RunModel_GR5J.R

@@ -19,7 +19,7 @@ RunModel_GR5J <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (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 New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }
       

R/RunModel_GR6J.R

@@ -19,7 +19,7 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param){
         Param[1L] <- Param_X1X3_threshold
       }
       if (Param[3L] < Param_X1X3_threshold) {
-        warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
+        warning(sprintf("Param[6] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold))
         Param[3L] <- Param_X1X3_threshold
       }