v1.0.5.27 when X6 < 1e-2, new value set to 1e-2

DESCRIPTION

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

R/RunModel_CemaNeigeGR6J.R

@@ -25,6 +25,10 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
         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
       }
+      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))
+        Param[6L] <- Param_X1X3X6_threshold
+      }         
 
     ##Input_data_preparation
       if(identical(RunOptions$IndPeriod_WarmUp,as.integer(0))){ RunOptions$IndPeriod_WarmUp <- NULL; }

R/RunModel_GR4J.R

@@ -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_GR6J.R

@@ -13,15 +13,19 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param){
       if(sum(!is.na(Param))!=NParam){ stop(paste("Param must be a vector of length ",NParam," and contain no NA \n",sep="")); return(NULL); }
       Param <- as.double(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))
-        Param[1L] <- Param_X1X3_threshold
+      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))
+        Param[1L] <- Param_X1X3X6_threshold
       }
-      if (Param[3L] < 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
+      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))
+        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))
+        Param[6L] <- Param_X1X3X6_threshold
+      }      
 
     ##Input_data_preparation
       if(identical(RunOptions$IndPeriod_WarmUp,as.integer(0))){ RunOptions$IndPeriod_WarmUp <- NULL; }